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 1a4e677f8006e907dd81e613bc59395612104311 Merge: 8e7c5f6a49 a8880b51d2 Author: Minghui Liu <[email protected]> AuthorDate: Wed Aug 10 12:51:58 2022 +0800 Merge remote-tracking branch 'origin/master' into MemoryControl .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 2 +- .../assembly/resources/sbin/remove-confignode.sh | 40 +++++++------ .../assembly/resources/sbin/start-confignode.sh | 36 ++++++------ .../src/assembly/resources/sbin/stop-confignode.sh | 11 ++-- .../AsyncConfigNodeHeartbeatClientPool.java | 4 +- .../async/datanode/AsyncDataNodeClientPool.java | 4 +- .../datanode/AsyncDataNodeHeartbeatClientPool.java | 4 +- .../sync/datanode/SyncDataNodeClientPool.java | 4 +- .../iotdb/confignode/conf/ConfigNodeConfig.java | 41 ------------- .../confignode/conf/ConfigNodeDescriptor.java | 17 ------ .../iotdb/confignode/persistence/NodeInfo.java | 6 +- .../procedure/impl/RegionMigrateProcedure.java | 5 +- .../procedure/state/RegionTransitionState.java | 1 - .../service/thrift/ConfigNodeRPCService.java | 15 +++-- .../apache/iotdb/consensus/config/RatisConfig.java | 2 +- .../Administration-Management/Administration.md | 68 +++++++++++----------- .../Administration-Management/Administration.md | 68 +++++++++++----------- grafana-plugin/backend-compile.bat | 31 ++++++++++ grafana-plugin/go.mod | 2 +- grafana-plugin/go.sum | 15 ++--- grafana-plugin/pom.xml | 54 +++++++++-------- .../iotdb/commons/client/ClientPoolFactory.java | 16 ++--- .../apache/iotdb/commons/conf/CommonConfig.java | 40 +++++++++++++ .../iotdb/commons/conf/CommonDescriptor.java | 17 ++++++ .../apache/iotdb/db/client/ConfigNodeClient.java | 3 +- .../schema/TimeSeriesSchemaScanOperator.java | 25 +++----- .../iotdb/db/mpp/plan/parser/ASTVisitor.java | 3 + .../scheduler/FixedRateFragInsStateTracker.java | 10 ++-- .../handler/PhysicalPlanValidationHandler.java | 4 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 3 + .../iotdb/db/sync/pipedata/DeletionPipeData.java | 12 ++-- .../apache/iotdb/db/sync/pipedata/PipeData.java | 24 ++++++-- .../iotdb/db/sync/pipedata/SchemaPipeData.java | 12 ++-- .../iotdb/db/sync/pipedata/TsFilePipeData.java | 19 ++++-- .../sync/pipedata/queue/BufferedPipeDataQueue.java | 2 +- .../transport/server/TransportServiceImpl.java | 2 +- .../java/org/apache/iotdb/db/qp/PlannerTest.java | 11 ++++ .../iotdb/db/sync/pipedata/PipeDataTest.java | 12 ++-- .../src/main/thrift/confignode.thrift | 14 ++++- .../tsfile/read/common/block/TsBlockBuilder.java | 16 +++++ 40 files changed, 384 insertions(+), 291 deletions(-)
