This is an automated email from the ASF dual-hosted git repository. hui pushed a change to branch lmh/addQueryIT in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 196692f308 replace iotdb-engine.properties to iotdb-datanode.properties add 31e77506b3 Update cluster UserGuide and Config-Manual (#6460) add aa5f219a82 [IOTDB-3665] Optimization of configuring consensus protocol type on data node (#6466) add 34577f3169 [IOTDB-3664] Modify python client test code (#6465) add 3fadcfeab8 [IOTDB-3254][IOTDB-3492] Fix storage group related error message (#6462) add 5142ef319d fix bug when count wal files. (#6463) add 823bddf1d0 [IOTDB-3532][metric] Fix some problem in grafana dashboard and add doc. (#6467) add 2ab81ae760 update Maintenance-Command.md (#6454) add 3008429c95 [IOTDB-3629] Fix TimeJoinOperator may cause Source handle is blocked exception (#6469) add 58680be34d update it doc (#6452) add 75e2bb5ed7 not initialize thread pool in CompactionTaskManager if all compaction is disable (#6472) add 3e24176780 Fix joining cluster after deactivating IoTDB DataNode (#6475) add 554665ef95 [IOTDB-3353] Refactor insert exception processing (#6451) add ea437401d0 [IOTDB-3548] Fix not enough dataNode error msg (#6476) add aa15d1a540 [IOTDB-3501] Add IT for syntax convention in new cluster (#6456) add 58a0a62fef [IOTDB-3606] Add path related IT in new cluster (#6458) add 0525417abe Remove grafana connector and rename server to datanode in distribution package (#6477) add e16cf90c1e [IOTDB-3677] Fix NPE while calling QueryExecution.getBatchResult (#6479) add b7af23a4bd [IOTDB-3636] Fix delete non existing sg error msg (#6478) add d05dcde13c [IOTDB-3391] && [IOTDB-3372] Judge ConfigNode status through heartbeat && show cluster did not return a correct result when stop a datanode or confignode (#6402) add b6ca325434 Add default pool size for data block exchange pool (#6480) add 3fe0263838 temporarily close partition cache. (#6486) add da6a90cceb [IOTDB-3682] Add DriverScheduler configuration into iotdb-datanode.properties (#6482) add eeaeac0726 Add Cluster function figure and rename thrift file and class name (#6481) add 015a4960d3 [IOTDB-3672] Fix reloading online config nodes from configuration (#6492) add ad60df6178 grafana plugin add password input type and optimization (#6052) add a06761911d RatisConsensus set default flush to unsafe (#6487) add b1ba13eed1 [IOTDB-3688] Prevent initializing region consensus caused by heartbeat (#6496) add d95b453b4f [IOTDB-3687] Rename config_nodes to target_config_nodes (#6495) add 6059b68267 [IOTDB-3685] Create parameter schema_region_per_data_node and data_region_per_processor in ConfigNode (#6488) add bdebd1de25 [IOTDB-3684] Fail to read wal from wal file caused by FileNotFoundException (#6494) add 437985cf7d Merge remote-tracking branch 'origin/master' into lmh/addQueryIT add 9b74d0ec39 fix review No new revisions were added by this update. Summary of changes: client-cpp/README.md | 2 +- client-cpp/pom.xml | 4 +- client-cpp/src/main/Session.cpp | 4 +- client-cpp/src/main/Session.h | 8 +- client-py/iotdb/Session.py | 4 +- client-py/iotdb/utils/IoTDBRpcDataSet.py | 2 +- client-py/tests/test_template.py | 3 +- .../resources/conf/iotdb-confignode.properties | 40 +- .../client/AsyncConfigNodeClientPool.java | 72 ++ .../confignode/client/AsyncDataNodeClientPool.java | 7 +- ...andler.java => ConfigNodeHeartbeatHandler.java} | 34 +- ...tHandler.java => DataNodeHeartbeatHandler.java} | 17 +- .../iotdb/confignode/conf/ConfigNodeConfig.java | 34 +- .../confignode/conf/ConfigNodeDescriptor.java | 26 +- .../confignode/conf/ConfigNodeStartupCheck.java | 10 +- .../confignode/manager/ClusterSchemaManager.java | 21 +- .../iotdb/confignode/manager/ConfigManager.java | 45 + .../apache/iotdb/confignode/manager/IManager.java | 3 + .../iotdb/confignode/manager/NodeManager.java | 6 + .../iotdb/confignode/manager/load/LoadManager.java | 64 +- ...eatCache.java => ConfigNodeHeartbeatCache.java} | 11 +- ...tbeatCache.java => DataNodeHeartbeatCache.java} | 6 +- .../confignode/persistence/ClusterSchemaInfo.java | 4 +- .../service/thrift/ConfigNodeRPCService.java | 4 +- .../thrift/ConfigNodeRPCServiceProcessor.java | 24 +- .../iotdb/confignode/cli/TemporaryClientDemo.java | 8 +- .../confignode1conf/iotdb-confignode.properties | 2 +- .../confignode2conf/iotdb-confignode.properties | 2 +- .../confignode3conf/iotdb-confignode.properties | 2 +- .../apache/iotdb/consensus/config/RatisConfig.java | 2 +- distribution/pom.xml | 6 +- distribution/src/assembly/all.xml | 12 - .../src/assembly/{server.xml => datanode.xml} | 2 +- docker/src/main/Dockerfile-single | 2 +- docker/src/main/Dockerfile-single-influxdb | 2 +- docker/src/main/Dockerfile-single-tc | 2 +- docs/UserGuide/Cluster/Cluster-Concept.md | 101 +++ docs/UserGuide/Cluster/Cluster-Setup-Example.md | 293 ------ docs/UserGuide/Cluster/Cluster-Setup.md | 393 ++------ .../Integration-Test-refactoring-tutorial.md | 40 +- .../Maintenance-Tools/Maintenance-Command.md | 90 +- docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 73 +- .../Reference/ConfigNode-Config-Manual.md | 283 ++++++ ...{Config-Manual.md => DataNode-Config-Manual.md} | 240 +++-- docs/zh/UserGuide/Cluster/Cluster-Concept.md | 102 +++ docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md | 298 ------ docs/zh/UserGuide/Cluster/Cluster-Setup.md | 382 ++------ .../Integration-Test-refactoring-tutorial.md | 39 - .../Maintenance-Tools/Maintenance-Command.md | 90 +- docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 72 +- .../Reference/ConfigNode-Config-Manual.md | 278 ++++++ ...{Config-Manual.md => DataNode-Config-Manual.md} | 178 +++- example/client-cpp-example/README.md | 2 +- .../Apache IoTDB ConfigNode Dashboard v0.14.0.json | 89 +- .../Apache IoTDB DataNode Dashboard v0.14.0.json | 52 +- .../standalone/Apache IoTDB Dashboard v0.14.0.json | 48 +- grafana-plugin/pkg/plugin/plugin.go | 4 +- grafana-plugin/src/ConfigEditor.tsx | 1 + grafana-plugin/src/QueryEditor.tsx | 52 +- grafana-plugin/src/datasource.ts | 2 +- grafana-plugin/src/types.ts | 4 +- .../org/apache/iotdb/it/env/ConfigNodeWrapper.java | 2 +- .../org/apache/iotdb/it/env/DataNodeWrapper.java | 2 +- .../apache/iotdb/itbase/constant/TestConstant.java | 1 + .../org/apache/iotdb/db/it}/IoTDBQuotedPathIT.java | 71 +- .../db/it/IoTDBSyntaxConventionIdentifierIT.java | 998 +++++++++++++++++++++ .../it}/IoTDBSyntaxConventionStringLiteralIT.java | 519 +++++------ .../iotdb/db/integration/IoTDBNumberPathIT.java | 483 ---------- .../db/integration/groupby/IoTDBGroupByFillIT.java | 3 +- .../groupby/IoTDBGroupByFillMixPathsIT.java | 3 +- .../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 6 +- .../org/apache/iotdb/jdbc/IoTDBConnection.java | 16 +- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 7 +- .../org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java | 6 +- .../iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java | 4 +- .../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 2 +- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 13 +- .../test/java/org/apache/iotdb/jdbc/BatchTest.java | 4 +- .../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 4 +- .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 4 +- .../apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java | 4 +- .../iotdb/jdbc/IoTDBPreparedStatementTest.java | 2 +- .../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 2 +- .../async/AsyncConfigNodeIServiceClient.java | 4 +- .../async/AsyncDataNodeInternalServiceClient.java | 4 +- .../client/sync/SyncConfigNodeIServiceClient.java | 4 +- .../sync/SyncDataNodeInternalServiceClient.java | 4 +- .../iotdb/commons/client/ClientManagerTest.java | 4 +- .../client/mock/MockInternalRPCService.java | 8 +- .../resources/conf/iotdb-datanode.properties | 23 +- .../apache/iotdb/db/client/ConfigNodeClient.java | 22 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 27 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 21 +- .../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 56 +- .../db/consensus/DataRegionConsensusImpl.java | 93 +- .../db/consensus/SchemaRegionConsensusImpl.java | 50 +- .../statemachine/visitor/DataExecutionVisitor.java | 49 +- .../engine/compaction/CompactionTaskManager.java | 8 +- .../iotdb/db/engine/storagegroup/DataRegion.java | 14 +- .../iotdb/db/exception/BatchProcessException.java | 5 + .../iotdb/db/mpp/execution/driver/DataDriver.java | 2 +- .../iotdb/db/mpp/execution/driver/Driver.java | 22 +- .../iotdb/db/mpp/execution/driver/IDriver.java | 2 +- .../db/mpp/execution/driver/SchemaDriver.java | 2 +- .../db/mpp/execution/exchange/ISinkHandle.java | 2 +- .../db/mpp/execution/exchange/ISourceHandle.java | 2 +- .../db/mpp/execution/exchange/LocalSinkHandle.java | 2 +- .../mpp/execution/exchange/LocalSourceHandle.java | 2 +- .../db/mpp/execution/exchange/SinkHandle.java | 2 +- .../db/mpp/execution/exchange/SourceHandle.java | 2 +- .../iotdb/db/mpp/execution/operator/Operator.java | 4 +- .../operator/process/AggregationOperator.java | 4 +- .../operator/process/DeviceMergeOperator.java | 12 +- .../operator/process/DeviceViewOperator.java | 4 +- .../execution/operator/process/FillOperator.java | 2 +- .../operator/process/LastQueryMergeOperator.java | 2 +- .../execution/operator/process/LimitOperator.java | 2 +- .../operator/process/LinearFillOperator.java | 2 +- .../execution/operator/process/OffsetOperator.java | 2 +- .../process/RawDataAggregationOperator.java | 2 +- .../process/SlidingWindowAggregationOperator.java | 2 +- .../execution/operator/process/SortOperator.java | 2 +- .../operator/process/TimeJoinOperator.java | 11 +- .../operator/process/TransformOperator.java | 2 +- .../operator/process/UpdateLastCacheOperator.java | 2 +- .../operator/schema/CountMergeOperator.java | 11 +- .../schema/NodeManageMemoryMergeOperator.java | 2 +- .../operator/schema/NodePathsConvertOperator.java | 2 +- .../operator/schema/NodePathsCountOperator.java | 4 +- .../operator/schema/SchemaFetchMergeOperator.java | 2 +- .../operator/schema/SchemaQueryMergeOperator.java | 2 +- .../schema/SchemaQueryOrderByHeatOperator.java | 4 +- .../operator/source/ExchangeOperator.java | 4 +- .../db/mpp/execution/schedule/DriverScheduler.java | 12 +- .../mpp/execution/schedule/DriverTaskThread.java | 2 +- .../db/mpp/execution/schedule/task/DriverTask.java | 2 +- .../mpp/plan/analyze/ClusterPartitionFetcher.java | 16 +- .../db/mpp/plan/execution/QueryExecution.java | 54 +- .../mpp/plan/execution/config/ConfigExecution.java | 15 +- .../mpp/plan/execution/config/ShowClusterTask.java | 5 +- .../config/executor/ClusterConfigTaskExecutor.java | 5 +- .../executor/StandaloneConfigTaskExecutor.java | 15 +- .../plan/execution/memory/MemorySourceHandle.java | 2 +- ...{InternalService.java => ClientRPCService.java} | 22 +- ...erviceMBean.java => ClientRPCServiceMBean.java} | 2 +- .../java/org/apache/iotdb/db/service/DataNode.java | 39 +- .../java/org/apache/iotdb/db/service/NewIoTDB.java | 6 +- .../org/apache/iotdb/db/service/RPCService.java | 2 +- .../db/service/metrics/predefined/FileMetrics.java | 9 +- .../db/service/thrift/ProcessorWithMetrics.java | 4 +- ...erviceImpl.java => DataNodeRPCServiceImpl.java} | 47 +- ...ServiceImpl.java => DataNodeTSServiceImpl.java} | 8 +- .../db/service/thrift/impl/TSIEventHandler.java | 4 +- .../apache/iotdb/db/utils/ErrorHandlingUtils.java | 6 + .../iotdb/db/wal/buffer/AbstractWALBuffer.java | 14 +- .../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 7 +- .../java/org/apache/iotdb/db/wal/io/WALWriter.java | 13 + .../java/org/apache/iotdb/db/wal/node/WALNode.java | 92 +- .../apache/iotdb/db/wal/utils/WALFileUtils.java | 22 +- .../iotdb/db/mpp/execution/DataDriverTest.java | 2 +- .../execution/exchange/LocalSinkHandleTest.java | 2 +- .../execution/exchange/LocalSourceHandleTest.java | 4 +- .../db/mpp/execution/exchange/StubSinkHandle.java | 2 +- .../execution/memory/MemorySourceHandleTest.java | 2 +- .../schedule/DefaultDriverSchedulerTest.java | 5 +- .../DriverTaskTimeoutSentinelThreadTest.java | 11 +- ...ImplTest.java => ClientRPCServiceImplTest.java} | 18 +- .../iotdb/db/wal/node/ConsensusReqReaderTest.java | 28 +- .../org/apache/iotdb/db/wal/node/WALNodeTest.java | 6 +- .../datanode1conf/iotdb-datanode.properties | 2 +- .../datanode2conf/iotdb-datanode.properties | 2 +- .../datanode3conf/iotdb-datanode.properties | 2 +- .../org/apache/iotdb/rpc/IoTDBJDBCDataSet.java | 8 +- .../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 6 +- .../main/java/org/apache/iotdb/rpc/RpcUtils.java | 8 +- .../org/apache/iotdb/rpc/SynchronizedHandler.java | 6 +- .../apache/iotdb/session/SessionConnection.java | 10 +- .../org/apache/iotdb/session/SessionDataSet.java | 6 +- site/src/main/.vuepress/config.js | 14 +- thrift-commons/src/main/thrift/common.thrift | 10 +- .../src/main/thrift/confignode.thrift | 10 +- .../src/main/thrift/{rpc.thrift => client.thrift} | 2 +- .../main/thrift/{mpp.thrift => datanode.thrift} | 10 +- 183 files changed, 3929 insertions(+), 3053 deletions(-) create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/client/AsyncConfigNodeClientPool.java copy confignode/src/main/java/org/apache/iotdb/confignode/client/handlers/{HeartbeatHandler.java => ConfigNodeHeartbeatHandler.java} (52%) rename confignode/src/main/java/org/apache/iotdb/confignode/client/handlers/{HeartbeatHandler.java => DataNodeHeartbeatHandler.java} (73%) copy confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/{HeartbeatCache.java => ConfigNodeHeartbeatCache.java} (88%) rename confignode/src/main/java/org/apache/iotdb/confignode/manager/load/heartbeat/{HeartbeatCache.java => DataNodeHeartbeatCache.java} (94%) rename distribution/src/assembly/{server.xml => datanode.xml} (99%) create mode 100644 docs/UserGuide/Cluster/Cluster-Concept.md delete mode 100644 docs/UserGuide/Cluster/Cluster-Setup-Example.md create mode 100644 docs/UserGuide/Reference/ConfigNode-Config-Manual.md rename docs/UserGuide/Reference/{Config-Manual.md => DataNode-Config-Manual.md} (89%) create mode 100644 docs/zh/UserGuide/Cluster/Cluster-Concept.md delete mode 100644 docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md create mode 100644 docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md rename docs/zh/UserGuide/Reference/{Config-Manual.md => DataNode-Config-Manual.md} (91%) rename {integration/src/test/java/org/apache/iotdb/db/integration => integration-test/src/test/java/org/apache/iotdb/db/it}/IoTDBQuotedPathIT.java (63%) create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java copy {integration/src/test/java/org/apache/iotdb/db/integration => integration-test/src/test/java/org/apache/iotdb/db/it}/IoTDBSyntaxConventionStringLiteralIT.java (59%) delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBNumberPathIT.java rename server/src/main/java/org/apache/iotdb/db/service/{InternalService.java => ClientRPCService.java} (82%) rename server/src/main/java/org/apache/iotdb/db/service/{InternalServiceMBean.java => ClientRPCServiceMBean.java} (95%) rename server/src/main/java/org/apache/iotdb/db/service/thrift/impl/{InternalServiceImpl.java => DataNodeRPCServiceImpl.java} (95%) rename server/src/main/java/org/apache/iotdb/db/service/thrift/impl/{DataNodeTSIServiceImpl.java => DataNodeTSServiceImpl.java} (99%) rename server/src/test/java/org/apache/iotdb/db/service/{InternalServiceImplTest.java => ClientRPCServiceImplTest.java} (95%) rename thrift/src/main/thrift/{rpc.thrift => client.thrift} (99%) rename thrift/src/main/thrift/{mpp.thrift => datanode.thrift} (96%)