You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2023/07/12 06:07:35 UTC

[iotdb] branch master updated (3b7584ea2c5 -> c78e36ebd8f)

This is an automated email from the ASF dual-hosted git repository.

rong pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 3b7584ea2c5 [ISSUE-10465] Fixed rest api query isn't closed (kill query doesn't work) (#10511)
     add c78e36ebd8f [IOTDB-6057] Pipe: Resolved the compatibility when upgrading from 1.1.x to 1.2.0 (#10492)

No new revisions were added by this update.

Summary of changes:
 .../Edge-Cloud-Collaboration/Sync-Tool.md          | 362 ---------------------
 .../java/org/apache/iotdb/it/env/EnvFactory.java   |   9 +-
 .../main/java/org/apache/iotdb/it/env/EnvType.java |   1 +
 .../apache/iotdb/it/env/cluster/Cluster1Env.java   |   1 +
 .../iotdb/it/env/cluster/DataNodeWrapper.java      |   4 +-
 .../org/apache/iotdb/it/env/cluster/EnvUtils.java  |   1 +
 .../apache/iotdb/it/env/cluster/MppBaseConfig.java |  14 +-
 .../iotdb/it/env/cluster/MppClusterConfig.java     |   1 +
 .../iotdb/it/env/cluster/MppCommonConfig.java      |   1 +
 .../iotdb/it/env/cluster/MppConfigNodeConfig.java  |   1 +
 .../iotdb/it/env/cluster/MppDataNodeConfig.java    |   1 +
 .../apache/iotdb/it/env/cluster/MppJVMConfig.java  |   3 +-
 .../it/env/cluster/MppSharedCommonConfig.java      |   1 +
 .../org/apache/iotdb/it/env/cluster/SimpleEnv.java |   1 +
 .../iotdb/it/env/remote/RemoteClusterConfig.java   |   1 +
 .../iotdb/it/framework/IoTDBTestListener.java      |   1 +
 .../apache/iotdb/it/framework/IoTDBTestLogger.java |   1 +
 .../iotdb/it/framework/IoTDBTestReporter.java      |   3 +-
 .../apache/iotdb/it/framework/IoTDBTestRunner.java |   1 +
 .../framework/IoTDBTestRunnerWithParameters.java   |   1 +
 .../IoTDBTestRunnerWithParametersFactory.java      |   1 +
 .../apache/iotdb/it/framework/IoTDBTestStat.java   |   1 +
 .../org/apache/iotdb/it/utils/TsFileGenerator.java |   9 +-
 .../apache/iotdb/itbase/category/ClusterIT.java    |   1 +
 .../constant/BuiltinAggregationFunctionEnum.java   |   1 +
 .../itbase/constant/BuiltinScalarFunctionEnum.java |   2 +-
 .../BuiltinTimeSeriesGeneratingFunctionEnum.java   |   1 +
 .../java/org/apache/iotdb/itbase/env/BaseEnv.java  |  41 +--
 .../apache/iotdb/itbase/env/BaseNodeWrapper.java   |   1 +
 .../org/apache/iotdb/itbase/env/ClusterConfig.java |   1 +
 .../org/apache/iotdb/itbase/env/CommonConfig.java  |   1 +
 .../apache/iotdb/itbase/env/ConfigNodeConfig.java  |   1 +
 .../apache/iotdb/itbase/env/DataNodeConfig.java    |   1 +
 .../org/apache/iotdb/itbase/env/JVMConfig.java     |   3 +-
 .../iotdb/db/it/quotas/IoTDBSpaceQuotaIT.java      |   2 +-
 ...eseriesIT.java => IoTDBDeleteTimeSeriesIT.java} |  10 +-
 .../main/java/org/apache/iotdb/jdbc/Config.java    |  14 +-
 .../iotdb/flink/tsfile/TSRecordConverter.java      |   7 +-
 .../iotdb/flink/tsfile/TsFileInputFormat.java      |   1 +
 .../iotdb/confignode/conf/ConfigNodeConfig.java    |   6 +-
 .../confignode/conf/ConfigNodeDescriptor.java      |   2 +-
 .../confignode/conf/ConfigNodeStartupCheck.java    |   4 +-
 .../confignode/manager/ClusterQuotaManager.java    |   1 +
 .../iotdb/confignode/manager/ConfigManager.java    |   4 +-
 .../apache/iotdb/confignode/manager/IManager.java  | 165 +++++-----
 .../confignode/manager/PermissionManager.java      |   8 +-
 .../iotdb/confignode/manager/ProcedureManager.java |  21 +-
 .../confignode/manager/RetryFailedTasksThread.java |   5 +-
 .../partition/GreedyPartitionAllocator.java        |   3 +-
 .../region/GreedyRegionGroupAllocator.java         |   1 +
 .../balancer/region/IRegionGroupAllocator.java     |   3 +-
 .../load/cache/node/DataNodeHeartbeatCache.java    |   2 +-
 .../manager/node/ClusterNodeStartUtils.java        |  10 +-
 .../iotdb/confignode/manager/node/NodeManager.java |  37 ++-
 .../manager/partition/PartitionManager.java        |  47 +--
 .../iotdb/confignode/persistence/AuthorInfo.java   |   1 +
 .../persistence/executor/ConfigPlanExecutor.java   |   3 +-
 .../confignode/persistence/node/NodeInfo.java      |  56 ++--
 .../persistence/partition/PartitionInfo.java       |  78 +++--
 .../partition/maintainer/RegionCreateTask.java     |   1 +
 .../partition/maintainer/RegionDeleteTask.java     |   1 +
 .../partition/maintainer/RegionMaintainTask.java   |   1 +
 .../partition/maintainer/RegionMaintainType.java   |   1 +
 .../confignode/persistence/pipe/PipeTaskInfo.java  |  15 +-
 .../persistence/schema/ClusterSchemaInfo.java      |  13 +-
 .../persistence/schema/ConfigMTreeStore.java       |   1 +
 .../confignode/procedure/InternalProcedure.java    |   2 +-
 .../iotdb/confignode/procedure/Procedure.java      |   2 +-
 .../confignode/procedure/ProcedureExecutor.java    |  18 +-
 .../confignode/procedure/RootProcedureStack.java   |  18 +-
 .../procedure/env/ConfigNodeProcedureEnv.java      |  33 +-
 .../procedure/exception/ProcedureException.java    |   4 +-
 .../exception/ProcedureYieldException.java         |   4 +-
 .../procedure/impl/node/AbstractNodeProcedure.java |   2 +-
 .../impl/pipe/AbstractOperatePipeProcedureV2.java  |  14 +-
 .../impl/pipe/runtime/PipeMetaSyncProcedure.java   |   6 -
 .../impl/schema/SetTemplateProcedure.java          |   4 +-
 .../impl/statemachine/StateMachineProcedure.java   |  10 +-
 .../impl/sync/AbstractOperatePipeProcedure.java    |  68 ++++
 .../procedure/impl/sync/CreatePipeProcedure.java   |  39 +--
 .../procedure/impl/sync/DropPipeProcedure.java     |  39 +--
 .../procedure/impl/sync/StartPipeProcedure.java    |  33 +-
 .../procedure/impl/sync/StopPipeProcedure.java     |  39 +--
 .../procedure/state/sync/OperatePipeState.java     |  11 +-
 .../iotdb/confignode/persistence/NodeInfoTest.java |   1 +
 .../org/apache/iotdb/db/audit/AuditLogger.java     |   2 +-
 .../org/apache/iotdb/db/auth/AuthorityChecker.java |   6 +-
 .../apache/iotdb/db/auth/BasicAuthorityCache.java  |   6 +-
 .../iotdb/db/auth/ClusterAuthorityFetcher.java     |   6 +-
 .../apache/iotdb/db/conf/DataNodeStartupCheck.java |   8 +-
 .../iotdb/db/conf/rest/IoTDBRestServiceConfig.java |  27 +-
 ...ion.java => TemplateIncompatibleException.java} |   8 +-
 .../db/pipe/agent/runtime/PipeAgentLauncher.java   |   2 +-
 .../pipe/connector/legacy/IoTDBSyncReceiver.java   |   2 +-
 .../pipe/connector/legacy/pipedata/PipeData.java   |   4 +-
 .../v1/request/PipeTransferFilePieceReq.java       |  29 +-
 .../v1/request/PipeTransferFileSealReq.java        |  26 +-
 .../v1/request/PipeTransferHandshakeReq.java       |  25 +-
 .../v1/request/PipeTransferInsertNodeReq.java      |  26 +-
 .../v1/request/PipeTransferTabletReq.java          |   4 +-
 .../iotdb/db/protocol/client/ConfigNodeClient.java |   4 +-
 .../protocol/client/ConfigNodeClientManager.java   |   4 +-
 .../iotdb/db/protocol/client/ConfigNodeInfo.java   |  12 +-
 .../protocol/client/DataNodeClientPoolFactory.java |   4 +-
 .../db/queryengine/common/DataNodeEndPoints.java   |   2 +-
 .../db/queryengine/common/FragmentInstanceId.java  |   1 +
 .../db/queryengine/common/MPPQueryContext.java     |   3 +-
 .../db/queryengine/common/PlanFragmentId.java      |   1 +
 .../iotdb/db/queryengine/common/QueryId.java       |   1 +
 .../iotdb/db/queryengine/common/SessionInfo.java   |   1 +
 .../queryengine/execution/QueryStateMachine.java   |   5 +-
 .../db/queryengine/execution/StateMachine.java     |   4 +-
 .../queryengine/execution/driver/DataDriver.java   |  18 +-
 .../db/queryengine/execution/driver/IDriver.java   |  28 +-
 .../queryengine/execution/driver/SchemaDriver.java |   6 +-
 .../fragment/FragmentInstanceExecution.java        |   4 +-
 .../execution/load/AlignedChunkData.java           |  21 +-
 .../execution/operator/AggregationUtil.java        |   2 +-
 .../operator/process/AbstractIntoOperator.java     |   4 -
 .../operator/process/AggregationOperator.java      |  22 +-
 .../operator/process/DeviceViewOperator.java       |   8 +-
 .../operator/process/SingleDeviceViewOperator.java |  10 +-
 .../process/SlidingWindowAggregationOperator.java  |  12 +-
 .../process/join/HorizontallyConcatOperator.java   |  10 +-
 .../process/join/RowBasedTimeJoinOperator.java     |  20 +-
 .../operator/schema/SchemaTsBlockUtil.java         |   2 +-
 .../schema/source/SchemaSourceFactory.java         |   4 +-
 .../AbstractSeriesAggregationScanOperator.java     |   4 +-
 .../execution/schedule/DriverTaskThread.java       |   5 +-
 .../execution/schedule/ITaskScheduler.java         |   2 +-
 .../queryengine/plan/analyze/AnalyzeVisitor.java   |   8 +-
 .../analyze/schema/AutoCreateSchemaExecutor.java   |   2 +-
 .../plan/planner/PipelineDriverFactory.java        |   2 +-
 .../plan/planner/plan/FragmentInstance.java        |   1 +
 .../planner/plan/node/process/GroupByTagNode.java  |   4 +-
 .../mtree/impl/mem/MTreeBelowSGMemoryImpl.java     |   2 +-
 .../apache/iotdb/commons/conf/CommonConfig.java    |  10 +-
 .../commons/pipe/task/meta/PipeRuntimeMeta.java    |  15 +-
 .../iotdb/commons/pipe/task/meta/PipeTaskMeta.java |  14 +-
 .../org/apache/iotdb/commons/sync/PipeInfo.java    |   6 +-
 .../tsfile/write/schema/IMeasurementSchema.java    |   1 +
 141 files changed, 850 insertions(+), 965 deletions(-)
 delete mode 100644 docs/zh/UserGuide/Edge-Cloud-Collaboration/Sync-Tool.md
 rename integration-test/src/test/java/org/apache/iotdb/db/it/schema/{IoTDBDeleteTimeseriesIT.java => IoTDBDeleteTimeSeriesIT.java} (98%)
 create mode 100644 iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java
 copy iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/customizer/configuration/PipeRuntimeConfiguration.java => iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/sync/OperatePipeState.java (80%)
 rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/template/{TemplateImcompatibeException.java => TemplateIncompatibleException.java} (87%)