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 2022/04/25 01:40:41 UTC
[iotdb] 01/02: Merge branch 'master' of https://github.com/apache/iotdb into standaloneMPPWrite
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch standaloneMPPWrite
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a28e63fd2c8359ea74fb3d5f58ca853e821f5fae
Merge: 6855315a2a dde44dcbe2
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Apr 25 09:14:51 2022 +0800
Merge branch 'master' of https://github.com/apache/iotdb into standaloneMPPWrite
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 3 +
.../iotdb/cluster/integration/SingleNodeTest.java | 5 +-
.../iotdb/cluster/log/CommitLogCallbackTest.java | 2 +-
.../iotdb/cluster/log/CommitLogTaskTest.java | 5 +-
.../resources/conf/iotdb-confignode.properties | 12 +-
.../iotdb/confignode/cli/TemporaryClient.java | 38 +-
.../client/ConfigNodeClientPoolFactory.java | 74 ++++
.../iotdb/confignode/conf/ConfigNodeConf.java | 31 +-
.../confignode/conf/ConfigNodeDescriptor.java | 11 +
.../request/ConfigRequest.java} | 64 +--
.../request/ConfigRequestType.java} | 4 +-
.../request/auth/AuthorReq.java} | 62 +--
.../request/read/GetOrCreateDataPartitionReq.java} | 14 +-
.../read/GetOrCreateSchemaPartitionReq.java} | 14 +-
.../request/read/QueryDataNodeInfoReq.java} | 18 +-
.../request/read/QueryStorageGroupSchemaReq.java} | 12 +-
.../request/write/CreateDataPartitionReq.java} | 16 +-
.../request/write/CreateRegionsReq.java} | 16 +-
.../request/write/CreateSchemaPartitionReq.java} | 16 +-
.../request/write/DeleteStorageGroupReq.java} | 12 +-
.../request/write/RegisterDataNodeReq.java} | 18 +-
.../request/write/SetStorageGroupReq.java} | 18 +-
...DataSet.java => DataNodeConfigurationResp.java} | 4 +-
...ionsDataSet.java => DataNodeLocationsResp.java} | 4 +-
...artitionDataSet.java => DataPartitionResp.java} | 4 +-
...ionInfoDataSet.java => PermissionInfoResp.java} | 6 +-
...titionDataSet.java => SchemaPartitionResp.java} | 4 +-
...emaDataSet.java => StorageGroupSchemaResp.java} | 4 +-
.../statemachine/PartitionRegionStateMachine.java | 22 +-
.../physical/UnknownPhysicalPlanTypeException.java | 4 +-
...egionManager.java => ClusterSchemaManager.java} | 105 +++--
.../iotdb/confignode/manager/ConfigManager.java | 109 ++---
.../iotdb/confignode/manager/ConsensusManager.java | 6 +-
.../iotdb/confignode/manager/DataNodeManager.java | 32 +-
.../apache/iotdb/confignode/manager/Manager.java | 36 +-
.../iotdb/confignode/manager/PartitionManager.java | 61 +--
.../confignode/manager/PermissionManager.java | 12 +-
...{AuthorInfoPersistence.java => AuthorInfo.java} | 60 +--
...aNodeInfoPersistence.java => DataNodeInfo.java} | 45 +-
...tionInfoPersistence.java => PartitionInfo.java} | 137 +++++--
.../persistence/RegionInfoPersistence.java | 221 ----------
.../confignode/persistence/StorageGroupInfo.java | 150 +++++++
.../iotdb/confignode/service/ConfigNode.java | 25 +-
.../confignode/service/executor/PlanExecutor.java | 80 ++--
...odeRPCServer.java => ConfigNodeRPCService.java} | 34 +-
.../{server => }/ConfigNodeRPCServiceHandler.java | 6 +-
...erMBean.java => ConfigNodeRPCServiceMBean.java} | 4 +-
...sor.java => ConfigNodeRPCServiceProcessor.java} | 114 +++---
...nSerDeTest.java => ConfigRequestSerDeTest.java} | 158 +++----
...java => ConfigNodeRPCServiceProcessorTest.java} | 21 +-
.../confignode1conf/iotdb-confignode.properties | 29 ++
.../src/test/resources/confignode1conf/logback.xml | 140 +++++++
.../confignode2conf/iotdb-confignode.properties | 29 ++
.../src/test/resources/confignode2conf/logback.xml | 140 +++++++
.../confignode3conf/iotdb-confignode.properties | 29 ++
.../src/test/resources/confignode3conf/logback.xml | 140 +++++++
.../org/apache/iotdb/consensus/IConsensus.java | 5 +-
.../iotdb/consensus/ratis/RatisClientFactory.java | 67 +++
.../iotdb/consensus/ratis/RatisConsensus.java | 194 ++++-----
.../iotdb/consensus/ratis/RatisConsensusTest.java | 7 +-
.../tests/tools/importCsv/AbstractScript.java | 7 +-
docs/UserGuide/Operate-Metadata/Node.md | 45 ++
docs/UserGuide/Operate-Metadata/Storage-Group.md | 60 +++
docs/zh/UserGuide/Operate-Metadata/Node.md | 45 ++
.../zh/UserGuide/Operate-Metadata/Storage-Group.md | 60 +++
.../iotdb/hadoop/tsfile/TSFInputSplitTest.java | 3 +-
.../apache/iotdb/hive/TsFileDeserializerTest.java | 11 +-
.../org/apache/iotdb/hive/TsFileSerDeTest.java | 11 +-
.../influxdb/integration/IoTDBInfluxDBIT.java | 2 +-
.../apache/iotdb/db/integration/IoTDBAliasIT.java | 5 +-
.../iotdb/db/integration/IoTDBCompleteIT.java | 6 +-
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 16 +-
.../org/apache/iotdb/db/integration/IoTDBInIT.java | 7 +-
.../iotdb/db/integration/IoTDBMaxTimeQueryIT.java | 9 +-
.../db/integration/IoTDBResultMetadataIT.java | 13 +-
.../db/integration/IoTDBSchemaTemplateIT.java | 11 +-
...ggregationWithoutValueFilterWithDeletionIT.java | 11 +-
...upBySlidingWindowQueryWithoutValueFilterIT.java | 9 +-
.../groupby/IOTDBGroupByInnerIntervalIT.java | 13 +-
.../db/integration/groupby/IoTDBGroupByFillIT.java | 11 +-
.../db/integration/sync/IoTDBSyncReceiverIT.java | 6 +-
.../sync/IoTDBSyncReceiverLoaderIT.java | 4 +-
.../iotdb/db/integration/sync/SyncTestUtil.java | 11 +-
.../iotdb/jdbc/IoTDBPreparedStatementTest.java | 3 +-
.../dropwizard/DropwizardMetricManagerTest.java | 12 +-
node-commons/pom.xml | 10 +-
.../commons/client/AsyncBaseClientFactory.java | 47 +++
.../iotdb/commons/client/BaseClientFactory.java | 22 +-
.../commons/client/ClientFactoryProperty.java | 93 +++++
.../apache/iotdb/commons/client/ClientManager.java | 95 +++++
.../iotdb/commons/client/ClientPoolProperty.java | 83 ++++
.../iotdb/commons/client/IClientManager.java | 30 +-
.../iotdb/commons/client/IClientPoolFactory.java | 18 +-
.../async/AsyncConfigNodeIServiceClient.java | 145 +++++++
.../async/AsyncDataNodeDataBlockServiceClient.java | 146 +++++++
.../async/AsyncDataNodeInternalServiceClient.java | 157 +++++++
.../client/sync/SyncConfigNodeIServiceClient.java | 119 ++++++
.../sync/SyncDataNodeDataBlockServiceClient.java | 120 ++++++
.../sync/SyncDataNodeInternalServiceClient.java | 131 ++++++
.../exception/runtime/ThriftSerDeException.java | 21 +-
.../apache/iotdb/commons/service/JMXService.java | 13 +-
.../commons/utils/ThriftCommonsSerDeUtils.java | 147 ++++---
.../commons/utils/ThriftConfigNodeSerDeUtils.java | 72 ++--
.../apache/iotdb/commons/ClientManagerTest.java | 456 +++++++++++++++++++++
pom.xml | 1 +
.../iotdb/procedure/service/ProcedureNode.java | 2 +-
.../resources/conf/iotdb-engine.properties | 8 +
.../iotdb/db/client/DataNodeClientPoolFactory.java | 148 +++++++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 28 ++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 11 +
.../iotdb/db/metadata/mtree/IMTreeBelowSG.java | 3 +-
.../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 90 ++--
.../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 87 ++--
.../mtree/store/disk/cache/CacheManager.java | 35 +-
.../db/metadata/schemaregion/SchemaEngine.java | 9 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 103 ++---
.../schemaregion/SchemaRegionSchemaFileImpl.java | 106 ++---
.../iotdb/db/mpp/common/schematree/SchemaTree.java | 15 +
.../operator/process/merge/SingleColumnMerger.java | 2 +-
.../source/SeriesAggregateScanOperator.java | 6 +-
.../apache/iotdb/db/mpp/sql/analyze/Analyzer.java | 328 +++++++--------
.../apache/iotdb/db/mpp/sql/parser/ASTVisitor.java | 118 ++++--
.../db/mpp/sql/planner/DistributionPlanner.java | 7 +-
.../{plan => }/IFragmentParallelPlaner.java | 4 +-
.../db/mpp/sql/planner/LocalExecutionPlanner.java | 2 +-
.../iotdb/db/mpp/sql/planner/LogicalPlanner.java | 5 +-
.../iotdb/db/mpp/sql/planner/QueryPlanBuilder.java | 10 +-
.../{plan => }/SimpleFragmentParallelPlanner.java | 5 +-
.../{plan => }/WriteFragmentParallelPlanner.java | 5 +-
.../db/mpp/sql/planner/plan/node/PlanNode.java | 8 +
.../db/mpp/sql/planner/plan/node/PlanNodeId.java | 16 -
.../node/metedata/read/DevicesSchemaScanNode.java | 17 +
.../plan/node/metedata/read/SchemaFetchNode.java | 17 +
.../plan/node/metedata/read/SchemaMergeNode.java | 17 +
.../metedata/read/TimeSeriesSchemaScanNode.java | 17 +
.../node/metedata/write/AlterTimeSeriesNode.java | 17 +
.../plan/node/metedata/write/AuthorNode.java | 17 +
.../write/CreateAlignedTimeSeriesNode.java | 16 +
.../node/metedata/write/CreateTimeSeriesNode.java | 16 +
.../planner/plan/node/process/AggregateNode.java | 31 +-
.../planner/plan/node/process/DeviceMergeNode.java | 47 +--
.../planner/plan/node/process/ExchangeNode.java | 17 +
.../sql/planner/plan/node/process/FillNode.java | 9 +-
.../sql/planner/plan/node/process/FilterNode.java | 10 +-
.../planner/plan/node/process/FilterNullNode.java | 81 ++--
.../plan/node/process/GroupByLevelNode.java | 85 ++--
.../sql/planner/plan/node/process/LimitNode.java | 9 +-
.../sql/planner/plan/node/process/OffsetNode.java | 9 +-
.../sql/planner/plan/node/process/SortNode.java | 11 +-
.../planner/plan/node/process/TimeJoinNode.java | 124 +++---
.../planner/plan/node/sink/FragmentSinkNode.java | 17 +
.../plan/node/source/SeriesAggregateScanNode.java | 37 +-
.../planner/plan/node/source/SeriesScanNode.java | 21 +-
.../plan/node/write/InsertMultiTabletsNode.java | 17 +
.../sql/planner/plan/node/write/InsertNode.java | 66 +++
.../sql/planner/plan/node/write/InsertRowNode.java | 49 ++-
.../planner/plan/node/write/InsertRowsNode.java | 17 +
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 17 +
.../planner/plan/node/write/InsertTabletNode.java | 49 ++-
.../Aggregation.java} | 21 +-
.../planner/plan/parameter/AggregationStep.java | 73 ++++
.../plan/parameter/FilterNullParameter.java | 88 ++++
.../plan/parameter/GroupByTimeParameter.java} | 81 ++--
.../plan/{ => parameter}/InputLocation.java | 35 +-
.../planner/plan/{ => parameter}/OutputColumn.java | 24 +-
.../statement/component/FilterNullComponent.java | 5 +-
.../statement/component/GroupByTimeComponent.java | 73 ----
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 76 ++--
.../iotdb/db/query/expression/Expression.java | 114 +++++-
.../iotdb/db/query/expression/ExpressionType.java | 107 +----
.../iotdb/db/query/expression/ResultColumn.java | 21 +-
.../expression/binary/AdditionExpression.java | 19 +-
.../query/expression/binary/BinaryExpression.java | 12 +-
.../expression/binary/DivisionExpression.java | 19 +-
.../query/expression/binary/EqualToExpression.java | 20 +-
.../expression/binary/GreaterEqualExpression.java | 19 +-
.../expression/binary/GreaterThanExpression.java | 20 +-
.../expression/binary/LessEqualExpression.java | 19 +-
.../expression/binary/LessThanExpression.java | 19 +-
.../expression/binary/LogicAndExpression.java | 20 +-
.../query/expression/binary/LogicOrExpression.java | 20 +-
.../query/expression/binary/ModuloExpression.java | 19 +-
.../binary/MultiplicationExpression.java | 19 +-
.../expression/binary/NonEqualExpression.java | 19 +-
.../expression/binary/SubtractionExpression.java | 19 +-
.../db/query/expression/unary/ConstantOperand.java | 25 +-
.../query/expression/unary/FunctionExpression.java | 48 ++-
.../query/expression/unary/LogicNotExpression.java | 23 +-
.../query/expression/unary/NegationExpression.java | 22 +-
...ationExpression.java => RegularExpression.java} | 130 +++---
.../query/expression/unary/TimeSeriesOperand.java | 20 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../apache/iotdb/db/sync/conf/SyncPathUtil.java | 11 +
.../iotdb/db/sync/receiver/ReceiverService.java | 70 ++--
.../db/sync/receiver/manager/ReceiverManager.java | 132 +++---
.../db/sync/receiver/recovery/ReceiverLog.java | 20 +-
.../receiver/recovery/ReceiverLogAnalyzer.java | 34 +-
.../db/sync/sender/service/SenderService.java | 2 -
.../db/sync/transport/client/TransportClient.java | 21 +-
.../transport/server/TransportServiceImpl.java | 54 +--
.../db/wal/recover/file/TsFilePlanRedoer.java | 19 +-
.../apache/iotdb/db/wal/utils/WALWriteUtils.java | 42 ++
.../db/engine/cache/BloomFilterCacheTest.java | 5 +-
.../apache/iotdb/db/metadata/mnode/MNodeTest.java | 4 +-
.../db/metadata/mtree/schemafile/SegmentTest.java | 5 +-
.../iotdb/db/mpp/execution/DataDriverTest.java | 2 +-
.../iotdb/db/mpp/operator/LimitOperatorTest.java | 2 +-
.../operator/SeriesAggregateScanOperatorTest.java | 16 +-
.../db/mpp/operator/SingleColumnMergerTest.java | 2 +-
.../db/mpp/operator/TimeJoinOperatorTest.java | 6 +-
.../db/mpp/sql/plan/FragmentInstanceSerdeTest.java | 9 +-
.../iotdb/db/mpp/sql/plan/LogicalPlanPrinter.java | 11 +-
.../node/process/DeviceMergeNodeSerdeTest.java | 3 -
.../plan/node/process/ExchangeNodeSerdeTest.java | 3 -
.../sql/plan/node/process/FillNodeSerdeTest.java | 4 -
.../sql/plan/node/process/FilterNodeSerdeTest.java | 4 -
.../plan/node/process/FilterNullNodeSerdeTest.java | 9 +-
.../node/process/GroupByLevelNodeSerdeTest.java | 11 +-
.../sql/plan/node/process/LimitNodeSerdeTest.java | 11 +-
.../sql/plan/node/process/OffsetNodeSerdeTest.java | 17 +-
.../sql/plan/node/process/SortNodeSerdeTest.java | 9 +-
.../plan/node/process/TimeJoinNodeSerdeTest.java | 13 +-
.../source/SeriesAggregateScanNodeSerdeTest.java | 6 +-
.../influxdb/sql/InfluxDBLogicalGeneratorTest.java | 6 +-
.../db/protocol/mqtt/PayloadFormatManagerTest.java | 2 +-
.../iotdb/db/protocol/mqtt/PublishHandlerTest.java | 14 +-
.../iotdb/db/qp/physical/SerializedSizeTest.java | 2 +-
.../dataset/EngineDataSetWithValueFilterTest.java | 5 +-
.../SerializableBinaryTVListTest.java | 3 +-
.../datastructure/SerializableFloatTVListTest.java | 3 +-
.../datastructure/SerializableIntTVListTest.java | 3 +-
.../datastructure/SerializableLongTVListTest.java | 3 +-
.../valuefilter/RawQueryWithValueFilterTest.java | 4 +-
.../iotdb/db/service/InternalServiceImplTest.java | 4 +
.../sync/pipedata/BufferedPipeDataQueueTest.java | 3 +-
.../iotdb/db/sync/pipedata/PipeDataTest.java | 7 +-
.../sync/receiver/manager/ReceiverManagerTest.java | 12 +-
.../receiver/recovery/ReceiverLogAnalyzerTest.java | 17 +-
.../db/sync/transport/TransportServiceTest.java | 5 +-
.../iotdb/db/tools/TsFileSelfCheckToolTest.java | 8 +-
.../iotdb/db/utils/MathQueryDataSetUtilsTest.java | 2 +-
.../org/apache/iotdb/db/utils/MemUtilsTest.java | 8 +-
.../org/apache/iotdb/db/wal/DisableWALTest.java | 2 +-
.../org/apache/iotdb/db/wal/WALManagerTest.java | 4 +-
.../iotdb/db/wal/buffer/WALBufferCommonTest.java | 3 +-
.../db/wal/checkpoint/CheckpointManagerTest.java | 4 +-
.../apache/iotdb/db/wal/io/CheckpointFileTest.java | 2 +-
.../org/apache/iotdb/db/wal/io/WALFileTest.java | 2 +-
.../apache/iotdb/db/wal/node/WALFakeNodeTest.java | 3 +-
.../file/SealedTsFileRecoverPerformerTest.java | 5 +-
.../db/wal/recover/file/TsFilePlanRedoerTest.java | 4 +-
.../file/UnsealedTsFileRecoverPerformerTest.java | 5 +-
.../datanode1conf/iotdb-engine.properties | 37 ++
.../test/resources/datanode1conf/iotdb-metric.yml | 21 +
.../src/test/resources/datanode1conf/logback.xml | 302 ++++++++++++++
.../datanode2conf/iotdb-engine.properties | 37 ++
.../test/resources/datanode2conf/iotdb-metric.yml | 21 +
.../src/test/resources/datanode2conf/logback.xml | 302 ++++++++++++++
.../datanode3conf/iotdb-engine.properties | 37 ++
.../test/resources/datanode3conf/iotdb-metric.yml | 21 +
.../src/test/resources/datanode3conf/logback.xml | 302 ++++++++++++++
.../java/org/apache/iotdb/db/sql/SingleNodeIT.java | 8 +-
thrift-sync/src/main/thrift/transport.thrift | 6 +-
.../iotdb/tsfile/common/block/TsBlockTest.java | 12 +-
.../iotdb/tsfile/read/common/BatchDataTest.java | 4 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 5 +-
267 files changed, 7398 insertions(+), 2720 deletions(-)