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:40 UTC
[iotdb] branch standaloneMPPWrite updated (6855315a2a -> 5b2da615f9)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch standaloneMPPWrite
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 6855315a2a Merge branch 'master' of https://github.com/apache/iotdb into standaloneMPPWrite
add 9504a2b703 [IOTDB-2976] Add English and Chinese docs for count devices and count storage groups (#5635)
add 61dde93485 filter non schemaRegionDir (#5640)
add a547fef5ca Serialize measurement schema of insert node to wal entry (#5638)
add d939abfc5e Refactor attributes in PlanNode (#5616)
add d3a8516172 Fix TimeJoinNode clone and serde bug (#5644)
add 39619ff619 [IOTDB-2982] Recover tsfile after datanode restart (#5643)
add ce064f429c Add config example for new cluster (#5624)
add 949abc4294 [IOTDB-2979] Optimize the serialization and deserialization of thrift data structures (#5637)
add a27cd2e58b [IOTDB-2984] RatisConsensus Recovery Logic (#5648)
add 9685c5b67b [IOTDB-2930]Fix concurrent UnPin bug & Improve template implementation (#5647)
add d47339793f [IOTDB-2989] Expression Serialize & Deserialize (#5649)
add f03f0205ab [IOTDB-2933] detect sender exit and set pipestatus=STOP (#5557)
add ecd19464f4 Fix import wildcard violation
add 467add666d [IOTDB-2945] Reconstruct ConfigNode manage layer and persistence layer (#5627)
add 74bcc7edc9 [IOTDB-2955] Design and implement ClientManager for thrift client's pooling management (#5595)
add dde44dcbe2 [IOTDB-2996] Fix wildcard import in test folders (#5652)
new a28e63fd2c Merge branch 'master' of https://github.com/apache/iotdb into standaloneMPPWrite
new 5b2da615f9 remove to local config node package
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 ++
.../resources/confignode1conf}/logback.xml | 0
.../confignode2conf/iotdb-confignode.properties | 29 ++
.../resources/confignode2conf}/logback.xml | 0
.../confignode3conf/iotdb-confignode.properties | 29 ++
.../resources/confignode3conf}/logback.xml | 0
.../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 +
.../LocalConfigNode.java | 3 +-
.../LocalDataPartitionTable.java | 2 +-
.../LocalSchemaPartitionTable.java | 2 +-
.../iotdb/db/metadata/LocalSchemaProcessor.java | 1 +
.../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 +++++++--------
.../sql/analyze/StandalonePartitionFetcher.java | 2 +-
.../mpp/sql/analyze/StandaloneSchemaFetcher.java | 2 +-
.../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 | 4 +-
.../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 +-
.../operator/schema/SchemaScanOperatorTest.java | 2 +-
.../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 | 6 +-
.../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 | 0
.../resources/datanode1conf}/logback.xml | 0
.../datanode2conf/iotdb-engine.properties | 37 ++
.../test/resources/datanode2conf}/iotdb-metric.yml | 0
.../resources/datanode2conf}/logback.xml | 0
.../datanode3conf/iotdb-engine.properties | 37 ++
.../test/resources/datanode3conf}/iotdb-metric.yml | 0
.../resources/datanode3conf}/logback.xml | 0
.../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 +-
274 files changed, 6019 insertions(+), 2728 deletions(-)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/client/ConfigNodeClientPoolFactory.java
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/PhysicalPlan.java => consensus/request/ConfigRequest.java} (62%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/PhysicalPlanType.java => consensus/request/ConfigRequestType.java} (94%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/sys/AuthorPlan.java => consensus/request/auth/AuthorReq.java} (77%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/crud/GetOrCreateDataPartitionPlan.java => consensus/request/read/GetOrCreateDataPartitionReq.java} (92%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/crud/GetOrCreateSchemaPartitionPlan.java => consensus/request/read/GetOrCreateSchemaPartitionReq.java} (88%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/sys/QueryDataNodeInfoPlan.java => consensus/request/read/QueryDataNodeInfoReq.java} (75%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/sys/QueryStorageGroupSchemaPlan.java => consensus/request/read/QueryStorageGroupSchemaReq.java} (74%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/crud/CreateDataPartitionPlan.java => consensus/request/write/CreateDataPartitionReq.java} (91%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/crud/CreateRegionsPlan.java => consensus/request/write/CreateRegionsReq.java} (85%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/crud/CreateSchemaPartitionPlan.java => consensus/request/write/CreateSchemaPartitionReq.java} (87%)
copy confignode/src/main/java/org/apache/iotdb/confignode/{physical/sys/DeleteStorageGroupPlan.java => consensus/request/write/DeleteStorageGroupReq.java} (74%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/sys/RegisterDataNodePlan.java => consensus/request/write/RegisterDataNodeReq.java} (76%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{physical/sys/SetStorageGroupPlan.java => consensus/request/write/SetStorageGroupReq.java} (78%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{DataNodeConfigurationDataSet.java => DataNodeConfigurationResp.java} (94%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{DataNodeLocationsDataSet.java => DataNodeLocationsResp.java} (94%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{DataPartitionDataSet.java => DataPartitionResp.java} (95%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{PermissionInfoDataSet.java => PermissionInfoResp.java} (89%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{SchemaPartitionDataSet.java => SchemaPartitionResp.java} (94%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{StorageGroupSchemaDataSet.java => StorageGroupSchemaResp.java} (95%)
rename confignode/src/main/java/org/apache/iotdb/confignode/manager/{RegionManager.java => ClusterSchemaManager.java} (63%)
rename confignode/src/main/java/org/apache/iotdb/confignode/persistence/{AuthorInfoPersistence.java => AuthorInfo.java} (81%)
rename confignode/src/main/java/org/apache/iotdb/confignode/persistence/{DataNodeInfoPersistence.java => DataNodeInfo.java} (81%)
rename confignode/src/main/java/org/apache/iotdb/confignode/persistence/{PartitionInfoPersistence.java => PartitionInfo.java} (63%)
delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/RegionInfoPersistence.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/StorageGroupInfo.java
rename confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/{server/ConfigNodeRPCServer.java => ConfigNodeRPCService.java} (76%)
rename confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/{server => }/ConfigNodeRPCServiceHandler.java (89%)
rename confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/{server/ConfigNodeRPCServerMBean.java => ConfigNodeRPCServiceMBean.java} (88%)
rename confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/{server/ConfigNodeRPCServerProcessor.java => ConfigNodeRPCServiceProcessor.java} (70%)
rename confignode/src/test/java/org/apache/iotdb/confignode/physical/{PhysicalPlanSerDeTest.java => ConfigRequestSerDeTest.java} (71%)
rename confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/{server/ConfigNodeRPCServerProcessorTest.java => ConfigNodeRPCServiceProcessorTest.java} (98%)
create mode 100644 confignode/src/test/resources/confignode1conf/iotdb-confignode.properties
copy confignode/src/{assembly/resources/conf => test/resources/confignode1conf}/logback.xml (100%)
create mode 100644 confignode/src/test/resources/confignode2conf/iotdb-confignode.properties
copy confignode/src/{assembly/resources/conf => test/resources/confignode2conf}/logback.xml (100%)
create mode 100644 confignode/src/test/resources/confignode3conf/iotdb-confignode.properties
copy confignode/src/{assembly/resources/conf => test/resources/confignode3conf}/logback.xml (100%)
create mode 100644 consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisClientFactory.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/AsyncBaseClientFactory.java
copy confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/DeleteStorageGroupPlan.java => node-commons/src/main/java/org/apache/iotdb/commons/client/BaseClientFactory.java (54%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/ClientFactoryProperty.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/ClientManager.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolProperty.java
rename confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/DeleteStorageGroupPlan.java => node-commons/src/main/java/org/apache/iotdb/commons/client/IClientManager.java (60%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/IOutputPlanNode.java => node-commons/src/main/java/org/apache/iotdb/commons/client/IClientPoolFactory.java (69%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeIServiceClient.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeDataBlockServiceClient.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncConfigNodeIServiceClient.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeDataBlockServiceClient.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeInternalServiceClient.java
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/InputLocation.java => node-commons/src/main/java/org/apache/iotdb/commons/exception/runtime/ThriftSerDeException.java (62%)
create mode 100644 node-commons/src/test/java/org/apache/iotdb/commons/ClientManagerTest.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
rename server/src/main/java/org/apache/iotdb/db/{metadata => localconfignode}/LocalConfigNode.java (99%)
rename server/src/main/java/org/apache/iotdb/db/{metadata => localconfignode}/LocalDataPartitionTable.java (98%)
rename server/src/main/java/org/apache/iotdb/db/{metadata => localconfignode}/LocalSchemaPartitionTable.java (98%)
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/{plan => }/IFragmentParallelPlaner.java (92%)
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/{plan => }/SimpleFragmentParallelPlanner.java (96%)
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/{plan => }/WriteFragmentParallelPlanner.java (91%)
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/{IOutputPlanNode.java => parameter/Aggregation.java} (60%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/parameter/AggregationStep.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/parameter/FilterNullParameter.java
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/{statement/component/GroupByTimeComponent.java => planner/plan/parameter/GroupByTimeParameter.java} (75%)
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/{ => parameter}/InputLocation.java (55%)
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/{ => parameter}/OutputColumn.java (72%)
copy server/src/main/java/org/apache/iotdb/db/query/expression/unary/{NegationExpression.java => RegularExpression.java} (63%)
create mode 100644 server/src/test/resources/datanode1conf/iotdb-engine.properties
copy {cluster/src/test/resources/node1conf => server/src/test/resources/datanode1conf}/iotdb-metric.yml (100%)
copy server/src/{assembly/resources/conf => test/resources/datanode1conf}/logback.xml (100%)
create mode 100644 server/src/test/resources/datanode2conf/iotdb-engine.properties
copy {cluster/src/test/resources/node1conf => server/src/test/resources/datanode2conf}/iotdb-metric.yml (100%)
copy server/src/{assembly/resources/conf => test/resources/datanode2conf}/logback.xml (100%)
create mode 100644 server/src/test/resources/datanode3conf/iotdb-engine.properties
copy {cluster/src/test/resources/node1conf => server/src/test/resources/datanode3conf}/iotdb-metric.yml (100%)
copy server/src/{assembly/resources/conf => test/resources/datanode3conf}/logback.xml (100%)
[iotdb] 01/02: Merge branch 'master' of https://github.com/apache/iotdb into standaloneMPPWrite
Posted by ha...@apache.org.
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(-)
[iotdb] 02/02: remove to local config node package
Posted by ha...@apache.org.
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 5b2da615f9a9dfd9c62a2587b21a934b74811297
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Apr 25 09:22:36 2022 +0800
remove to local config node package
---
.../apache/iotdb/db/{metadata => localconfignode}/LocalConfigNode.java | 3 ++-
.../db/{metadata => localconfignode}/LocalDataPartitionTable.java | 2 +-
.../db/{metadata => localconfignode}/LocalSchemaPartitionTable.java | 2 +-
.../main/java/org/apache/iotdb/db/metadata/LocalSchemaProcessor.java | 1 +
.../apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java | 2 +-
.../org/apache/iotdb/db/mpp/sql/analyze/StandaloneSchemaFetcher.java | 2 +-
server/src/main/java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../apache/iotdb/db/mpp/operator/schema/SchemaScanOperatorTest.java | 2 +-
.../test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java | 2 +-
9 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/LocalConfigNode.java b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
similarity index 99%
rename from server/src/main/java/org/apache/iotdb/db/metadata/LocalConfigNode.java
rename to server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
index bdd9b0f49b..a0ec8a5c8b 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/LocalConfigNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.metadata;
+package org.apache.iotdb.db.localconfignode;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.conf.IoTDBConstant;
@@ -34,6 +34,7 @@ import org.apache.iotdb.db.exception.metadata.PathNotExistException;
import org.apache.iotdb.db.exception.metadata.StorageGroupAlreadySetException;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
import org.apache.iotdb.db.exception.metadata.template.UndefinedTemplateException;
+import org.apache.iotdb.db.metadata.LocalSchemaProcessor;
import org.apache.iotdb.db.metadata.mnode.IStorageGroupMNode;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.metadata.rescon.SchemaResourceManager;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/LocalDataPartitionTable.java b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalDataPartitionTable.java
similarity index 98%
rename from server/src/main/java/org/apache/iotdb/db/metadata/LocalDataPartitionTable.java
rename to server/src/main/java/org/apache/iotdb/db/localconfignode/LocalDataPartitionTable.java
index 52fc102437..cb1cb24a34 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/LocalDataPartitionTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalDataPartitionTable.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.metadata;
+package org.apache.iotdb.db.localconfignode;
import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.db.metadata.path.PartialPath;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaPartitionTable.java b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalSchemaPartitionTable.java
similarity index 98%
rename from server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaPartitionTable.java
rename to server/src/main/java/org/apache/iotdb/db/localconfignode/LocalSchemaPartitionTable.java
index c0c65c2ebe..df61980759 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaPartitionTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalSchemaPartitionTable.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.metadata;
+package org.apache.iotdb.db.localconfignode;
import org.apache.iotdb.commons.consensus.SchemaRegionId;
import org.apache.iotdb.db.exception.metadata.MetadataException;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaProcessor.java b/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaProcessor.java
index 7d82d3167b..5a3622b1d3 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaProcessor.java
@@ -28,6 +28,7 @@ import org.apache.iotdb.db.exception.metadata.PathAlreadyExistException;
import org.apache.iotdb.db.exception.metadata.PathNotExistException;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
import org.apache.iotdb.db.exception.metadata.template.UndefinedTemplateException;
+import org.apache.iotdb.db.localconfignode.LocalConfigNode;
import org.apache.iotdb.db.metadata.lastCache.LastCacheManager;
import org.apache.iotdb.db.metadata.mnode.IMNode;
import org.apache.iotdb.db.metadata.mnode.IMeasurementMNode;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
index fbe1be4c7f..ceacc51b6c 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
@@ -31,7 +31,7 @@ import org.apache.iotdb.db.engine.StorageEngineV2;
import org.apache.iotdb.db.exception.DataRegionException;
import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.exception.sql.StatementAnalyzeException;
-import org.apache.iotdb.db.metadata.LocalConfigNode;
+import org.apache.iotdb.db.localconfignode.LocalConfigNode;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.mpp.common.schematree.PathPatternTree;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandaloneSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandaloneSchemaFetcher.java
index 81d1702710..1a43583964 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandaloneSchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandaloneSchemaFetcher.java
@@ -20,7 +20,7 @@ package org.apache.iotdb.db.mpp.sql.analyze;
import org.apache.iotdb.commons.consensus.SchemaRegionId;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.metadata.LocalConfigNode;
+import org.apache.iotdb.db.localconfignode.LocalConfigNode;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.metadata.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.metadata.schemaregion.SchemaEngine;
diff --git a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
index f281b1f4b5..b0324c3a1a 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
@@ -37,7 +37,7 @@ import org.apache.iotdb.db.engine.cq.ContinuousQueryService;
import org.apache.iotdb.db.engine.flush.FlushManager;
import org.apache.iotdb.db.engine.trigger.service.TriggerRegistrationService;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.metadata.LocalConfigNode;
+import org.apache.iotdb.db.localconfignode.LocalConfigNode;
import org.apache.iotdb.db.metadata.LocalSchemaProcessor;
import org.apache.iotdb.db.mpp.buffer.DataBlockService;
import org.apache.iotdb.db.mpp.schedule.FragmentInstanceScheduler;
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/operator/schema/SchemaScanOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/operator/schema/SchemaScanOperatorTest.java
index d4532ff167..6b3874b11d 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/operator/schema/SchemaScanOperatorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/operator/schema/SchemaScanOperatorTest.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.mpp.operator.schema;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.metadata.LocalConfigNode;
+import org.apache.iotdb.db.localconfignode.LocalConfigNode;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.metadata.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.metadata.schemaregion.SchemaEngine;
diff --git a/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java b/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java
index 255b73f5a7..20e2ab626b 100644
--- a/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java
@@ -32,7 +32,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.consensus.ConsensusImpl;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.metadata.LocalConfigNode;
+import org.apache.iotdb.db.localconfignode.LocalConfigNode;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.mpp.common.PlanFragmentId;
import org.apache.iotdb.db.mpp.sql.analyze.QueryType;