This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/AggOpMemoryControl in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f3983e0759c7b2ed50a60e11b7cbd83433085a15 Merge: eb0ff4978c f1787b83c5 Author: Minghui Liu <[email protected]> AuthorDate: Wed Aug 10 23:22:02 2022 +0800 Merge github.com:apache/iotdb into MemoryControl .github/workflows/sync.yml | 20 +- .../confignode/manager/ClusterSchemaManager.java | 4 +- .../iotdb/confignode/manager/ConfigManager.java | 12 +- .../apache/iotdb/confignode/manager/IManager.java | 9 + .../iotdb/confignode/manager/NodeManager.java | 54 +- .../confignode/manager/PermissionManager.java | 2 +- .../iotdb/confignode/manager/UDFManager.java | 4 +- .../iotdb/confignode/manager/load/LoadManager.java | 16 +- .../manager/load/balancer/RegionBalancer.java | 2 +- .../manager/load/balancer/RouteBalancer.java | 2 +- .../iotdb/confignode/persistence/NodeInfo.java | 16 +- .../procedure/env/ConfigNodeProcedureEnv.java | 4 +- .../procedure/env/DataNodeRemoveHandler.java | 6 +- .../thrift/ConfigNodeRPCServiceProcessor.java | 3 +- .../iotdb/confignode/persistence/NodeInfoTest.java | 4 +- .../thrift/ConfigNodeRPCServiceProcessorTest.java | 510 ---------------- .../org/apache/iotdb/consensus/IStateMachine.java | 15 + .../client/AsyncMultiLeaderServiceClient.java | 5 +- .../client/MultiLeaderConsensusClientPool.java | 5 +- integration-test/import-control.xml | 4 +- .../org/apache/iotdb/db/it/IoTDBConfigNodeIT.java | 639 +++++++++++++++++++++ .../sync/IoTDBSyncReceiverCollectorIT.java | 513 ----------------- .../db/integration/sync/IoTDBSyncReceiverIT.java | 200 +------ .../db/integration/sync/IoTDBSyncSenderIT.java | 2 + .../db/integration/sync/TransportClientMock.java | 9 - .../db/integration/sync/TransportHandlerMock.java | 3 - node-commons/pom.xml | 5 + .../commons/client/AsyncBaseClientFactory.java | 24 +- .../iotdb/commons/client/ClientPoolFactory.java | 15 +- .../AsyncConfigNodeHeartbeatServiceClient.java | 5 +- .../async/AsyncConfigNodeIServiceClient.java | 5 +- .../async/AsyncDataNodeHeartbeatServiceClient.java | 5 +- .../async/AsyncDataNodeInternalServiceClient.java | 5 +- .../AsyncDataNodeMPPDataExchangeServiceClient.java | 5 +- .../iotdb/commons/concurrent/ThreadName.java | 3 +- .../apache/iotdb/commons/conf/CommonConfig.java | 13 + .../iotdb/commons/conf/CommonDescriptor.java | 1 + .../apache/iotdb/commons/sync}/SyncConstant.java | 22 +- .../apache/iotdb/commons/sync}/SyncPathUtil.java | 24 +- .../iotdb/commons/client/ClientManagerTest.java | 4 +- .../schemaregion/rocksdb/RSchemaRegion.java | 8 + .../iotdb/db/client/DataNodeClientPoolFactory.java | 28 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 13 - .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 - .../statemachine/DataRegionStateMachine.java | 6 + .../sync/PipeDataLoadBearableException.java | 25 - .../sync/PipeDataLoadUnbearableException.java | 25 - .../db/metadata/schemaregion/ISchemaRegion.java | 6 + .../schemaregion/SchemaRegionMemoryImpl.java | 45 ++ .../schemaregion/SchemaRegionSchemaFileImpl.java | 8 + .../mpp/common/schematree/ClusterSchemaTree.java | 15 +- .../common/schematree/DeviceGroupSchemaTree.java | 98 ++++ .../db/mpp/common/schematree/DeviceSchemaInfo.java | 110 +++- .../common/schematree/MeasurementSchemaInfo.java | 53 ++ .../visitor/SchemaTreeDeviceVisitor.java | 13 +- .../db/mpp/execution/exchange/SourceHandle.java | 2 +- .../operator/process/FilterAndProjectOperator.java | 11 +- .../mpp/plan/analyze/StandaloneSchemaFetcher.java | 231 ++------ .../plan/expression/multi/FunctionExpression.java | 3 + .../db/mpp/plan/planner/OperatorTreeGenerator.java | 56 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 55 +- .../iotdb/db/qp/physical/sys/CreatePipePlan.java | 2 +- .../db/qp/physical/sys/CreatePipeSinkPlan.java | 2 +- .../iotdb/db/sync/common/ISyncInfoFetcher.java | 69 +++ .../iotdb/db/sync/common/LocalSyncInfoFetcher.java | 186 ++++++ .../org/apache/iotdb/db/sync/common/SyncInfo.java | 292 ++++++++++ .../db/sync/common/persistence/SyncLogReader.java | 186 ++++++ .../db/sync/common/persistence/SyncLogWriter.java | 147 +++++ .../iotdb/db/sync/datasource/AbstractOpBlock.java | 16 +- .../iotdb/db/sync/datasource/DeletionGroup.java | 242 ++++++++ .../iotdb/db/sync/datasource/ModsfileOpBlock.java | 53 -- .../iotdb/db/sync/datasource/PipeOpManager.java | 6 +- .../iotdb/db/sync/datasource/TsFileOpBlock.java | 463 ++++++++++++--- .../iotdb/db/sync/externalpipe/ExtPipePlugin.java | 15 +- .../db/sync/externalpipe/ExtPipePluginManager.java | 4 +- .../iotdb/db/sync/pipedata/TsFilePipeData.java | 14 +- .../sync/pipedata/queue/BufferedPipeDataQueue.java | 4 +- .../sync/pipedata/queue/PipeDataQueueFactory.java | 57 -- .../iotdb/db/sync/receiver/ReceiverService.java | 195 +------ .../db/sync/receiver/collector/Collector.java | 171 ------ .../db/sync/receiver/load/DeletionLoader.java | 5 +- .../iotdb/db/sync/receiver/load/SchemaLoader.java | 8 +- .../iotdb/db/sync/receiver/load/TsFileLoader.java | 3 +- .../db/sync/receiver/manager/ReceiverManager.java | 229 -------- .../db/sync/receiver/recovery/ReceiverLog.java | 127 ---- .../receiver/recovery/ReceiverLogAnalyzer.java | 157 ----- .../iotdb/db/sync/sender/pipe/IoTDBPipeSink.java | 2 +- .../org/apache/iotdb/db/sync/sender/pipe/Pipe.java | 4 - .../manager => sender/pipe}/PipeInfo.java | 61 +- .../iotdb/db/sync/sender/pipe/TsFilePipe.java | 14 +- .../iotdb/db/sync/sender/pipe/TsFilePipeInfo.java | 63 ++ .../db/sync/sender/recovery/SenderLogAnalyzer.java | 165 ------ .../db/sync/sender/recovery/SenderLogger.java | 141 ----- .../db/sync/sender/recovery/TsFilePipeLogger.java | 4 +- .../iotdb/db/sync/sender/service/MsgManager.java | 114 ---- .../db/sync/sender/service/SenderService.java | 377 ++++++------ .../db/sync/sender/service/TransportHandler.java | 56 +- .../db/sync/transport/client/ClientWrapper.java | 4 +- .../db/sync/transport/client/ITransportClient.java | 10 +- ...rtClient.java => IoTDBSInkTransportClient.java} | 148 +---- .../db/sync/transport/conf/TransportConstant.java | 36 -- .../transport/server/TransportServiceImpl.java | 48 +- .../apache/iotdb/db/utils/sync/SyncPipeUtil.java | 96 ++++ .../db/sync/datasource/DeletionGroupTest.java | 231 ++++++++ .../db/sync/datasource/PipeOpManagerTest.java | 226 +++++++- .../db/sync/datasource/TsFileOpBlockTest.java | 372 +++++++++++- .../sync/pipedata/BufferedPipeDataQueueTest.java | 4 +- ...{ReceiverManagerTest.java => SyncInfoTest.java} | 71 +-- ...ceiverLogAnalyzerTest.java => SyncLogTest.java} | 68 ++- .../db/sync/transport/TransportServiceTest.java | 197 +++---- .../apache/iotdb/db/utils/EnvironmentUtils.java | 13 +- .../datanode1conf/iotdb-datanode.properties | 1 + .../datanode2conf/iotdb-datanode.properties | 1 + .../datanode3conf/iotdb-datanode.properties | 1 + thrift-sync/src/main/thrift/transport.thrift | 27 - 115 files changed, 4291 insertions(+), 3929 deletions(-)
