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/10/24 06:44:44 UTC
[iotdb] 02/02: Merge branch 'master' of https://github.com/apache/iotdb into 1c1d_dockertest
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch 1c1d_dockertest
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 817c655337ddce984f514777d524a0075131ae91
Merge: 19279e372c bcc9c3be79
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Oct 24 14:44:08 2022 +0800
Merge branch 'master' of https://github.com/apache/iotdb into 1c1d_dockertest
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 9 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 +
.../confignode/client/DataNodeRequestType.java | 8 +-
.../client/async/AsyncDataNodeClientPool.java | 38 +-
.../client/async/handlers/AsyncClientHandler.java | 9 +-
...RPCHandler.java => DeleteSchemaRPCHandler.java} | 6 +-
.../consensus/request/ConfigPhysicalPlan.java | 4 +
.../consensus/request/ConfigPhysicalPlanType.java | 3 +-
.../template/GetTemplateSetInfoPlan.java} | 54 +--
.../write/procedure/UpdateProcedurePlan.java | 13 +
.../consensus/response/TemplateSetInfoResp.java | 41 +-
.../confignode/manager/ClusterSchemaManager.java | 7 +
.../iotdb/confignode/manager/ConfigManager.java | 53 ++-
.../apache/iotdb/confignode/manager/IManager.java | 10 +-
.../iotdb/confignode/manager/ProcedureManager.java | 99 ++++-
.../iotdb/confignode/manager/TriggerManager.java | 2 +
.../persistence/executor/ConfigPlanExecutor.java | 3 +
.../persistence/schema/ClusterSchemaInfo.java | 48 ++
.../persistence/schema/TemplateTable.java | 16 +
.../impl/schema/DataNodeRegionGroupUtil.java | 81 ++++
.../procedure/impl/schema/DataNodeRegionTask.java | 195 +++++++++
.../impl/schema/DeactivateTemplateProcedure.java | 487 +++++++++++++++++++++
.../DeleteStorageGroupProcedure.java | 5 +-
.../DeleteTimeSeriesProcedure.java | 333 +++++---------
.../procedure/impl/sync/CreatePipeProcedure.java | 6 +-
.../DeactivateTemplateState.java} | 6 +-
.../{ => schema}/DeleteStorageGroupState.java | 2 +-
.../state/{ => schema}/DeleteTimeSeriesState.java | 2 +-
.../procedure/store/ProcedureFactory.java | 13 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 10 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 4 +-
.../confignode/persistence/TriggerInfoTest.java | 3 +
.../procedure/impl/CreateTriggerProcedureTest.java | 3 +
.../impl/DeactivateTemplateProcedureTest.java | 89 ++++
.../impl/DeleteStorageGroupProcedureTest.java | 2 +-
.../impl/DeleteTimeSeriesProcedureTest.java | 2 +-
.../procedure/impl/OperatePipeProcedureTest.java | 8 +-
docker/src/main/Dockerfile-0.10.0 | 39 --
docker/src/main/Dockerfile-0.11.0 | 39 --
docker/src/main/Dockerfile-0.11.1 | 39 --
docker/src/main/Dockerfile-0.11.2 | 41 --
docker/src/main/Dockerfile-0.11.3 | 41 --
docker/src/main/Dockerfile-0.12.2-cluster | 53 ---
...le-0.12.1-cluster => Dockerfile-0.12.6-cluster} | 10 +-
...le-0.12.2-grafana => Dockerfile-0.12.6-grafana} | 10 +-
...ckerfile-0.12.2-node => Dockerfile-0.12.6-node} | 10 +-
...le-0.12.0-cluster => Dockerfile-0.13.0-cluster} | 10 +-
...grafana => Dockerfile-0.13.3-grafana-connector} | 20 +-
...ckerfile-0.12.0-node => Dockerfile-0.13.3-node} | 10 +-
...-node => Dockerfile-0.13.3-node-multi-platform} | 12 +-
docker/src/main/Dockerfile-0.9.0 | 41 --
docs/UserGuide/Operate-Metadata/Template.md | 38 +-
docs/zh/UserGuide/Operate-Metadata/Template.md | 40 +-
.../db/it/schema/IoTDBDeactivateTemplateIT.java | 231 ++++++++++
.../apache/iotdb/db/it/sync/SyncTransportTest.java | 323 ++++++++++++++
.../apache/iotdb/commons/conf/IoTDBConstant.java | 3 +
.../org/apache/iotdb/commons/path/PartialPath.java | 4 +
.../iotdb/commons/trigger/TriggerInformation.java | 3 +-
.../commons/utils/ThriftConfigNodeSerDeUtils.java | 19 -
pom.xml | 2 +-
.../schemaregion/rocksdb/RSchemaRegion.java | 23 +-
.../schemaregion/rocksdb/mnode/REntityMNode.java | 20 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 21 +-
.../iotdb/db/metadata/mnode/EntityMNode.java | 38 ++
.../iotdb/db/metadata/mnode/IEntityMNode.java | 8 +
.../iotdb/db/metadata/mnode/InternalMNode.java | 8 +-
.../iotdb/db/metadata/mtree/ConfigMTree.java | 39 ++
.../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 102 +++--
.../db/metadata/mtree/traverser/Traverser.java | 19 +-
.../traverser/collector/MeasurementCollector.java | 3 +-
.../plan/schemaregion/SchemaRegionPlanType.java | 6 +-
.../plan/schemaregion/SchemaRegionPlanVisitor.java | 17 +
.../impl/ActivateTemplateInClusterPlanImpl.java | 8 +-
.../impl/DeactivateTemplatePlanImpl.java} | 34 +-
.../impl/PreDeactivateTemplatePlanImpl.java} | 34 +-
.../RollbackPreDeactivateTemplatePlanImpl.java} | 34 +-
.../impl/SchemaRegionPlanDeserializer.java | 43 ++
.../schemaregion/impl/SchemaRegionPlanFactory.java | 6 +
.../impl/SchemaRegionPlanSerializer.java | 51 +++
.../impl/SchemaRegionPlanTxtSerializer.java | 35 ++
.../write/IActivateTemplateInClusterPlan.java | 4 +-
...usterPlan.java => IDeactivateTemplatePlan.java} | 29 +-
...erPlan.java => IPreDeactivateTemplatePlan.java} | 29 +-
...ava => IRollbackPreDeactivateTemplatePlan.java} | 29 +-
.../db/metadata/schemaregion/ISchemaRegion.java | 15 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 124 +++++-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 25 +-
.../iotdb/db/metadata/template/Template.java | 5 +-
.../metadata/visitor/SchemaExecutionVisitor.java | 38 ++
.../schema/PathsUsingTemplateScanOperator.java | 21 +-
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 12 +
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 22 +-
.../iotdb/db/mpp/plan/constant/StatementType.java | 2 +
.../plan/execution/config/ConfigTaskVisitor.java | 8 +
.../config/executor/ClusterConfigTaskExecutor.java | 86 +++-
.../config/executor/IConfigTaskExecutor.java | 4 +
.../executor/StandaloneConfigTaskExecutor.java | 12 +
.../template/DeactivateSchemaTemplateTask.java | 45 ++
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 25 +-
.../db/mpp/plan/parser/StatementGenerator.java | 4 +-
.../db/mpp/plan/planner/LogicalPlanBuilder.java | 7 +-
.../db/mpp/plan/planner/LogicalPlanVisitor.java | 4 +-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 2 +-
.../plan/planner/distribution/SourceRewriter.java | 88 +++-
.../mpp/plan/planner/plan/node/PlanNodeType.java | 14 +-
.../db/mpp/plan/planner/plan/node/PlanVisitor.java | 15 +
.../metedata/read/PathsUsingTemplateScanNode.java | 36 +-
.../node/metedata/read/SchemaQueryScanNode.java | 10 +
.../metedata/write/DeactivateTemplateNode.java | 128 ++++++
.../metedata/write/PreDeactivateTemplateNode.java | 128 ++++++
.../write/RollbackPreDeactivateTemplateNode.java | 130 ++++++
.../db/mpp/plan/statement/StatementVisitor.java | 6 +
.../plan/statement/crud/LoadTsFileStatement.java | 4 +
...ement.java => DeactivateTemplateStatement.java} | 44 +-
.../template/ShowPathsUsingTemplateStatement.java | 22 +-
.../sys/ActivateTemplateInClusterPlan.java | 8 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 157 ++++++-
.../sync/pipedata/queue/BufferedPipeDataQueue.java | 70 +--
.../db/sync/receiver/load/DeletionLoader.java | 52 ++-
.../iotdb/db/sync/receiver/load/ILoader.java | 20 +
.../iotdb/db/sync/receiver/load/TsFileLoader.java | 58 ++-
.../apache/iotdb/db/utils/sync/SyncPipeUtil.java | 4 +-
.../plan/SchemaRegionPlanCompatibilityTest.java | 22 +-
.../mpp/execution/operator/OperatorMemoryTest.java | 6 +-
.../sync/pipedata/BufferedPipeDataQueueTest.java | 95 ++++
.../iotdb/db/sync/transport/SyncTransportTest.java | 357 ---------------
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +-
.../src/main/thrift/confignode.thrift | 11 +-
thrift/src/main/thrift/datanode.thrift | 41 +-
129 files changed, 3926 insertions(+), 1419 deletions(-)