You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/05/12 09:23:49 UTC
[iotdb] 02/02: Merge branch 'master' of
https://github.com/apache/iotdb into JDK16
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch JDK16
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5a89baf774c998837d62da7cac1c5896f5db00fe
Merge: 85a9969 e4a3e74
Author: HTHou <hh...@outlook.com>
AuthorDate: Wed May 12 17:22:56 2021 +0800
Merge branch 'master' of https://github.com/apache/iotdb into JDK16
Jenkinsfile | 2 +-
.../resources/conf/iotdb-cluster.properties | 3 +
.../java/org/apache/iotdb/cluster/ClusterMain.java | 13 ++
.../apache/iotdb/cluster/config/ClusterConfig.java | 9 ++
.../iotdb/cluster/config/ClusterDescriptor.java | 9 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 12 +-
.../cluster/query/reader/ClusterReaderFactory.java | 3 +-
.../iotdb/cluster/server/MetaClusterServer.java | 27 ++--
.../server/clusterinfo/ClusterInfoServer.java | 94 +++++++++++++
.../server/clusterinfo/ClusterInfoServerMBean.java | 23 +---
.../server/clusterinfo/ClusterInfoServiceImpl.java | 71 ++++++++++
.../ClusterInfoServiceThriftHandler.java | 55 ++++++++
.../cluster/utils/nodetool/ClusterMonitor.java | 2 +
.../utils/nodetool/ClusterMonitorMBean.java | 2 +-
.../query/groupby/MergeGroupByExecutorTest.java | 23 ++--
.../query/groupby/RemoteGroupByExecutorTest.java | 23 ++--
.../server/clusterinfo/ClusterInfoServerTest.java | 73 ++++++++++
.../clusterinfo/ClusterInfoServiceImplTest.java | 98 ++++++++++++++
.../cluster/server/member/DataGroupMemberTest.java | 28 +++-
.../cluster/server/member/MetaGroupMemberTest.java | 20 ++-
.../resources/node1conf/iotdb-cluster.properties | 1 +
.../resources/node2conf/iotdb-cluster.properties | 1 +
.../resources/node3conf/iotdb-cluster.properties | 1 +
docs/UserGuide/API/Programming-Java-Native-API.md | 98 ++++++++++++++
docs/UserGuide/Cluster/Cluster-Setup.md | 9 ++
.../Data-Concept/Data-Model-and-Terminology.md | 4 +-
.../DDL-Data-Definition-Language.md | 2 +-
.../UserGuide/API/Programming-Java-Native-API.md | 95 +++++++++++++
.../Administration-Management/Administration.md | 2 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 9 ++
.../Data-Concept/Data-Model-and-Terminology.md | 4 +-
.../DDL-Data-Definition-Language.md | 2 +-
.../resources/conf/iotdb-engine.properties | 4 +
.../org/apache/iotdb/db/concurrent/ThreadName.java | 3 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 ++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 13 ++
.../db/engine/cache/TimeSeriesMetadataCache.java | 121 +++++++++++++++++
.../db/engine/compaction/TsFileManagement.java | 9 +-
.../level/LevelCompactionTsFileManagement.java | 51 +++----
.../engine/storagegroup/StorageGroupProcessor.java | 34 +++--
.../db/engine/storagegroup/TsFileResource.java | 15 +--
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 1 -
.../apache/iotdb/db/query/dataset/ShowDataSet.java | 12 +-
.../db/query/executor/fill/LastPointReader.java | 51 +++----
.../query/reader/series/SeriesAggregateReader.java | 2 +-
.../reader/series/SeriesRawDataBatchReader.java | 4 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 7 +-
.../reader/series/SeriesReaderByTimestamp.java | 2 +-
.../query/reader/series/SeriesReaderFactory.java | 94 -------------
.../db/query/reader/series/VectorSeriesReader.java | 144 --------------------
.../org/apache/iotdb/db/service/ServiceType.java | 5 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 94 ++++++++++++-
.../iotdb/db/utils/datastructure/VectorTVList.java | 6 +-
.../compaction/LevelCompactionCacheTest.java | 3 +-
.../engine/compaction/LevelCompactionLogTest.java | 3 +-
.../compaction/LevelCompactionMergeTest.java | 3 +-
.../compaction/LevelCompactionMoreDataTest.java | 3 +-
.../NoCompactionTsFileManagementTest.java | 4 +-
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 36 +++++
.../iotdb/db/metadata/MManagerBasicTest.java | 17 +++
.../org/apache/iotdb/db/script/EnvScriptIT.java | 6 +-
.../test/java/org/apache/iotdb/db/sql/Cases.java | 149 ++++++++++++++++++++
.../java/org/apache/iotdb/db/sql/ClusterIT.java | 150 +++++++--------------
.../java/org/apache/iotdb/db/sql/SingleNodeIT.java | 92 ++-----------
.../iotdb/db/sql/node1/OneNodeClusterIT.java | 54 ++++++++
.../db/sql/nodes3/AbstractThreeNodeClusterIT.java | 61 +++++++++
.../iotdb/db/sql/nodes3/ThreeNodeCluster1IT.java | 24 +---
.../iotdb/db/sql/nodes3/ThreeNodeCluster2IT.java | 27 ++--
.../db/sql/nodes5/AbstractFiveNodeClusterIT.java | 85 ++++++++++++
.../iotdb/db/sql/nodes5/FiveNodeCluster1IT.java | 24 +---
.../iotdb/db/sql/nodes5/FiveNodeCluster2IT.java | 27 ++--
.../iotdb/db/sql/nodes5/FiveNodeCluster4IT.java | 27 ++--
.../test/resources/1node/iotdb-cluster.properties | 2 +-
thrift-cluster/src/main/thrift/cluster.thrift | 52 ++++++-
thrift-sync/pom.xml | 5 -
.../tsfile/common/constant/TsFileConstant.java | 3 +
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 11 ++
.../iotdb/tsfile/file/metadata/IChunkMetadata.java | 4 +
.../tsfile/file/metadata/ITimeSeriesMetadata.java | 3 +
.../file/metadata/MetadataIndexConstructor.java | 54 ++++++--
.../tsfile/file/metadata/MetadataIndexNode.java | 2 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 20 ++-
.../tsfile/file/metadata/VectorChunkMetadata.java | 10 ++
.../file/metadata/VectorTimeSeriesMetadata.java | 16 +++
.../iotdb/tsfile/read/TsFileSequenceReader.java | 80 ++++++++---
.../tsfile/v2/read/TsFileSequenceReaderForV2.java | 6 +-
.../iotdb/tsfile/write/chunk/TimeChunkWriter.java | 3 +-
.../iotdb/tsfile/write/chunk/ValueChunkWriter.java | 3 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 121 ++++++++++++-----
89 files changed, 1895 insertions(+), 801 deletions(-)