This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch dataNodeId in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fcaa948fd7655946e5163f15963b5138835eebbf Merge: b23a0b84f8 112758a997 Author: HTHou <[email protected]> AuthorDate: Wed Apr 27 15:29:44 2022 +0800 Merge branch 'master' of https://github.com/apache/iotdb into dataNodeId .github/workflows/client-cpp.yml | 4 +- .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 14 +- .../cluster/query/reader/ClusterReaderFactory.java | 20 +- .../iotdb/cluster/server/ClusterRPCService.java | 5 - .../server/clusterinfo/ClusterInfoServer.java | 5 - .../server/raft/DataRaftHeartBeatService.java | 6 - .../iotdb/cluster/server/raft/DataRaftService.java | 6 - .../server/raft/MetaRaftHeartBeatService.java | 6 - .../iotdb/cluster/server/raft/MetaRaftService.java | 6 - .../consensus/request/ConfigRequest.java | 57 ++- .../consensus/request/ConfigRequestType.java | 9 +- ...ataNodeInfoReq.java => GetDataNodeInfoReq.java} | 12 +- ...InfoReq.java => GetOrCountStorageGroupReq.java} | 43 +- .../request/read/QueryStorageGroupSchemaReq.java | 41 -- .../SetDataReplicationFactorReq.java} | 46 +- .../SetSchemaReplicationFactorReq.java} | 46 +- .../SetTTLReq.java} | 45 +- .../SetTimePartitionIntervalReq.java} | 46 +- ...pSchemaResp.java => CountStorageGroupResp.java} | 31 +- .../consensus/response/StorageGroupSchemaResp.java | 18 +- .../statemachine/PartitionRegionStateMachine.java | 6 +- .../confignode/manager/ClusterSchemaManager.java | 85 +++- .../iotdb/confignode/manager/ConfigManager.java | 96 +++- .../iotdb/confignode/manager/DataNodeManager.java | 4 +- .../apache/iotdb/confignode/manager/Manager.java | 41 +- .../iotdb/confignode/manager/PartitionManager.java | 8 +- .../confignode/persistence/ClusterSchemaInfo.java | 320 ++++++++++++ .../iotdb/confignode/persistence/DataNodeInfo.java | 4 +- .../confignode/persistence/StorageGroupInfo.java | 150 ------ .../iotdb/confignode/service/ConfigNode.java | 17 +- .../confignode/service/ConfigNodeCommandLine.java | 2 +- ...lanExecutor.java => ConfigRequestExecutor.java} | 71 +-- .../service/thrift/ConfigNodeRPCService.java | 9 - .../thrift/ConfigNodeRPCServiceProcessor.java | 82 +++- .../request}/ConfigRequestSerDeTest.java | 307 +++++++----- .../thrift/ConfigNodeRPCServiceProcessorTest.java | 92 +++- .../utils/ConfigNodeEnvironmentUtils.java | 4 +- docs/UserGuide/Ecosystem Integration/DBeaver.md | 22 +- docs/UserGuide/Maintenance-Tools/Sync-Tool.md | 119 ++++- docs/UserGuide/Query-Data/Select-Expression.md | 7 +- docs/zh/UserGuide/Ecosystem Integration/DBeaver.md | 28 +- docs/zh/UserGuide/Maintenance-Tools/Sync-Tool.md | 23 +- docs/zh/UserGuide/Query-Data/Select-Expression.md | 7 +- .../db/integration/IoTDBPartialInsertionIT.java | 62 +++ .../iotdb/db/integration/IoTDBSelectSchemaIT.java | 9 +- .../sync/IoTDBSyncReceiverCollectorIT.java | 12 +- .../db/integration/sync/IoTDBSyncSenderIT.java | 327 +++++++++++-- .../db/integration/sync/TransportClientMock.java | 12 +- .../db/integration/sync/TransportHandlerMock.java | 61 +++ .../commons/client/ClientFactoryProperty.java | 4 +- .../iotdb/commons/client/ClientPoolProperty.java | 3 +- .../iotdb/commons/service/ThriftService.java | 4 +- .../apache/iotdb/commons/ClientManagerTest.java | 9 +- .../iotdb/procedure/service/ProcedureServer.java | 5 - .../resources/conf/iotdb-engine.properties | 5 + .../resources/conf/schema-rocksdb.properties | 24 +- .../apache/iotdb/db/client/ConfigNodeClient.java | 6 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 + .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 + .../iotdb/db/engine/memtable/AbstractMemTable.java | 4 +- .../db/engine/storagegroup/TsFileProcessor.java | 4 +- .../db/engine/storagegroup/TsFileResource.java | 6 +- .../iotdb/db/localconfignode/LocalConfigNode.java | 13 +- .../iotdb/db/metadata/LocalSchemaProcessor.java | 6 +- .../db/metadata/mnode/IStorageGroupMNode.java | 12 + .../db/metadata/mnode/StorageGroupEntityMNode.java | 18 + .../iotdb/db/metadata/mnode/StorageGroupMNode.java | 43 +- .../iotdb/db/metadata/mtree/MTreeAboveSG.java | 9 + .../apache/iotdb/db/metadata/path/AlignedPath.java | 269 ----------- .../iotdb/db/metadata/path/MeasurementPath.java | 197 -------- .../apache/iotdb/db/metadata/path/PartialPath.java | 96 ---- .../schemaregion/rocksdb/RSchemaConfLoader.java | 7 +- .../rocksdb/mnode/RStorageGroupMNode.java | 18 + .../ResourceByPathUtils.java} | 535 +++++++++++---------- .../iotdb/db/mpp/buffer/DataBlockManager.java | 17 +- .../iotdb/db/mpp/buffer/DataBlockService.java | 13 +- .../mpp/buffer/DataBlockServiceClientFactory.java | 117 ----- .../org/apache/iotdb/db/mpp/buffer/SinkHandle.java | 58 ++- .../apache/iotdb/db/mpp/buffer/SourceHandle.java | 53 +- .../iotdb/db/mpp/common/MPPQueryContext.java | 25 +- .../apache/iotdb/db/mpp/execution/Coordinator.java | 40 +- .../iotdb/db/mpp/execution/QueryExecution.java | 19 +- .../scheduler/AbstractFragInsStateTracker.java | 45 +- .../mpp/execution/scheduler/ClusterScheduler.java | 14 +- .../scheduler/FixedRateFragInsStateTracker.java | 11 +- .../scheduler/InternalServiceClientFactory.java | 112 ----- .../scheduler/SimpleFragInstanceDispatcher.java | 62 ++- .../execution/scheduler/SimpleQueryTerminator.java | 47 +- .../execution/scheduler/StandaloneScheduler.java | 12 +- .../mpp/operator/process/DeviceMergeOperator.java | 56 --- .../mpp/operator/process/DeviceViewOperator.java | 152 ++++++ .../mpp/operator/process/merge/ColumnMerger.java | 4 +- .../operator/process/merge/MultiColumnMerger.java | 96 ++++ .../operator/process/merge/SingleColumnMerger.java | 66 ++- .../mpp/sql/analyze/ClusterPartitionFetcher.java | 446 +++++++++++++++-- .../mpp/sql/analyze/FakePartitionFetcherImpl.java | 11 + .../db/mpp/sql/analyze/IPartitionFetcher.java | 4 + .../sql/analyze/StandalonePartitionFetcher.java | 11 + .../apache/iotdb/db/mpp/sql/parser/ASTVisitor.java | 58 +-- .../db/mpp/sql/planner/DistributionPlanner.java | 6 +- .../db/mpp/sql/planner/LocalExecutionPlanner.java | 15 +- .../sql/planner/SimpleFragmentParallelPlanner.java | 9 +- .../db/mpp/sql/planner/plan/FragmentInstance.java | 25 +- .../node/metedata/write/AlterTimeSeriesNode.java | 99 ++-- .../write/CreateAlignedTimeSeriesNode.java | 135 +++--- .../node/metedata/write/CreateTimeSeriesNode.java | 14 +- .../iotdb/db/qp/physical/crud/InsertRowPlan.java | 28 +- .../db/qp/physical/crud/InsertTabletPlan.java | 69 +-- .../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 12 + .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 58 +-- .../iotdb/db/query/executor/LastQueryExecutor.java | 4 +- .../iotdb/db/query/expression/Expression.java | 5 +- .../iotdb/db/query/expression/ExpressionType.java | 61 ++- .../expression/binary/AdditionExpression.java | 4 +- .../query/expression/binary/BinaryExpression.java | 5 +- .../expression/binary/DivisionExpression.java | 4 +- .../query/expression/binary/EqualToExpression.java | 4 +- .../expression/binary/GreaterEqualExpression.java | 4 +- .../expression/binary/GreaterThanExpression.java | 4 +- .../expression/binary/LessEqualExpression.java | 4 +- .../expression/binary/LessThanExpression.java | 4 +- .../expression/binary/LogicAndExpression.java | 4 +- .../query/expression/binary/LogicOrExpression.java | 4 +- .../query/expression/binary/ModuloExpression.java | 4 +- .../binary/MultiplicationExpression.java | 4 +- .../expression/binary/NonEqualExpression.java | 4 +- .../expression/binary/SubtractionExpression.java | 4 +- .../db/query/expression/unary/ConstantOperand.java | 10 +- .../query/expression/unary/FunctionExpression.java | 4 +- .../query/expression/unary/LogicNotExpression.java | 16 +- .../query/expression/unary/NegationExpression.java | 17 +- .../query/expression/unary/RegularExpression.java | 7 +- .../query/expression/unary/TimeSeriesOperand.java | 4 +- .../query/reader/series/SeriesAggregateReader.java | 20 +- .../reader/series/SeriesRawDataBatchReader.java | 39 +- .../reader/series/SeriesReaderByTimestamp.java | 6 +- .../iotdb/db/service/InfluxDBRPCService.java | 5 - .../apache/iotdb/db/service/InternalService.java | 5 - .../java/org/apache/iotdb/db/service/IoTDB.java | 2 +- .../org/apache/iotdb/db/service/RPCService.java | 5 - .../apache/iotdb/db/sync/conf/SyncConstant.java | 54 ++- .../apache/iotdb/db/sync/conf/SyncPathUtil.java | 82 +++- .../iotdb/db/sync/pipedata/DeletionPipeData.java | 2 +- .../sync/pipedata/queue/BufferedPipeDataQueue.java | 34 +- .../db/sync/pipedata/queue/PipeDataQueue.java | 2 + .../db/sync/receiver/collector/Collector.java | 4 +- .../db/sync/receiver/manager/ReceiverManager.java | 32 +- .../db/sync/sender/manager/SchemaSyncManager.java | 18 +- .../iotdb/db/sync/sender/pipe/IoTDBPipeSink.java | 18 + .../org/apache/iotdb/db/sync/sender/pipe/Pipe.java | 10 + .../iotdb/db/sync/sender/pipe/TsFilePipe.java | 61 ++- .../db/sync/sender/recovery/SenderLogAnalyzer.java | 25 +- .../db/sync/sender/recovery/SenderLogger.java | 12 +- .../db/sync/sender/recovery/TsFilePipeLogger.java | 2 +- .../iotdb/db/sync/sender/service/MsgManager.java | 114 +++++ .../db/sync/sender/service/SenderService.java | 81 ++-- .../db/sync/sender/service/TransportHandler.java | 47 +- .../db/sync/transport/client/TransportClient.java | 35 +- .../transport/server/TransportServerManager.java | 5 - .../apache/iotdb/db/mpp/buffer/SinkHandleTest.java | 51 +- .../iotdb/db/mpp/buffer/SourceHandleTest.java | 65 ++- .../iotdb/db/mpp/execution/DataDriverTest.java | 4 +- ...eratorTest.java => DeviceViewOperatorTest.java} | 124 ++--- .../iotdb/db/mpp/operator/LimitOperatorTest.java | 4 +- .../db/mpp/operator/MultiColumnMergerTest.java | 208 ++++++++ .../db/mpp/operator/SingleColumnMergerTest.java | 96 +++- .../db/mpp/operator/TimeJoinOperatorTest.java | 10 +- .../db/mpp/sql/plan/DistributionPlannerTest.java | 34 +- .../db/mpp/sql/plan/FragmentInstanceIdTest.java | 2 +- .../db/mpp/sql/plan/FragmentInstanceSerdeTest.java | 4 +- .../iotdb/db/mpp/sql/plan/LogicalPlannerTest.java | 23 +- .../iotdb/db/mpp/sql/plan/QueryPlannerTest.java | 32 +- .../read/DeviceSchemaScanNodeSerdeTest.java | 2 +- .../read/TimeSeriesSchemaScanNodeSerdeTest.java | 2 +- .../plan/node/process/AggregateNodeSerdeTest.java | 2 +- .../node/process/DeviceMergeNodeSerdeTest.java | 2 +- .../plan/node/process/ExchangeNodeSerdeTest.java | 2 +- .../sql/plan/node/process/FillNodeSerdeTest.java | 2 +- .../sql/plan/node/process/FilterNodeSerdeTest.java | 2 +- .../plan/node/process/FilterNullNodeSerdeTest.java | 2 +- .../node/process/GroupByLevelNodeSerdeTest.java | 2 +- .../sql/plan/node/process/LimitNodeSerdeTest.java | 2 +- .../sql/plan/node/process/OffsetNodeSerdeTest.java | 4 +- .../sql/plan/node/process/SortNodeSerdeTest.java | 2 +- .../plan/node/process/TimeJoinNodeSerdeTest.java | 2 +- .../plan/node/sink/FragmentSinkNodeSerdeTest.java | 2 +- .../source/SeriesAggregateScanNodeSerdeTest.java | 2 +- .../plan/node/source/SeriesScanNodeSerdeTest.java | 2 +- .../plan/node/write/InsertRowNodeSerdeTest.java | 2 +- .../plan/node/write/InsertTabletNodeSerdeTest.java | 2 +- .../iotdb/db/service/InternalServiceImplTest.java | 4 +- .../sync/pipedata/BufferedPipeDataQueueTest.java | 26 +- .../sync/receiver/manager/ReceiverManagerTest.java | 2 +- .../receiver/recovery/ReceiverLogAnalyzerTest.java | 6 +- .../src/main/thrift/confignode.thrift | 24 +- .../iotdb/tsfile/read/common/block/TsBlock.java | 26 +- .../common/block/column/BinaryColumnBuilder.java | 2 +- .../common/block/column/BooleanColumnBuilder.java | 2 +- .../common/block/column/DoubleColumnBuilder.java | 2 +- .../common/block/column/FloatColumnBuilder.java | 2 +- .../read/common/block/column/IntColumnBuilder.java | 2 +- .../common/block/column/LongColumnBuilder.java | 2 +- .../read/common/block/column/NullColumn.java | 50 ++ .../block/column/RunLengthEncodedColumn.java | 16 +- .../tsfile/common/block/NullColumnUnitTest.java | 120 +++++ 205 files changed, 4812 insertions(+), 2862 deletions(-)
