This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch DeletionIT
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from b33d69fa6b fix ci
add 3c78969fea Revert "[IOTDB-3390] Serialize ConfigNode expansion
(#6256)" (#6266)
add 9da5ad5281 [IOTDB-3463] IT framework supports read and compare from
multi data nodes (#6271)
add acf7d38c33 Resolve conflicts
No new revisions were added by this update.
Summary of changes:
.github/workflows/cluster-it.yml | 14 +-
.../resources/conf/iotdb-confignode.properties | 6 -
...lientPool.java => AsyncDataNodeClientPool.java} | 12 +-
...ientPool.java => SyncConfigNodeClientPool.java} | 55 +-
...ClientPool.java => SyncDataNodeClientPool.java} | 12 +-
.../iotdb/confignode/conf/ConfigNodeConf.java | 28 +-
.../confignode/conf/ConfigNodeDescriptor.java | 9 -
.../confignode/conf/ConfigNodeStartupCheck.java | 100 +-
.../consensus/request/ConfigRequest.java | 6 +-
.../consensus/request/ConfigRequestType.java | 2 +-
...rConfigNodeReq.java => ApplyConfigNodeReq.java} | 12 +-
.../iotdb/confignode/manager/ConfigManager.java | 97 +-
.../iotdb/confignode/manager/ConsensusManager.java | 38 +-
.../apache/iotdb/confignode/manager/Manager.java | 8 +
.../iotdb/confignode/manager/NodeManager.java | 190 ++-
.../iotdb/confignode/manager/PartitionManager.java | 4 +-
.../confignode/manager/PermissionManager.java | 4 +-
.../iotdb/confignode/manager/UDFManager.java | 6 +-
.../iotdb/confignode/manager/load/LoadManager.java | 6 +-
.../iotdb/confignode/persistence/NodeInfo.java | 12 +-
.../executor/ConfigRequestExecutor.java | 6 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 6 +-
.../iotdb/confignode/service/ConfigNode.java | 10 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 16 +-
.../consensus/request/ConfigRequestSerDeTest.java | 10 +-
.../iotdb/confignode/persistence/NodeInfoTest.java | 5 +-
integration-test/README.md | 27 +-
.../org/apache/iotdb/it/env/ClusterEnvBase.java | 111 +-
.../java/org/apache/iotdb/it/env/ConfigNode.java | 15 +-
.../java/org/apache/iotdb/it/env/DataNode.java | 13 +-
.../java/org/apache/iotdb/it/env/EnvFactory.java | 2 +
.../itbase/runtime/ClusterResultSetMetaData.java | 239 ++++
.../itbase/runtime/ClusterTestConnection.java | 333 ++++++
.../iotdb/itbase/runtime/ClusterTestResultSet.java | 1230 ++++++++++++++++++++
.../iotdb/itbase/runtime/ClusterTestStatement.java | 297 +++++
.../itbase/runtime/InconsistentDataException.java | 11 +-
.../iotdb/itbase/runtime/NodeConnection.java | 85 ++
.../itbase/runtime/ParallelRequestDelegate.java | 60 +
.../iotdb/itbase/runtime/RequestDelegate.java | 86 ++
.../iotdb/itbase/runtime/RequestThreadPool.java | 32 +-
.../itbase/runtime/SerialRequestDelegate.java | 34 +-
metrics/pom.xml | 41 +
.../apache/iotdb/db/auth/AuthorizerManager.java | 11 +-
.../iotdb/db/auth/ClusterAuthorityFetcher.java | 25 +-
.../apache/iotdb/db/auth/IAuthorityFetcher.java | 6 +-
.../iotdb/db/auth/StandaloneAuthorityFetcher.java | 6 +-
...ConfigNodeClient.java => ConfigNodeClient.java} | 61 +-
.../iotdb/db/client/DataNodeClientPoolFactory.java | 10 +-
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 6 +-
.../mpp/plan/analyze/ClusterPartitionFetcher.java | 25 +-
.../mpp/plan/execution/config/AuthorizerTask.java | 10 +-
.../mpp/plan/execution/config/ConfigExecution.java | 6 +-
.../execution/config/CountStorageGroupTask.java | 7 +-
.../plan/execution/config/CreateFunctionTask.java | 9 +-
.../execution/config/DeleteStorageGroupTask.java | 7 +-
.../plan/execution/config/DropFunctionTask.java | 9 +-
.../db/mpp/plan/execution/config/FlushTask.java | 7 +-
.../db/mpp/plan/execution/config/IConfigTask.java | 4 +-
.../plan/execution/config/SetStorageGroupTask.java | 8 +-
.../db/mpp/plan/execution/config/SetTTLTask.java | 8 +-
.../mpp/plan/execution/config/ShowClusterTask.java | 7 +-
.../plan/execution/config/ShowFunctionsTask.java | 4 +-
.../execution/config/ShowStorageGroupTask.java | 7 +-
.../db/mpp/plan/execution/config/ShowTTLTask.java | 7 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 8 +-
.../db/mpp/execution/ConfigExecutionTest.java | 4 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 7 +-
.../src/main/thrift/confignode.thrift | 47 +-
68 files changed, 3024 insertions(+), 582 deletions(-)
rename
confignode/src/main/java/org/apache/iotdb/confignode/client/{AsyncConfigNodeToDataNodeClientPool.java
=> AsyncDataNodeClientPool.java} (96%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/client/{SyncConfigNodeToConfigNodeClientPool.java
=> SyncConfigNodeClientPool.java} (65%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/client/{SyncConfigNodeToDataNodeClientPool.java
=> SyncDataNodeClientPool.java} (94%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/{RegisterConfigNodeReq.java
=> ApplyConfigNodeReq.java} (85%)
create mode 100644
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/ClusterResultSetMetaData.java
create mode 100644
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/ClusterTestConnection.java
create mode 100644
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/ClusterTestResultSet.java
create mode 100644
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/ClusterTestStatement.java
copy jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBURLException.java =>
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/InconsistentDataException.java
(74%)
create mode 100644
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/NodeConnection.java
create mode 100644
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/ParallelRequestDelegate.java
create mode 100644
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/RequestDelegate.java
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/SignalBatchData.java
=>
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/RequestThreadPool.java
(55%)
copy
server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJob.java
=>
integration-test/src/main/java/org/apache/iotdb/itbase/runtime/SerialRequestDelegate.java
(54%)
rename
server/src/main/java/org/apache/iotdb/db/client/{DataNodeToConfigNodeClient.java
=> ConfigNodeClient.java} (91%)