This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/addQueryIT in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a6721c2f1aa62bcb769eb4f93d261dd0f5b09561 Merge: 76c8d59b04 084d4a4452 Author: Minghui Liu <[email protected]> AuthorDate: Mon Jun 20 16:46:27 2022 +0800 Merge remote-tracking branch 'origin/master' into lmh/addQueryIT # Conflicts: # integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java .github/workflows/cluster-it.yml | 10 +- .../{cluster-it.yml => standalone-it-for-mpp.yml} | 20 +-- .../consensus/response/DataPartitionResp.java | 79 +++++++--- .../response/SchemaNodeManagementResp.java | 48 ++++-- .../consensus/response/SchemaPartitionResp.java | 59 ++++--- .../iotdb/confignode/manager/ConfigManager.java | 116 +++++++------- .../apache/iotdb/confignode/manager/Manager.java | 24 +-- .../iotdb/confignode/manager/load/LoadManager.java | 35 +++++ .../manager/load/balancer/RouteBalancer.java | 56 +++++++ .../manager/load/balancer/router/IRouter.java | 43 +++++ .../balancer/router/LoadScoreGreedyRouter.java | 80 ++++++++++ .../manager/load/heartbeat/HeartbeatCache.java | 9 +- .../persistence/partition/PartitionInfo.java | 67 +++----- .../partition/StorageGroupPartitionTable.java | 47 +----- .../thrift/ConfigNodeRPCServiceProcessor.java | 38 +---- integration-test/pom.xml | 138 +++++++++++++++- .../assembly/{cluster-test.xml => mpp-test.xml} | 0 .../env/{ClusterEnvBase.java => AbstractEnv.java} | 168 ++++++++++---------- ...usterNodeBase.java => AbstractNodeWrapper.java} | 8 +- .../java/org/apache/iotdb/it/env/Cluster1Env.java | 2 +- .../org/apache/iotdb/it/env/ConfigFactory.java | 9 +- .../{ConfigNode.java => ConfigNodeWrapper.java} | 4 +- .../it/env/{DataNode.java => DataNodeWrapper.java} | 8 +- .../java/org/apache/iotdb/it/env/EnvFactory.java | 7 +- .../env/{ClusterEnvConfig.java => MppConfig.java} | 21 +-- ...emoteEnvConfig.java => RemoteServerConfig.java} | 2 +- ...ter1Env.java => StandaloneDataNodeWrapper.java} | 30 ++-- .../apache/iotdb/it/env/StandaloneOnMppEnv.java | 72 +++++++++ .../org/apache/iotdb/itbase/env/BaseConfig.java | 4 +- .../env/{BaseNode.java => BaseNodeWrapper.java} | 2 +- .../iotdb/itbase/runtime/ClusterTestStatement.java | 2 +- .../itbase/runtime/ParallelRequestDelegate.java | 8 +- .../iotdb/itbase/runtime/RequestDelegate.java | 45 +++++- .../itbase/runtime/SerialRequestDelegate.java | 4 +- integration-test/src/script/append-to-env.sh | 32 ++++ .../org/apache/iotdb/db/it/IoTDBExampleIT.java | 4 +- .../iotdb/db/it/aligned/AlignedWriteUtil.java | 7 +- .../db/it/aligned/IoTDBInsertAlignedValues2IT.java | 2 +- .../db/it/aligned/IoTDBInsertAlignedValues3IT.java | 2 +- .../db/it/aligned/IoTDBInsertAlignedValues4IT.java | 2 +- .../db/it/aligned/IoTDBInsertAlignedValuesIT.java | 2 +- .../db/it/udf/IoTDBUDTFBuiltinFunctionIT.java | 7 + integration/checkstyle.xml | 173 ++++++++++++++++++++- .../src/assembly/resources/sbin/stop-datanode.bat | 19 ++- .../mpp/plan/analyze/StandaloneSchemaFetcher.java | 2 +- .../physical/sys/CreateAlignedTimeSeriesPlan.java | 2 +- udf-api/pom.xml | 29 ++++ 47 files changed, 1138 insertions(+), 410 deletions(-)
