You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/10/19 05:52:34 UTC
[iotdb] branch beyyes/cluster_up updated (cecfe9b2be -> 2fc11ba42a)
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a change to branch beyyes/cluster_up
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from cecfe9b2be [IOTDB-4623] Enhance the stability of remove-confignode.sh when executed in non-running node (#7591)
add 90733d8289 [IOTDB-4646] Illegal privilege APPLY_TEMPLATE on seriesPath root.ln.** (#7597)
add d8012d29b8 [IOTDB-4589] Register/recover trigger when registering/restart a datanode (#7575)
add 5fb78ab80e [IOTDB-4648] Fix bug ConsensusManager won't initialize when restart
add 66467bc30d [IOTDB-3067] Eliminate PhysicalPlan usage in SchemaRegion (#7573)
new 481bb7df29 fix type in ConfigNodeRemoveCheck
add 089161ecef [docfix] add a sentence in chapter “kill query” to conclude (#7608)
add 11c3681445 Update 0.14.0-preview3 website (#7611)
add 928e01fae3 update org.apache.kafka:kafka_2.13 2.8.1 to 2.8.2 (#7606)
add cbf51cc26f Optimizing regex matching in Regexp (#7618)
add 26d6c9e265 [IOTDB-4658] Fix ConfigNode restart bug and add Cluster restart IT (#7623)
add c1c8fbaa77 Fix time unit in the ttl log (#7628)
add 0ebc42fd83 [IOTDB-4654] Fix concurrent bug caused by sharing same ChunkMetadata
add c912f937cd [IODB-4657] Fix PatternTreeMap#getOverlapped does not return correct values (#7625)
add a4fe367436 [IOTDB-4643] Add Unknown_DataNode_Detector (#7585)
add 53a436f93a Refactor IT classes and packages (#7626)
add d1358dd09f [IOTDB-4647] Fix CSV import error when import header name with type (#7600)
add 4eaa59103c [IOTDB-4650] Support starting reading from tail in RewriteTsFileTool (#7604)
add 5836e07d6d Add detailed error messages while query is time out (#7632)
add cf6d85062d [IOTDB-4656] Expose client retry configurations in RatisConsensus
add e18af3de47 update construct method of pendingBatch. (#7548)
add f33130b9fc [IOTDB-4653] add time precision units when setting TTL (#7639)
add dbef84905a [IOTDB-4649] Fix the problem that constants which have same valueString but different types can not be distinguished. (#7619)
add 08b6c1514b [IOTDB-4636] Add check to avoid flush empty chunk group (#7635)
add 2cb85a9286 [IOTDB-4636] Fix IndexOutOfBoundsException when compacting aligned series (#7638)
add aac98fec73 [IOTDB-3656] mpp load supports modification (#7354)
add 5b91cecdeb [IOTDB-4680] fix error msg "%s" in load statement (#7645)
add a078e88daa [IOTDB-4256] Implement analyzer for SELECT INTO statement (#7588)
add 79bfe4d123 [IOTDB-3462] Update ratis version to 2.4.0 (#7651)
add 1b71c37754 [IOTDB-4647] Fix CSV import error when import header name with type (#7636)
add 993782d2de [IOTDB-4679] Make MPPDataExchangeService use internal_address instead of rpc_address (#7648)
add a639c09875 Added changes and user docs to rpc sqls (#7633)
new cd838afcd7 Merge branch 'master' into beyyes/cluster_up
new 2fc11ba42a perfect add/remove confignode process
The 3 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 | 20 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 1 +
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 20 +-
.../resources/conf/iotdb-confignode.properties | 16 +
.../iotdb/confignode/conf/ConfigNodeConfig.java | 130 ++++++-
.../confignode/conf/ConfigNodeDescriptor.java | 64 ++++
.../confignode/conf/ConfigNodeRemoveCheck.java | 4 +-
.../confignode/conf/SystemPropertiesUtils.java | 24 +-
.../consensus/request/ConfigPhysicalPlan.java | 10 +-
.../consensus/request/ConfigPhysicalPlanType.java | 3 +-
.../{GetRoutingPlan.java => GetRegionIdPlan.java} | 10 +-
.../consensus/request/read/GetTriggerJarPlan.java | 68 ++++
.../consensus/response/DataNodeRegisterResp.java | 11 +
.../{GetRoutingResp.java => GetRegionIdResp.java} | 10 +-
.../{GetRoutingResp.java => TriggerJarResp.java} | 25 +-
.../statemachine/PartitionRegionStateMachine.java | 16 +-
.../iotdb/confignode/manager/ConfigManager.java | 42 ++-
.../iotdb/confignode/manager/ConsensusManager.java | 19 +-
.../apache/iotdb/confignode/manager/IManager.java | 14 +-
.../iotdb/confignode/manager/TriggerManager.java | 27 ++
.../iotdb/confignode/manager/load/LoadManager.java | 6 +-
.../manager/load/balancer/RouteBalancer.java | 6 +-
.../manager/load/balancer/router/IRouter.java | 2 +-
.../load/balancer/router/LazyGreedyRouter.java | 2 +-
.../manager/load/balancer/router/LeaderRouter.java | 2 +-
.../balancer/router/LoadScoreGreedyRouter.java | 2 +-
.../iotdb/confignode/manager/node/NodeManager.java | 89 ++++-
.../manager/partition/PartitionManager.java | 8 +-
.../iotdb/confignode/persistence/NodeInfo.java | 2 -
.../iotdb/confignode/persistence/TriggerInfo.java | 24 ++
.../persistence/executor/ConfigPlanExecutor.java | 9 +-
.../persistence/partition/PartitionInfo.java | 12 +-
.../partition/StorageGroupPartitionTable.java | 6 +-
.../confignode/procedure/ProcedureExecutor.java | 2 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 16 -
.../impl/node/AddConfigNodeProcedure.java | 7 +-
.../iotdb/confignode/service/ConfigNode.java | 20 +-
.../confignode/service/ConfigNodeCommandLine.java | 5 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 26 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 29 +-
.../load/balancer/router/LazyGreedyRouterTest.java | 8 +-
.../load/balancer/router/LeaderRouterTest.java | 6 +-
.../balancer/router/LoadScoreGreedyRouterTest.java | 2 +-
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 338 -----------------
consensus/pom.xml | 2 +-
.../apache/iotdb/consensus/config/RatisConfig.java | 67 +++-
.../multileader/logdispatcher/LogDispatcher.java | 18 +-
.../multileader/logdispatcher/PendingBatch.java | 11 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 5 +-
.../multileader/logdispatcher/SyncStatusTest.java | 25 +-
.../apache/iotdb/consensus/ratis/SnapshotTest.java | 3 +
docs/Download/README.md | 14 +-
docs/UserGuide/Cluster/Cluster-Concept.md | 18 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 12 +-
docs/UserGuide/Delete-Data/TTL.md | 16 +-
.../Maintenance-Tools/Maintenance-Command.md | 102 +++++-
docs/zh/Download/README.md | 14 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 12 +-
docs/zh/UserGuide/Delete-Data/TTL.md | 18 +-
.../Maintenance-Tools/Maintenance-Command.md | 101 +++++-
example/kafka/pom.xml | 2 +-
.../util/TSFileConfigUtilCompletenessTest.java | 3 +-
integration-test/checkstyle.xml | 8 +-
integration-test/import-control.xml | 81 +++--
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 76 +++-
.../java/org/apache/iotdb/it/env/MppConfig.java | 11 +-
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 14 +-
.../org/apache/iotdb/it/utils/TsFileGenerator.java | 232 ++++++++++++
.../org/apache/iotdb/itbase/env/BaseConfig.java | 8 +-
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 8 +-
.../{ => it}/IoTDBClusterPartitionIT.java | 117 +++---
.../iotdb/confignode/it/IoTDBClusterRestartIT.java | 88 +++++
.../confignode/{ => it}/IoTDBConfigNodeIT.java | 10 +-
.../{ => it}/IoTDBConfigNodeSnapshotIT.java | 8 +-
.../iotdb/confignode/it/IoTDBStorageGroupIT.java | 183 ++++++++++
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 340 +++++++-----------
.../java/org/apache/iotdb/db/it/IoTDBFilterIT.java | 24 +-
.../org/apache/iotdb/db/it/IoTDBFilterNullIT.java | 3 +
.../it/aggregation/IoTDBAggregationByLevelIT.java | 3 +
.../it/aggregation/IoTDBAggregationDeleteIT.java | 3 +
.../aggregation/IoTDBAggregationScanOrderIT.java | 3 +
.../aggregation/IoTDBAggregationSmallDataIT.java | 3 +
.../db/it/aggregation/IoTDBTagAggregationIT.java | 3 +
.../aligned/IoTDBAggregationWithDeletion2IT.java | 1 +
.../it/aligned/IoTDBAggregationWithDeletionIT.java | 1 +
.../db/it/aligned/IoTDBAlignedLastQuery2IT.java | 1 +
.../db/it/aligned/IoTDBAlignedLastQuery3IT.java | 1 +
.../db/it/aligned/IoTDBAlignedLastQueryIT.java | 1 +
.../db/it/aligned/IoTDBAlignedSeriesQuery2IT.java | 1 +
.../db/it/aligned/IoTDBAlignedSeriesQuery3IT.java | 1 +
.../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 1 +
.../IoTDBAlignedSeriesQueryWithDeletionIT.java | 1 +
.../db/it/aligned/IoTDBGroupByLevelQueryIT.java | 1 +
...GroupByQueryWithValueFilterWithDeletion2IT.java | 1 +
...BGroupByQueryWithValueFilterWithDeletionIT.java | 1 +
...upByQueryWithoutValueFilterWithDeletion2IT.java | 1 +
...oupByQueryWithoutValueFilterWithDeletionIT.java | 1 +
.../it/aligned/IoTDBLastQueryWithDeletion2IT.java | 1 +
.../it/aligned/IoTDBLastQueryWithDeletionIT.java | 1 +
.../aligned/IoTDBLastQueryWithoutLastCache2IT.java | 1 +
.../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 1 +
...DBLastQueryWithoutLastCacheWithDeletion2IT.java | 1 +
...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 1 +
...BRawQueryWithoutValueFilterWithDeletion2IT.java | 1 +
...DBRawQueryWithoutValueFilterWithDeletionIT.java | 1 +
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 14 +-
.../db/it/{aligned => utils}/AlignedWriteUtil.java | 2 +-
.../db/it/withoutNull/IoTDBWithoutAllNullIT.java | 3 +
.../db/it/withoutNull/IoTDBWithoutAnyNullIT.java | 3 +
.../withoutNull/IoTDBWithoutNullAllFilterIT.java | 3 +
.../withoutNull/IoTDBWithoutNullAnyFilterIT.java | 3 +
.../{ => it}/IoTDBSessionAlignedInsertIT.java | 4 +-
.../session/{ => it}/IoTDBSessionComplexIT.java | 4 +-
.../{ => it}/IoTDBSessionDisableMemControlIT.java | 4 +-
.../session/{ => it}/IoTDBSessionInsertNulIT.java | 4 +-
.../session/{ => it}/IoTDBSessionSimpleIT.java | 4 +-
.../{ => it}/IoTDBSessionSyntaxConventionIT.java | 4 +-
.../{SessionTest.java => it/SessionIT.java} | 9 +-
...IoTDBLoadExternalTsFileWithTimePartitionIT.java | 329 -----------------
.../db/integration/IoTDBRepeatPatternNameIT.java | 67 ++++
.../apache/iotdb/commons/conf/IoTDBConstant.java | 5 +
.../commons/partition/DataPartitionTable.java | 4 +-
.../commons/partition/SchemaPartitionTable.java | 2 +-
.../commons/partition/SeriesPartitionTable.java | 2 +-
.../org/apache/iotdb/commons/path/PartialPath.java | 13 +
.../apache/iotdb/commons/path/PatternTreeMap.java | 44 ++-
.../org/apache/iotdb/commons/utils/AuthUtils.java | 1 +
.../java/org/apache/iotdb/RewriteTsFileTool.java | 249 ++++++++++++-
.../schemaregion/rocksdb/RSchemaRegion.java | 32 +-
.../resources/conf/iotdb-datanode.properties | 4 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 28 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 85 +++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 22 ++
.../db/consensus/DataRegionConsensusImpl.java | 15 +
.../db/consensus/SchemaRegionConsensusImpl.java | 15 +
.../impl/ReadChunkCompactionPerformer.java | 21 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 10 +-
.../iotdb/db/engine/load/AlignedChunkData.java | 9 +-
.../org/apache/iotdb/db/engine/load/ChunkData.java | 14 +-
.../apache/iotdb/db/engine/load/DeletionData.java | 72 ++++
.../iotdb/db/engine/load/LoadTsFileManager.java | 29 +-
.../iotdb/db/engine/load/NonAlignedChunkData.java | 1 +
.../load/{ChunkData.java => TsFileData.java} | 42 +--
.../iotdb/db/engine/storagegroup/DataRegion.java | 16 +-
.../db/engine/storagegroup/TsFileManager.java | 5 +-
.../storagegroup/timeindex/DeviceTimeIndex.java | 5 +-
.../query/QueryTimeoutRuntimeException.java | 9 +
.../iotdb/db/metadata/LocalSchemaProcessor.java | 2 +-
.../apache/iotdb/db/metadata/idtable/IDTable.java | 8 +-
.../db/metadata/idtable/IDTableHashmapImpl.java | 12 +-
.../db/metadata/logfile/BufferedSerializer.java | 54 +++
.../db/metadata/logfile/FakeCRC32Deserializer.java | 91 +++++
.../db/metadata/logfile/FakeCRC32Serializer.java | 65 ++++
.../logfile/IDeserializer.java} | 25 +-
.../logfile/ISerializer.java} | 26 +-
.../iotdb/db/metadata/logfile/MLogTxtWriter.java | 2 +-
.../iotdb/db/metadata/logfile/SchemaLogReader.java | 247 +++++++++++++
.../iotdb/db/metadata/logfile/SchemaLogWriter.java | 114 ++++++
.../plan/schemaregion/ISchemaRegionPlan.java} | 15 +-
.../plan/schemaregion/SchemaRegionPlanType.java | 75 ++++
.../plan/schemaregion/SchemaRegionPlanVisitor.java | 90 +++++
.../impl/ActivateTemplateInClusterPlanImpl.java | 79 ++++
.../impl/ActivateTemplatePlanImpl.java} | 28 +-
.../impl/AutoCreateDeviceMNodePlanImpl.java} | 28 +-
.../schemaregion/impl/ChangeAliasPlanImpl.java} | 39 +-
.../impl/ChangeTagOffsetPlanImpl.java} | 39 +-
.../impl/CreateAlignedTimeSeriesPlanImpl.java | 171 +++++++++
.../impl/CreateTimeSeriesPlanImpl.java | 163 +++++++++
.../impl/DeleteTimeSeriesPlanImpl.java} | 29 +-
.../impl/PreDeleteTimeSeriesPlanImpl.java} | 28 +-
.../impl/RollbackPreDeleteTimeSeriesPlanImpl.java} | 28 +-
.../impl/SchemaRegionPlanDeserializer.java | 337 +++++++++++++++++
.../schemaregion/impl/SchemaRegionPlanFactory.java | 140 ++++++++
.../impl/SchemaRegionPlanSerializer.java | 399 +++++++++++++++++++++
.../impl/SchemaRegionPlanTxtSerializer.java | 238 ++++++++++++
.../schemaregion/impl/SetTemplatePlanImpl.java} | 62 +---
.../schemaregion/impl/UnsetTemplatePlanImpl.java} | 62 +---
.../write/IActivateTemplateInClusterPlan.java | 60 ++++
.../schemaregion/write/IActivateTemplatePlan.java} | 26 +-
.../write/IAutoCreateDeviceMNodePlan.java} | 26 +-
.../plan/schemaregion/write/IChangeAliasPlan.java} | 30 +-
.../schemaregion/write/IChangeTagOffsetPlan.java} | 30 +-
.../write/ICreateAlignedTimeSeriesPlan.java | 80 +++++
.../schemaregion/write/ICreateTimeSeriesPlan.java | 79 ++++
.../schemaregion/write/IDeleteTimeSeriesPlan.java} | 28 +-
.../write/IPreDeleteTimeSeriesPlan.java} | 26 +-
.../write/IRollbackPreDeleteTimeSeriesPlan.java} | 26 +-
.../plan/schemaregion/write/ISetTemplatePlan.java} | 29 +-
.../schemaregion/write/IUnsetTemplatePlan.java} | 29 +-
.../db/metadata/schemaregion/ISchemaRegion.java | 28 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 379 ++++++++++++-------
.../schemaregion/SchemaRegionSchemaFileImpl.java | 330 ++++++++++-------
.../metadata/visitor/SchemaExecutionVisitor.java | 73 +---
.../db/mpp/common/header/ColumnHeaderConstant.java | 33 +-
.../db/mpp/common/header/DatasetHeaderFactory.java | 10 +-
.../execution/exchange/MPPDataExchangeService.java | 8 +-
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 29 ++
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 128 ++++++-
.../iotdb/db/mpp/plan/analyze/SelectIntoUtils.java | 105 ++++++
.../db/mpp/plan/execution/QueryExecution.java | 6 +-
.../plan/execution/config/ConfigTaskVisitor.java | 9 +-
.../config/executor/ClusterConfigTaskExecutor.java | 30 +-
.../config/executor/IConfigTaskExecutor.java | 4 +-
.../executor/StandaloneConfigTaskExecutor.java | 4 +-
.../{GetRegionTask.java => GetRegionIdTask.java} | 22 +-
.../mpp/plan/expression/leaf/ConstantOperand.java | 4 +-
.../plan/expression/leaf/TimeSeriesOperand.java | 9 +
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 111 +++++-
.../plan/node/load/LoadSingleTsFileNode.java | 69 +++-
.../planner/plan/node/load/LoadTsFileNode.java | 3 +
.../plan/node/load/LoadTsFilePieceNode.java | 35 +-
.../node/metedata/write/ActivateTemplateNode.java | 15 +-
.../write/CreateAlignedTimeSeriesNode.java | 25 +-
.../node/metedata/write/CreateTimeSeriesNode.java | 17 +-
.../parameter/DeviceViewIntoPathDescriptor.java | 208 +++++++++++
.../planner/plan/parameter/IntoPathDescriptor.java | 167 +++++++++
.../plan/scheduler/load/LoadTsFileScheduler.java | 7 +
.../db/mpp/plan/statement/StatementVisitor.java | 6 +-
.../plan/statement/component/IntoComponent.java | 237 ++++++++++++
.../db/mpp/plan/statement/component/IntoItem.java | 73 ++++
.../plan/statement/crud/LoadTsFileStatement.java | 4 +-
.../db/mpp/plan/statement/crud/QueryStatement.java | 38 ++
...ionStatement.java => GetRegionIdStatement.java} | 6 +-
.../dag/input/ConstantInputReader.java | 3 +-
.../transformation/dag/util/TransformUtils.java | 3 +-
.../sys/ActivateTemplateInClusterPlan.java | 19 +-
.../db/qp/physical/sys/ActivateTemplatePlan.java | 8 +-
.../qp/physical/sys/AutoCreateDeviceMNodePlan.java | 8 +-
.../iotdb/db/qp/physical/sys/ChangeAliasPlan.java | 3 +-
.../db/qp/physical/sys/ChangeTagOffsetPlan.java | 3 +-
.../physical/sys/CreateAlignedTimeSeriesPlan.java | 38 +-
.../db/qp/physical/sys/CreateTimeSeriesPlan.java | 3 +-
.../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 8 +-
.../qp/physical/sys/PreDeleteTimeSeriesPlan.java | 3 +-
.../sys/RollbackPreDeleteTimeSeriesPlan.java | 4 +-
.../iotdb/db/qp/physical/sys/SetTemplatePlan.java | 3 +-
.../db/qp/physical/sys/UnsetTemplatePlan.java | 3 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 34 +-
.../metadata/DiskAlignedChunkMetadataLoader.java | 2 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 2 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 124 ++++++-
.../ResourcesInformationHolder.java} | 27 +-
.../apache/iotdb/db/tools/schema/MLogParser.java | 122 +------
.../iotdb/db/trigger/executor/TriggerExecutor.java | 4 +
.../trigger/service/TriggerManagementService.java | 161 +++++----
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 16 +-
.../ReadChunkCompactionPerformerAlignedTest.java | 79 ++++
.../iotdb/db/metadata/path/PatternTreeMapTest.java | 88 +++--
.../plan/SchemaRegionPlanCompatibilityTest.java | 318 ++++++++++++++++
.../db/mpp/common/schematree/NodeRefTest.java | 47 +++
.../iotdb/db/mpp/plan/analyze/AnalyzeTest.java | 169 +++++++++
.../org/apache/iotdb/db/tools/MLogParserTest.java | 17 -
.../src/main/thrift/confignode.thrift | 32 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 10 +
.../tsfile/common/constant/TsFileConstant.java | 4 +
.../file/metadata/AlignedTimeSeriesMetadata.java | 15 +
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 18 +
.../tsfile/file/metadata/TimeseriesMetadata.java | 7 +
.../iotdb/tsfile/read/filter/operator/Regexp.java | 48 ++-
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 12 +
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 4 +
261 files changed, 8564 insertions(+), 2367 deletions(-)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{GetRoutingPlan.java => GetRegionIdPlan.java} (94%)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/GetTriggerJarPlan.java
copy confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{GetRoutingResp.java => GetRegionIdResp.java} (83%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{GetRoutingResp.java => TriggerJarResp.java} (63%)
delete mode 100644 confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessorTest.java
create mode 100644 integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java
rename integration-test/src/test/java/org/apache/iotdb/confignode/{ => it}/IoTDBClusterPartitionIT.java (87%)
create mode 100644 integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterRestartIT.java
rename integration-test/src/test/java/org/apache/iotdb/confignode/{ => it}/IoTDBConfigNodeIT.java (98%)
rename integration-test/src/test/java/org/apache/iotdb/confignode/{ => it}/IoTDBConfigNodeSnapshotIT.java (97%)
create mode 100644 integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBStorageGroupIT.java
rename integration-test/src/test/java/org/apache/iotdb/db/it/{aligned => utils}/AlignedWriteUtil.java (99%)
rename integration-test/src/test/java/org/apache/iotdb/session/{ => it}/IoTDBSessionAlignedInsertIT.java (99%)
rename integration-test/src/test/java/org/apache/iotdb/session/{ => it}/IoTDBSessionComplexIT.java (99%)
rename integration-test/src/test/java/org/apache/iotdb/session/{ => it}/IoTDBSessionDisableMemControlIT.java (98%)
rename integration-test/src/test/java/org/apache/iotdb/session/{ => it}/IoTDBSessionInsertNulIT.java (99%)
rename integration-test/src/test/java/org/apache/iotdb/session/{ => it}/IoTDBSessionSimpleIT.java (99%)
rename integration-test/src/test/java/org/apache/iotdb/session/{ => it}/IoTDBSessionSyntaxConventionIT.java (99%)
rename integration-test/src/test/java/org/apache/iotdb/session/{SessionTest.java => it/SessionIT.java} (95%)
delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
create mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRepeatPatternNameIT.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/load/DeletionData.java
copy server/src/main/java/org/apache/iotdb/db/engine/load/{ChunkData.java => TsFileData.java} (53%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/logfile/BufferedSerializer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/logfile/FakeCRC32Deserializer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/logfile/FakeCRC32Serializer.java
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/logfile/IDeserializer.java} (58%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/logfile/ISerializer.java} (56%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/logfile/SchemaLogReader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/logfile/SchemaLogWriter.java
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/ISchemaRegionPlan.java} (60%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/SchemaRegionPlanType.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/SchemaRegionPlanVisitor.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/ActivateTemplateInClusterPlanImpl.java
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/impl/ActivateTemplatePlanImpl.java} (57%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/impl/AutoCreateDeviceMNodePlanImpl.java} (58%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/impl/ChangeAliasPlanImpl.java} (52%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/impl/ChangeTagOffsetPlanImpl.java} (51%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/CreateAlignedTimeSeriesPlanImpl.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/CreateTimeSeriesPlanImpl.java
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/impl/DeleteTimeSeriesPlanImpl.java} (53%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/impl/PreDeleteTimeSeriesPlanImpl.java} (59%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/impl/RollbackPreDeleteTimeSeriesPlanImpl.java} (57%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanDeserializer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanFactory.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanSerializer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanTxtSerializer.java
copy server/src/main/java/org/apache/iotdb/db/{qp/physical/sys/SetTemplatePlan.java => metadata/plan/schemaregion/impl/SetTemplatePlanImpl.java} (55%)
copy server/src/main/java/org/apache/iotdb/db/{qp/physical/sys/UnsetTemplatePlan.java => metadata/plan/schemaregion/impl/UnsetTemplatePlanImpl.java} (54%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/write/IActivateTemplateInClusterPlan.java
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/write/IActivateTemplatePlan.java} (52%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/write/IAutoCreateDeviceMNodePlan.java} (52%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/write/IChangeAliasPlan.java} (51%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/write/IChangeTagOffsetPlan.java} (51%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/write/ICreateAlignedTimeSeriesPlan.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/write/ICreateTimeSeriesPlan.java
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/write/IDeleteTimeSeriesPlan.java} (50%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/write/IPreDeleteTimeSeriesPlan.java} (52%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/write/IRollbackPreDeleteTimeSeriesPlan.java} (51%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/write/ISetTemplatePlan.java} (52%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => metadata/plan/schemaregion/write/IUnsetTemplatePlan.java} (52%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/SelectIntoUtils.java
rename server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/{GetRegionTask.java => GetRegionIdTask.java} (81%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/DeviceViewIntoPathDescriptor.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/IntoPathDescriptor.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/IntoComponent.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/IntoItem.java
rename server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/{GetRegionStatement.java => GetRegionIdStatement.java} (94%)
copy server/src/main/java/org/apache/iotdb/db/{exception/query/QueryTimeoutRuntimeException.java => service/ResourcesInformationHolder.java} (54%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/plan/SchemaRegionPlanCompatibilityTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/common/schematree/NodeRefTest.java
[iotdb] 01/03: fix type in ConfigNodeRemoveCheck
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/cluster_up
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 481bb7df292f630509fa2744690419f71e21d000
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Sat Oct 15 17:03:03 2022 +0800
fix type in ConfigNodeRemoveCheck
---
.../java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java | 1 +
.../java/org/apache/iotdb/confignode/manager/ConsensusManager.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
index 660595b456..a6a72dad59 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
@@ -112,6 +112,7 @@ public class ConfigNodeRemoveCheck {
}
if (status.getCode() == TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode()) {
+ LOGGER.warn("Execute removeConfigNode failed for: {}", status.getMessage());
break;
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
index f51c1ddd81..d4b442ac7c 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
@@ -57,7 +57,7 @@ public class ConsensusManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ConsensusManager.class);
private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
- private static final int SEED_CONFIG_NODE_Id = 0;
+ private static final int SEED_CONFIG_NODE_ID = 0;
private final IManager configManager;
@@ -152,7 +152,7 @@ public class ConsensusManager {
createPeerForConsensusGroup(
Collections.singletonList(
new TConfigNodeLocation(
- SEED_CONFIG_NODE_Id,
+ SEED_CONFIG_NODE_ID,
new TEndPoint(CONF.getInternalAddress(), CONF.getInternalPort()),
new TEndPoint(CONF.getInternalAddress(), CONF.getConsensusPort()))));
}
[iotdb] 02/03: Merge branch 'master' into beyyes/cluster_up
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/cluster_up
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit cd838afcd70a7d0415408d6fb2d1081d92b7b59a
Merge: 481bb7df29 a639c09875
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Wed Oct 19 10:09:03 2022 +0800
Merge branch 'master' into beyyes/cluster_up
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 20 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 1 +
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 20 +-
.../resources/conf/iotdb-confignode.properties | 16 +
.../iotdb/confignode/conf/ConfigNodeConfig.java | 130 +++++++-
.../confignode/conf/ConfigNodeDescriptor.java | 64 ++++
.../confignode/conf/SystemPropertiesUtils.java | 24 +-
.../consensus/request/ConfigPhysicalPlan.java | 6 +-
.../consensus/request/ConfigPhysicalPlanType.java | 2 +-
.../{GetRoutingPlan.java => GetRegionIdPlan.java} | 10 +-
.../{GetRoutingResp.java => GetRegionIdResp.java} | 10 +-
.../statemachine/PartitionRegionStateMachine.java | 16 +-
.../iotdb/confignode/manager/ConfigManager.java | 20 +-
.../iotdb/confignode/manager/ConsensusManager.java | 15 +
.../apache/iotdb/confignode/manager/IManager.java | 9 +-
.../iotdb/confignode/manager/TriggerManager.java | 6 +
.../iotdb/confignode/manager/load/LoadManager.java | 6 +-
.../manager/load/balancer/RouteBalancer.java | 6 +-
.../manager/load/balancer/router/IRouter.java | 2 +-
.../load/balancer/router/LazyGreedyRouter.java | 2 +-
.../manager/load/balancer/router/LeaderRouter.java | 2 +-
.../balancer/router/LoadScoreGreedyRouter.java | 2 +-
.../iotdb/confignode/manager/node/NodeManager.java | 89 +++++-
.../manager/partition/PartitionManager.java | 8 +-
.../iotdb/confignode/persistence/NodeInfo.java | 2 -
.../persistence/executor/ConfigPlanExecutor.java | 6 +-
.../persistence/partition/PartitionInfo.java | 12 +-
.../partition/StorageGroupPartitionTable.java | 6 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 16 -
.../impl/node/AddConfigNodeProcedure.java | 7 +-
.../iotdb/confignode/service/ConfigNode.java | 14 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 18 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 15 +-
.../load/balancer/router/LazyGreedyRouterTest.java | 8 +-
.../load/balancer/router/LeaderRouterTest.java | 6 +-
.../balancer/router/LoadScoreGreedyRouterTest.java | 2 +-
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 338 --------------------
consensus/pom.xml | 2 +-
.../apache/iotdb/consensus/config/RatisConfig.java | 67 +++-
.../multileader/logdispatcher/LogDispatcher.java | 18 +-
.../multileader/logdispatcher/PendingBatch.java | 11 +-
.../multileader/logdispatcher/SyncStatusTest.java | 25 +-
.../apache/iotdb/consensus/ratis/SnapshotTest.java | 3 +
docs/Download/README.md | 14 +-
docs/UserGuide/Cluster/Cluster-Concept.md | 18 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 12 +-
docs/UserGuide/Delete-Data/TTL.md | 16 +-
.../Maintenance-Tools/Maintenance-Command.md | 102 ++++++-
docs/zh/Download/README.md | 14 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 12 +-
docs/zh/UserGuide/Delete-Data/TTL.md | 18 +-
.../Maintenance-Tools/Maintenance-Command.md | 101 +++++-
example/kafka/pom.xml | 2 +-
.../util/TSFileConfigUtilCompletenessTest.java | 3 +-
integration-test/checkstyle.xml | 8 +-
integration-test/import-control.xml | 81 +++--
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 76 ++++-
.../java/org/apache/iotdb/it/env/MppConfig.java | 11 +-
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 14 +-
.../org/apache/iotdb/it/utils/TsFileGenerator.java | 232 ++++++++++++++
.../org/apache/iotdb/itbase/env/BaseConfig.java | 8 +-
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 8 +-
.../{ => it}/IoTDBClusterPartitionIT.java | 117 ++++---
.../iotdb/confignode/it/IoTDBClusterRestartIT.java | 88 ++++++
.../confignode/{ => it}/IoTDBConfigNodeIT.java | 10 +-
.../{ => it}/IoTDBConfigNodeSnapshotIT.java | 8 +-
.../iotdb/confignode/it/IoTDBStorageGroupIT.java | 183 +++++++++++
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 340 ++++++++-------------
.../java/org/apache/iotdb/db/it/IoTDBFilterIT.java | 24 +-
.../org/apache/iotdb/db/it/IoTDBFilterNullIT.java | 3 +
.../it/aggregation/IoTDBAggregationByLevelIT.java | 3 +
.../it/aggregation/IoTDBAggregationDeleteIT.java | 3 +
.../aggregation/IoTDBAggregationScanOrderIT.java | 3 +
.../aggregation/IoTDBAggregationSmallDataIT.java | 3 +
.../db/it/aggregation/IoTDBTagAggregationIT.java | 3 +
.../aligned/IoTDBAggregationWithDeletion2IT.java | 1 +
.../it/aligned/IoTDBAggregationWithDeletionIT.java | 1 +
.../db/it/aligned/IoTDBAlignedLastQuery2IT.java | 1 +
.../db/it/aligned/IoTDBAlignedLastQuery3IT.java | 1 +
.../db/it/aligned/IoTDBAlignedLastQueryIT.java | 1 +
.../db/it/aligned/IoTDBAlignedSeriesQuery2IT.java | 1 +
.../db/it/aligned/IoTDBAlignedSeriesQuery3IT.java | 1 +
.../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 1 +
.../IoTDBAlignedSeriesQueryWithDeletionIT.java | 1 +
.../db/it/aligned/IoTDBGroupByLevelQueryIT.java | 1 +
...GroupByQueryWithValueFilterWithDeletion2IT.java | 1 +
...BGroupByQueryWithValueFilterWithDeletionIT.java | 1 +
...upByQueryWithoutValueFilterWithDeletion2IT.java | 1 +
...oupByQueryWithoutValueFilterWithDeletionIT.java | 1 +
.../it/aligned/IoTDBLastQueryWithDeletion2IT.java | 1 +
.../it/aligned/IoTDBLastQueryWithDeletionIT.java | 1 +
.../aligned/IoTDBLastQueryWithoutLastCache2IT.java | 1 +
.../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 1 +
...DBLastQueryWithoutLastCacheWithDeletion2IT.java | 1 +
...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 1 +
...BRawQueryWithoutValueFilterWithDeletion2IT.java | 1 +
...DBRawQueryWithoutValueFilterWithDeletionIT.java | 1 +
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 14 +-
.../db/it/{aligned => utils}/AlignedWriteUtil.java | 2 +-
.../db/it/withoutNull/IoTDBWithoutAllNullIT.java | 3 +
.../db/it/withoutNull/IoTDBWithoutAnyNullIT.java | 3 +
.../withoutNull/IoTDBWithoutNullAllFilterIT.java | 3 +
.../withoutNull/IoTDBWithoutNullAnyFilterIT.java | 3 +
.../{ => it}/IoTDBSessionAlignedInsertIT.java | 4 +-
.../session/{ => it}/IoTDBSessionComplexIT.java | 4 +-
.../{ => it}/IoTDBSessionDisableMemControlIT.java | 4 +-
.../session/{ => it}/IoTDBSessionInsertNulIT.java | 4 +-
.../session/{ => it}/IoTDBSessionSimpleIT.java | 4 +-
.../{ => it}/IoTDBSessionSyntaxConventionIT.java | 4 +-
.../{SessionTest.java => it/SessionIT.java} | 9 +-
...IoTDBLoadExternalTsFileWithTimePartitionIT.java | 329 --------------------
.../db/integration/IoTDBRepeatPatternNameIT.java | 67 ++++
.../apache/iotdb/commons/conf/IoTDBConstant.java | 5 +
.../commons/partition/DataPartitionTable.java | 4 +-
.../commons/partition/SchemaPartitionTable.java | 2 +-
.../commons/partition/SeriesPartitionTable.java | 2 +-
.../org/apache/iotdb/commons/path/PartialPath.java | 13 +
.../apache/iotdb/commons/path/PatternTreeMap.java | 44 +--
.../java/org/apache/iotdb/RewriteTsFileTool.java | 249 ++++++++++++++-
.../resources/conf/iotdb-datanode.properties | 4 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 10 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 85 ++++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 22 ++
.../db/consensus/DataRegionConsensusImpl.java | 15 +
.../db/consensus/SchemaRegionConsensusImpl.java | 15 +
.../impl/ReadChunkCompactionPerformer.java | 21 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 10 +-
.../iotdb/db/engine/load/AlignedChunkData.java | 9 +-
.../org/apache/iotdb/db/engine/load/ChunkData.java | 14 +-
.../apache/iotdb/db/engine/load/DeletionData.java | 72 +++++
.../iotdb/db/engine/load/LoadTsFileManager.java | 29 +-
.../iotdb/db/engine/load/NonAlignedChunkData.java | 1 +
.../load/{ChunkData.java => TsFileData.java} | 42 +--
.../iotdb/db/engine/storagegroup/DataRegion.java | 16 +-
.../db/engine/storagegroup/TsFileManager.java | 5 +-
.../storagegroup/timeindex/DeviceTimeIndex.java | 5 +-
.../query/QueryTimeoutRuntimeException.java | 9 +
.../db/mpp/common/header/ColumnHeaderConstant.java | 33 +-
.../db/mpp/common/header/DatasetHeaderFactory.java | 10 +-
.../execution/exchange/MPPDataExchangeService.java | 8 +-
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 29 ++
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 128 +++++++-
.../iotdb/db/mpp/plan/analyze/SelectIntoUtils.java | 105 +++++++
.../db/mpp/plan/execution/QueryExecution.java | 6 +-
.../plan/execution/config/ConfigTaskVisitor.java | 9 +-
.../config/executor/ClusterConfigTaskExecutor.java | 30 +-
.../config/executor/IConfigTaskExecutor.java | 4 +-
.../executor/StandaloneConfigTaskExecutor.java | 4 +-
.../{GetRegionTask.java => GetRegionIdTask.java} | 22 +-
.../mpp/plan/expression/leaf/ConstantOperand.java | 4 +-
.../plan/expression/leaf/TimeSeriesOperand.java | 9 +
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 111 ++++++-
.../plan/node/load/LoadSingleTsFileNode.java | 69 ++++-
.../planner/plan/node/load/LoadTsFileNode.java | 3 +
.../plan/node/load/LoadTsFilePieceNode.java | 35 +--
.../parameter/DeviceViewIntoPathDescriptor.java | 208 +++++++++++++
.../planner/plan/parameter/IntoPathDescriptor.java | 167 ++++++++++
.../plan/scheduler/load/LoadTsFileScheduler.java | 7 +
.../db/mpp/plan/statement/StatementVisitor.java | 6 +-
.../plan/statement/component/IntoComponent.java | 237 ++++++++++++++
.../db/mpp/plan/statement/component/IntoItem.java | 73 +++++
.../plan/statement/crud/LoadTsFileStatement.java | 4 +-
.../db/mpp/plan/statement/crud/QueryStatement.java | 38 +++
...ionStatement.java => GetRegionIdStatement.java} | 6 +-
.../dag/input/ConstantInputReader.java | 3 +-
.../transformation/dag/util/TransformUtils.java | 3 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 34 ++-
.../metadata/DiskAlignedChunkMetadataLoader.java | 2 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 2 +-
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 16 +-
.../ReadChunkCompactionPerformerAlignedTest.java | 79 +++++
.../iotdb/db/metadata/path/PatternTreeMapTest.java | 88 +++---
.../db/mpp/common/schematree/NodeRefTest.java | 47 +++
.../iotdb/db/mpp/plan/analyze/AnalyzeTest.java | 169 ++++++++++
.../src/main/thrift/confignode.thrift | 16 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 10 +
.../tsfile/common/constant/TsFileConstant.java | 4 +
.../file/metadata/AlignedTimeSeriesMetadata.java | 15 +
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 18 ++
.../tsfile/file/metadata/TimeseriesMetadata.java | 7 +
.../iotdb/tsfile/read/filter/operator/Regexp.java | 48 ++-
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 12 +
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 4 +
183 files changed, 4246 insertions(+), 1478 deletions(-)
[iotdb] 03/03: perfect add/remove confignode process
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/cluster_up
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2fc11ba42a81f64658fe2d65c520cc349413b71b
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Wed Oct 19 13:52:17 2022 +0800
perfect add/remove confignode process
---
.../org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java | 3 ++-
.../org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java | 2 +-
.../java/org/apache/iotdb/confignode/manager/ConsensusManager.java | 2 +-
.../org/apache/iotdb/confignode/procedure/ProcedureExecutor.java | 2 +-
.../main/java/org/apache/iotdb/confignode/service/ConfigNode.java | 7 ++++---
.../org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java | 5 ++++-
.../main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java | 5 +----
7 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
index a6a72dad59..45fec9d755 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
@@ -80,7 +80,8 @@ public class ConfigNodeRemoveCheck {
.findFirst()
.orElse(null);
} catch (BadNodeUrlException e2) {
- LOGGER.info("Usage: <Node-id>/<internal_address>:<internal_port>");
+ LOGGER.info(
+ "Usage: remove-confignode.sh <confignode-id> or remove-confignode.sh <internal_address>:<internal_port>");
return nodeLocation;
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
index 71acfbfb51..f7edf5d9fc 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
@@ -249,7 +249,7 @@ public class SystemPropertiesUtils {
* @return The property of config_node_id in confignode-system.properties file
* @throws IOException When load confignode-system.properties file failed
*/
- public static int loadConfigNodeId() throws IOException {
+ public static int loadConfigNodeIdWhenRestarted() throws IOException {
Properties systemProperties = getSystemProperties();
try {
return Integer.parseInt(systemProperties.getProperty("config_node_id", null));
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
index 593de173fc..7b9979034a 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
@@ -167,7 +167,7 @@ public class ConsensusManager {
createPeerForConsensusGroup(
Collections.singletonList(
new TConfigNodeLocation(
- SEED_CONFIG_NODE_ID,
+ SEED_CONFIG_NODE_ID,
new TEndPoint(CONF.getInternalAddress(), CONF.getInternalPort()),
new TEndPoint(CONF.getInternalAddress(), CONF.getConsensusPort()))));
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/ProcedureExecutor.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/ProcedureExecutor.java
index da84be1cd9..2dac1b0727 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/ProcedureExecutor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/ProcedureExecutor.java
@@ -382,7 +382,7 @@ public class ProcedureExecutor<Env> {
rootProcStack.release();
if (proc.isSuccess()) {
- LOG.info("{} finished in {} successfully.", proc, proc.elapsedTime());
+ LOG.info("{} finished in {}ms successfully.", proc, proc.elapsedTime());
if (proc.getProcId() == rootProcId) {
rootProcedureCleanup(proc);
} else {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index 81aa8bcc82..cbbb791fdf 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -88,7 +88,7 @@ public class ConfigNode implements ConfigNodeMBean {
/* Restart */
if (SystemPropertiesUtils.isRestarted()) {
LOGGER.info("{} is in restarting process...", ConfigNodeConstant.GLOBAL_NAME);
- CONF.setConfigNodeId(SystemPropertiesUtils.loadConfigNodeId());
+ CONF.setConfigNodeId(SystemPropertiesUtils.loadConfigNodeIdWhenRestarted());
configManager.initConsensusManager();
setUpRPCService();
LOGGER.info(
@@ -135,8 +135,9 @@ public class ConfigNode implements ConfigNodeMBean {
// The initial startup of Non-Seed-ConfigNode is not yet finished,
// we should wait for leader's scheduling
LOGGER.info(
- "{} has registered successfully. Waiting for the leader's scheduling to join the cluster.",
- ConfigNodeConstant.GLOBAL_NAME);
+ "{} {} has registered successfully. Waiting for the leader's scheduling to join the cluster.",
+ ConfigNodeConstant.GLOBAL_NAME,
+ CONF.getConfigNodeId());
boolean isJoinedCluster = false;
for (int retry = 0; retry < SCHEDULE_WAITING_RETRY_NUM; retry++) {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java
index 06ea1f87a3..ea97f5fc9b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java
@@ -115,8 +115,11 @@ public class ConfigNodeCommandLine extends ServerCommandLine {
ConfigNodeRemoveCheck.getInstance().removeConfigNode(removeConfigNodeLocation);
} catch (BadNodeUrlException e) {
LOGGER.warn("No ConfigNodes need to be removed.", e);
+ return;
}
- LOGGER.info("ConfigNode: {} is removed.", args[1]);
+ LOGGER.info(
+ "ConfigNode: {} is removed. If the confignode data directory is no longer needed, you can delete it manually.",
+ args[1]);
}
}
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
index 1e9eeda0dd..f8191cdbfc 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
@@ -616,10 +616,7 @@ class RatisConsensus implements IConsensus {
List<ConsensusGroupId> ids = new ArrayList<>();
server
.getGroupIds()
- .forEach(
- groupId -> {
- ids.add(Utils.fromRaftGroupIdToConsensusGroupId(groupId));
- });
+ .forEach(groupId -> ids.add(Utils.fromRaftGroupIdToConsensusGroupId(groupId)));
return ids;
}