This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch tsfile-vector-index in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 985a2a88afeec82f8a9a59f8019180ac6882d988 Merge: 3962089 30678c1 Author: Steve Yurong Su <[email protected]> AuthorDate: Mon Jun 28 11:38:49 2021 +0800 Merge branch 'master' of github.com:apache/iotdb into tsfile-vector-index .../resources/conf/iotdb-cluster.properties | 7 + cluster/src/assembly/resources/sbin/add-node.bat | 39 +- cluster/src/assembly/resources/sbin/add-node.sh | 2 +- .../sbin/{add-node.bat => remove-node.bat} | 18 +- .../resources/sbin/{add-node.sh => remove-node.sh} | 33 +- cluster/src/assembly/resources/sbin/start-node.bat | 2 +- .../java/org/apache/iotdb/cluster/ClusterMain.java | 25 +- .../cluster/client/async/AsyncClientPool.java | 36 +- .../cluster/client/sync/SyncClientAdaptor.java | 35 +- .../iotdb/cluster/client/sync/SyncClientPool.java | 8 +- .../apache/iotdb/cluster/config/ClusterConfig.java | 24 + .../iotdb/cluster/config/ClusterConstant.java | 4 + .../iotdb/cluster/config/ClusterDescriptor.java | 9 + .../iotdb/cluster/coordinator/Coordinator.java | 100 ++- .../ChangeMembershipException.java} | 16 +- .../exception/CheckConsistencyException.java | 4 +- .../org/apache/iotdb/cluster/log/LogParser.java | 10 + .../iotdb/cluster/log/applier/BaseApplier.java | 4 +- .../iotdb/cluster/log/applier/DataLogApplier.java | 29 +- .../iotdb/cluster/log/applier/MetaLogApplier.java | 41 +- .../iotdb/cluster/log/catchup/CatchUpTask.java | 13 +- .../iotdb/cluster/log/catchup/LogCatchUpTask.java | 7 +- .../cluster/log/catchup/SnapshotCatchUpTask.java | 5 +- .../iotdb/cluster/log/logtypes/AddNodeLog.java | 52 +- .../iotdb/cluster/log/logtypes/RemoveNodeLog.java | 48 +- .../manage/FilePartitionedSnapshotLogManager.java | 53 +- .../log/manage/PartitionedSnapshotLogManager.java | 29 +- .../iotdb/cluster/log/manage/RaftLogManager.java | 40 +- .../iotdb/cluster/log/snapshot/FileSnapshot.java | 105 ++- .../cluster/log/snapshot/MetaSimpleSnapshot.java | 4 +- .../cluster/log/snapshot/PartitionedSnapshot.java | 6 +- .../cluster/log/snapshot/PullSnapshotTask.java | 42 +- .../log/snapshot/PullSnapshotTaskDescriptor.java | 3 +- .../cluster/log/snapshot/SnapshotInstaller.java | 5 +- .../apache/iotdb/cluster/metadata/CMManager.java | 21 +- .../apache/iotdb/cluster/metadata/MetaPuller.java | 32 +- .../cluster/partition/NodeAdditionResult.java | 13 +- .../iotdb/cluster/partition/NodeRemovalResult.java | 41 +- .../iotdb/cluster/partition/PartitionGroup.java | 59 +- .../iotdb/cluster/partition/PartitionTable.java | 41 +- .../partition/balancer/DefaultSlotBalancer.java | 119 ++++ .../SlotBalancer.java} | 27 +- .../iotdb/cluster/partition/slot/SlotManager.java | 114 ++- .../partition/slot/SlotNodeAdditionResult.java | 8 +- .../partition/slot/SlotNodeRemovalResult.java | 45 +- .../cluster/partition/slot/SlotPartitionTable.java | 364 ++++++---- .../iotdb/cluster/partition/slot/SlotStrategy.java | 17 +- .../cluster/query/ClusterDataQueryExecutor.java | 12 +- .../iotdb/cluster/query/ClusterPlanExecutor.java | 16 +- .../iotdb/cluster/query/ClusterPlanRouter.java | 32 +- .../iotdb/cluster/query/LocalQueryExecutor.java | 105 ++- .../iotdb/cluster/query/RemoteQueryContext.java | 7 +- .../query/aggregate/ClusterAggregateExecutor.java | 3 +- .../cluster/query/aggregate/ClusterAggregator.java | 3 +- .../cluster/query/fill/ClusterPreviousFill.java | 3 +- .../cluster/query/filter/SlotTsFileFilter.java | 12 +- .../groupby/ClusterGroupByVFilterDataSet.java | 3 +- .../query/groupby/RemoteGroupByExecutor.java | 18 +- .../query/last/ClusterLastQueryExecutor.java | 3 +- .../cluster/query/reader/ClusterReaderFactory.java | 329 +++++++-- .../cluster/query/reader/ClusterTimeGenerator.java | 7 +- .../iotdb/cluster/query/reader/DataSourceInfo.java | 3 +- ...er.java => ManagedDescPriorityMergeReader.java} | 8 +- ...Reader.java => ManagedPriorityMergeReader.java} | 4 +- .../cluster/query/reader/mult/MultBatchReader.java | 5 +- .../query/reader/mult/MultDataSourceInfo.java | 3 +- .../query/reader/mult/RemoteMultSeriesReader.java | 2 +- .../apache/iotdb/cluster/server/ClientServer.java | 5 +- .../iotdb/cluster/server/DataClusterServer.java | 518 ++++++++------ .../iotdb/cluster/server/MetaClusterServer.java | 26 +- .../cluster/server/PullSnapshotHintService.java | 65 +- .../org/apache/iotdb/cluster/server/Response.java | 13 +- .../iotdb/cluster/server/StoppedMemberManager.java | 37 +- .../server/clusterinfo/ClusterInfoServiceImpl.java | 2 +- .../server/handlers/caller/ElectionHandler.java | 4 + .../server/handlers/caller/HeartbeatHandler.java | 24 +- .../server/handlers/caller/NodeStatusHandler.java | 10 +- .../server/heartbeat/DataHeartbeatThread.java | 8 +- .../cluster/server/heartbeat/HeartbeatThread.java | 28 +- .../server/heartbeat/MetaHeartbeatThread.java | 17 + .../cluster/server/member/DataGroupMember.java | 507 +++++++++----- .../cluster/server/member/MetaGroupMember.java | 774 +++++++++++++-------- .../iotdb/cluster/server/member/RaftMember.java | 182 +++-- .../iotdb/cluster/server/monitor/NodeReport.java | 9 +- .../cluster/server/service/BaseAsyncService.java | 6 +- .../cluster/server/service/BaseSyncService.java | 6 +- .../cluster/server/service/DataAsyncService.java | 64 +- .../cluster/server/service/DataSyncService.java | 62 +- .../cluster/server/service/MetaAsyncService.java | 42 +- .../cluster/server/service/MetaSyncService.java | 37 +- .../apache/iotdb/cluster/utils/ClusterUtils.java | 77 +- .../iotdb/cluster/utils/NodeSerializeUtils.java | 2 + .../apache/iotdb/cluster/utils/PartitionUtils.java | 4 +- .../apache/iotdb/cluster/utils/StatusUtils.java | 10 + .../cluster/utils/nodetool/ClusterMonitor.java | 106 ++- .../utils/nodetool/ClusterMonitorMBean.java | 27 +- .../iotdb/cluster/utils/nodetool/NodeTool.java | 13 +- .../cluster/utils/nodetool/function/Header.java | 60 ++ .../cluster/utils/nodetool/function/Migration.java | 59 ++ .../utils/nodetool/function/NodeToolCmd.java | 23 +- .../cluster/utils/nodetool/function/Partition.java | 6 +- .../cluster/utils/nodetool/function/Ring.java | 15 +- .../nodetool/function/{Host.java => Slot.java} | 26 +- .../cluster/utils/nodetool/function/Status.java | 29 +- .../cluster/client/async/AsyncDataClientTest.java | 2 +- .../cluster/client/async/AsyncMetaClientTest.java | 2 +- .../cluster/client/sync/SyncClientAdaptorTest.java | 62 +- .../iotdb/cluster/common/TestAsyncDataClient.java | 20 +- .../iotdb/cluster/common/TestDataGroupMember.java | 14 +- .../iotdb/cluster/common/TestMetaGroupMember.java | 5 +- .../apache/iotdb/cluster/common/TestSnapshot.java | 4 +- .../org/apache/iotdb/cluster/common/TestUtils.java | 11 + .../iotdb/cluster/log/LogDispatcherTest.java | 3 +- .../apache/iotdb/cluster/log/LogParserTest.java | 21 + .../cluster/log/applier/DataLogApplierTest.java | 7 +- .../cluster/log/applier/MetaLogApplierTest.java | 14 +- .../iotdb/cluster/log/catchup/CatchUpTaskTest.java | 24 +- .../cluster/log/catchup/LogCatchUpTaskTest.java | 17 +- .../log/catchup/SnapshotCatchUpTaskTest.java | 15 +- .../cluster/log/logtypes/SerializeLogTest.java | 2 + .../FilePartitionedSnapshotLogManagerTest.java | 8 +- .../cluster/log/snapshot/DataSnapshotTest.java | 6 +- .../cluster/log/snapshot/FileSnapshotTest.java | 12 +- .../log/snapshot/MetaSimpleSnapshotTest.java | 2 +- .../log/snapshot/PartitionedSnapshotTest.java | 2 +- .../cluster/log/snapshot/PullSnapshotTaskTest.java | 5 +- .../iotdb/cluster/log/snapshot/SimpleSnapshot.java | 4 +- .../iotdb/cluster/partition/SlotManagerTest.java | 6 +- .../cluster/partition/SlotPartitionTableTest.java | 51 +- .../query/reader/ClusterReaderFactoryTest.java | 10 +- .../reader/RemoteSeriesReaderByTimestampTest.java | 3 +- .../query/reader/RemoteSimpleSeriesReaderTest.java | 3 +- .../mult/AssignPathManagedMergeReaderTest.java | 3 +- .../reader/mult/RemoteMultSeriesReaderTest.java | 5 +- .../server/heartbeat/DataHeartbeatThreadTest.java | 8 +- .../server/heartbeat/MetaHeartbeatThreadTest.java | 36 +- .../iotdb/cluster/server/member/BaseMember.java | 28 +- .../cluster/server/member/DataGroupMemberTest.java | 153 ++-- .../cluster/server/member/MetaGroupMemberTest.java | 94 ++- .../cluster/server/member/RaftMemberTest.java | 5 +- .../iotdb/cluster/utils/SerializeUtilTest.java | 18 + docker/src/main/Dockerfile-0.11.4 | 41 ++ docker/src/main/Dockerfile-0.12.1-cluster | 53 ++ docker/src/main/Dockerfile-0.12.1-node | 45 ++ docs/Community/Materials.md | 14 +- docs/Download/README.md | 34 +- docs/SystemDesign/TsFile/Format.md | 192 ++--- docs/UserGuide/Cluster/Cluster-Setup-Example.md | 42 +- docs/UserGuide/Cluster/Cluster-Setup.md | 45 +- docs/UserGuide/Comparison/TSDB-Comparison.md | 14 +- .../Data-Concept/Data-Model-and-Terminology.md | 96 ++- docs/UserGuide/Ecosystem Integration/DBeaver.md | 84 +++ .../IoTDB-SQL-Language/Maintenance-Command.md | 6 +- docs/zh/Download/README.md | 34 +- docs/zh/SystemDesign/TsFile/Format.md | 168 +++-- docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md | 38 +- docs/zh/UserGuide/Cluster/Cluster-Setup.md | 39 +- .../Data-Concept/Data-Model-and-Terminology.md | 99 +-- docs/zh/UserGuide/Ecosystem Integration/DBeaver.md | 86 +++ .../IoTDB-SQL-Language/Maintenance-Command.md | 6 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 5 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 + .../org/apache/iotdb/db/engine/StorageEngine.java | 4 +- .../engine/storagegroup/StorageGroupProcessor.java | 78 ++- .../db/engine/storagegroup/TsFileResource.java | 4 +- .../iotdb/db/metadata/logfile/MLogWriter.java | 15 +- .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 5 + .../apache/iotdb/db/qp/physical/sys/LogPlan.java | 79 +++ .../iotdb/db/query/control/SessionManager.java | 178 +++++ .../iotdb/db/query/reader/series/SeriesReader.java | 7 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 140 +--- .../org/apache/iotdb/db/utils/CommonUtils.java | 4 +- .../java/org/apache/iotdb/db/utils/IOUtils.java | 9 + .../java/org/apache/iotdb/db/utils/QueryUtils.java | 5 +- .../org/apache/iotdb/db/utils/SerializeUtils.java | 5 +- .../db/integration/IoTDBDeleteTimeseriesIT.java | 55 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 3 +- thrift-cluster/src/main/thrift/cluster.thrift | 92 +-- .../apache/iotdb/tsfile/read/common/BatchData.java | 33 + .../tsfile/read/common/DescReadBatchData.java | 5 +- .../tsfile/read/common/DescReadWriteBatchData.java | 1 + 181 files changed, 5445 insertions(+), 2345 deletions(-)
