diff --git a/.github/workflows/pipe-it-2cluster.yml b/.github/workflows/pipe-it.yml similarity index 63% rename from .github/workflows/pipe-it-2cluster.yml rename to .github/workflows/pipe-it.yml index 9be00874afbd..4ff0159a8fcc 100644 --- a/.github/workflows/pipe-it-2cluster.yml +++ b/.github/workflows/pipe-it.yml @@ -34,7 +34,110 @@ env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} jobs: - auto-create-schema: + single: + strategy: + fail-fast: false + max-parallel: 15 + matrix: + java: [17] + # StrongConsistencyClusterMode is ignored now because RatisConsensus has not been supported yet. + cluster1: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode, PipeConsensusBatchMode, PipeConsensusStreamMode] + cluster2: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode] + os: [ ubuntu-latest ] + exclude: + - cluster1: LightWeightStandaloneMode + cluster2: LightWeightStandaloneMode + - cluster1: LightWeightStandaloneMode + cluster2: ScalableSingleNodeMode + - cluster1: ScalableSingleNodeMode + cluster2: LightWeightStandaloneMode + - cluster1: ScalableSingleNodeMode + cluster2: HighPerformanceMode + - cluster1: HighPerformanceMode + cluster2: LightWeightStandaloneMode + - cluster1: HighPerformanceMode + cluster2: HighPerformanceMode + - cluster1: PipeConsensusBatchMode + cluster2: LightWeightStandaloneMode + - cluster1: PipeConsensusBatchMode + cluster2: HighPerformanceMode + - cluster1: PipeConsensusStreamMode + cluster2: LightWeightStandaloneMode + - cluster1: PipeConsensusStreamMode + cluster2: HighPerformanceMode + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + distribution: liberica + java-version: ${{ matrix.java }} + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2- + - name: Sleep for a random duration between 0 and 10000 milliseconds + run: | + sleep $(( $(( RANDOM % 10000 + 1 )) / 1000)) + - name: IT Test + shell: bash + # we do not compile client-cpp for saving time, it is tested in client.yml + # we can skip influxdb-protocol because it has been tested separately in influxdb-protocol.yml + run: | + retry() { + local -i max_attempts=3 + local -i attempt=1 + local -i retry_sleep=5 + local test_output + + while [ $attempt -le $max_attempts ]; do + mvn clean verify \ + -P with-integration-tests \ + -DskipUTs \ + -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \ + -DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \ + -pl integration-test \ + -am -PMultiClusterIT1 \ + -ntp >> ~/run-tests-$attempt.log && return 0 + test_output=$(cat ~/run-tests-$attempt.log) + + mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ + + echo "==================== BEGIN: ~/run-tests-$attempt.log ====================" + echo "$test_output" + echo "==================== END: ~/run-tests-$attempt.log ======================" + + if echo "$test_output" | grep -q "Could not transfer artifact"; then + if [ $attempt -lt $max_attempts ]; then + echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..." + sleep $retry_sleep + attempt=$((attempt + 1)) + else + echo "Test failed after $max_attempts attempts due to artifact transfer issue." + echo "Treating this as a success because the issue is likely transient." + return 0 + fi + elif [ $? -ne 0 ]; then + echo "Test failed with a different error." + return 1 + else + echo "Tests passed" + return 0 + fi + done + } + retry + - name: Upload Artifact + if: failure() + uses: actions/upload-artifact@v4 + with: + name: cluster-log-manual-create-schema-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }} + path: integration-test/target/cluster-logs + retention-days: 30 + dual-tree-auto-basic: strategy: fail-fast: false max-parallel: 15 @@ -78,7 +181,7 @@ jobs: -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \ -DClusterConfigurations=${{ matrix.cluster }},${{ matrix.cluster }} \ -pl integration-test \ - -am -PMultiClusterIT2AutoCreateSchema \ + -am -PMultiClusterIT2DualTreeAutoBasic \ -ntp >> ~/run-tests-$attempt.log && return 0 test_output=$(cat ~/run-tests-$attempt.log) @@ -115,7 +218,110 @@ jobs: name: cluster-log-auto-create-schema-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster }}-${{ matrix.cluster }} path: integration-test/target/cluster-logs retention-days: 30 - manual-create-schema: + dual-tree-auto-enhanced: + strategy: + fail-fast: false + max-parallel: 15 + matrix: + java: [17] + # StrongConsistencyClusterMode is ignored now because RatisConsensus has not been supported yet. + cluster1: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode, PipeConsensusBatchMode, PipeConsensusStreamMode] + cluster2: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode] + os: [ ubuntu-latest ] + exclude: + - cluster1: LightWeightStandaloneMode + cluster2: LightWeightStandaloneMode + - cluster1: LightWeightStandaloneMode + cluster2: ScalableSingleNodeMode + - cluster1: ScalableSingleNodeMode + cluster2: LightWeightStandaloneMode + - cluster1: ScalableSingleNodeMode + cluster2: HighPerformanceMode + - cluster1: HighPerformanceMode + cluster2: LightWeightStandaloneMode + - cluster1: HighPerformanceMode + cluster2: HighPerformanceMode + - cluster1: PipeConsensusBatchMode + cluster2: LightWeightStandaloneMode + - cluster1: PipeConsensusBatchMode + cluster2: HighPerformanceMode + - cluster1: PipeConsensusStreamMode + cluster2: LightWeightStandaloneMode + - cluster1: PipeConsensusStreamMode + cluster2: HighPerformanceMode + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + distribution: liberica + java-version: ${{ matrix.java }} + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2- + - name: Sleep for a random duration between 0 and 10000 milliseconds + run: | + sleep $(( $(( RANDOM % 10000 + 1 )) / 1000)) + - name: IT Test + shell: bash + # we do not compile client-cpp for saving time, it is tested in client.yml + # we can skip influxdb-protocol because it has been tested separately in influxdb-protocol.yml + run: | + retry() { + local -i max_attempts=3 + local -i attempt=1 + local -i retry_sleep=5 + local test_output + + while [ $attempt -le $max_attempts ]; do + mvn clean verify \ + -P with-integration-tests \ + -DskipUTs \ + -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \ + -DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \ + -pl integration-test \ + -am -PMultiClusterIT2DualTreeAutoEnhanced \ + -ntp >> ~/run-tests-$attempt.log && return 0 + test_output=$(cat ~/run-tests-$attempt.log) + + mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ + + echo "==================== BEGIN: ~/run-tests-$attempt.log ====================" + echo "$test_output" + echo "==================== END: ~/run-tests-$attempt.log ======================" + + if echo "$test_output" | grep -q "Could not transfer artifact"; then + if [ $attempt -lt $max_attempts ]; then + echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..." + sleep $retry_sleep + attempt=$((attempt + 1)) + else + echo "Test failed after $max_attempts attempts due to artifact transfer issue." + echo "Treating this as a success because the issue is likely transient." + return 0 + fi + elif [ $? -ne 0 ]; then + echo "Test failed with a different error." + return 1 + else + echo "Tests passed" + return 0 + fi + done + } + retry + - name: Upload Artifact + if: failure() + uses: actions/upload-artifact@v4 + with: + name: cluster-log-manual-create-schema-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }} + path: integration-test/target/cluster-logs + retention-days: 30 + dual-tree-auto-manual: strategy: fail-fast: false max-parallel: 15 @@ -181,7 +387,7 @@ jobs: -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \ -DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \ -pl integration-test \ - -am -PMultiClusterIT2ManualCreateSchema \ + -am -PMultiClusterIT2DualTreeManual \ -ntp >> ~/run-tests-$attempt.log && return 0 test_output=$(cat ~/run-tests-$attempt.log) @@ -464,7 +670,7 @@ jobs: name: cluster-log-subscription-regression-misc-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }} path: integration-test/target/cluster-logs retention-days: 30 - table-model: + dual-table-manual-basic: strategy: fail-fast: false max-parallel: 15 @@ -508,7 +714,7 @@ jobs: -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \ -DClusterConfigurations=${{ matrix.cluster }},${{ matrix.cluster }} \ -pl integration-test \ - -am -PMultiClusterIT2TableModel \ + -am -PMultiClusterIT2DualTableManualBasic \ -ntp >> ~/run-tests-$attempt.log && return 0 test_output=$(cat ~/run-tests-$attempt.log) @@ -545,3 +751,84 @@ jobs: name: cluster-log-table-model-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster }}-${{ matrix.cluster }} path: integration-test/target/cluster-logs retention-days: 30 + dual-table-manual-enhanced: + strategy: + fail-fast: false + max-parallel: 15 + matrix: + java: [17] + # StrongConsistencyClusterMode is ignored now because RatisConsensus has not been supported yet. + cluster: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode, PipeConsensusBatchMode, PipeConsensusStreamMode] + os: [ ubuntu-latest ] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + distribution: liberica + java-version: ${{ matrix.java }} + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2- + - name: Sleep for a random duration between 0 and 10000 milliseconds + run: | + sleep $(( $(( RANDOM % 10000 + 1 )) / 1000)) + - name: IT Test + shell: bash + # we do not compile client-cpp for saving time, it is tested in client.yml + # we can skip influxdb-protocol because it has been tested separately in influxdb-protocol.yml + run: | + retry() { + local -i max_attempts=3 + local -i attempt=1 + local -i retry_sleep=5 + local test_output + + while [ $attempt -le $max_attempts ]; do + mvn clean verify \ + -P with-integration-tests \ + -DskipUTs \ + -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \ + -DClusterConfigurations=${{ matrix.cluster }},${{ matrix.cluster }} \ + -pl integration-test \ + -am -PMultiClusterIT2DualTableManualEnhanced \ + -ntp >> ~/run-tests-$attempt.log && return 0 + test_output=$(cat ~/run-tests-$attempt.log) + + mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ + + echo "==================== BEGIN: ~/run-tests-$attempt.log ====================" + echo "$test_output" + echo "==================== END: ~/run-tests-$attempt.log ======================" + + if echo "$test_output" | grep -q "Could not transfer artifact"; then + if [ $attempt -lt $max_attempts ]; then + echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..." + sleep $retry_sleep + attempt=$((attempt + 1)) + else + echo "Test failed after $max_attempts attempts due to artifact transfer issue." + echo "Treating this as a success because the issue is likely transient." + return 0 + fi + elif [ $? -ne 0 ]; then + echo "Test failed with a different error." + return 1 + else + echo "Tests passed" + return 0 + fi + done + } + retry + - name: Upload Artifact + if: failure() + uses: actions/upload-artifact@v4 + with: + name: cluster-log-table-model-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster }}-${{ matrix.cluster }} + path: integration-test/target/cluster-logs + retention-days: 30 \ No newline at end of file diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 43e30ace4ea9..8dd4f0083772 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -445,7 +445,7 @@ org.apache.iotdb.itbase.category.ManualIT - org.apache.iotdb.itbase.category.MultiClusterIT1,org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema,org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc,org.apache.iotdb.itbase.category.MultiClusterIT3,org.apache.iotdb.itbase.category.MultiClusterIT2TableModel + org.apache.iotdb.itbase.category.MultiClusterIT1,org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic,org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced,org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc,org.apache.iotdb.itbase.category.MultiClusterIT3,org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic,org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced false true true @@ -467,13 +467,13 @@ - MultiClusterIT2AutoCreateSchema + MultiClusterIT2DualTreeAutoBasic false org.apache.iotdb.itbase.category.ManualIT - org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema + org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic false true true @@ -481,13 +481,13 @@ - MultiClusterIT2ManualCreateSchema + MultiClusterIT2DualTreeAutoEnhanced false org.apache.iotdb.itbase.category.ManualIT - org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema + org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced false true true @@ -495,13 +495,41 @@ - MultiClusterIT2TableModel + MultiClusterIT2DualTableManualBasic false org.apache.iotdb.itbase.category.ManualIT - org.apache.iotdb.itbase.category.MultiClusterIT2TableModel + org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic + false + true + true + MultiCluster + + + + MultiClusterIT2DualTableManualEnhanced + + false + + + org.apache.iotdb.itbase.category.ManualIT + org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced + false + true + true + MultiCluster + + + + MultiClusterIT2DualTreeManual + + false + + + org.apache.iotdb.itbase.category.ManualIT + org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual false true true diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2AutoCreateSchema.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTableManualBasic.java similarity index 94% rename from integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2AutoCreateSchema.java rename to integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTableManualBasic.java index 25000e3012ae..07eb001fcde3 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2AutoCreateSchema.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTableManualBasic.java @@ -19,4 +19,4 @@ package org.apache.iotdb.itbase.category; -public interface MultiClusterIT2AutoCreateSchema {} +public class MultiClusterIT2DualTableManualBasic {} diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTableManualEnhanced.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTableManualEnhanced.java new file mode 100644 index 000000000000..701401c26854 --- /dev/null +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTableManualEnhanced.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iotdb.itbase.category; + +public class MultiClusterIT2DualTableManualEnhanced {} diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2ManualCreateSchema.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTreeAutoBasic.java similarity index 94% rename from integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2ManualCreateSchema.java rename to integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTreeAutoBasic.java index 2fb36dd22920..477a606584b6 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2ManualCreateSchema.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTreeAutoBasic.java @@ -19,4 +19,4 @@ package org.apache.iotdb.itbase.category; -public interface MultiClusterIT2ManualCreateSchema {} +public class MultiClusterIT2DualTreeAutoBasic {} diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTreeAutoEnhanced.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTreeAutoEnhanced.java new file mode 100644 index 000000000000..7ce45f738104 --- /dev/null +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTreeAutoEnhanced.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iotdb.itbase.category; + +public class MultiClusterIT2DualTreeAutoEnhanced {} diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2TableModel.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTreeManual.java similarity index 94% rename from integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2TableModel.java rename to integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTreeManual.java index c9280cd3fc60..b9e3e2f99d12 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2TableModel.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2DualTreeManual.java @@ -19,4 +19,4 @@ package org.apache.iotdb.itbase.category; -public class MultiClusterIT2TableModel {} +public class MultiClusterIT2DualTreeManual {} diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/TableModelUtils.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/TableModelUtils.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/TableModelUtils.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/TableModelUtils.java index b116cad502c2..0410a50a9775 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/TableModelUtils.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/TableModelUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel; import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.isession.ITableSession; diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/AbstractPipeTableModelTestIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/AbstractPipeTableModelDualManualIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/AbstractPipeTableModelTestIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/AbstractPipeTableModelDualManualIT.java index 06c7c3867f5b..fff0b8c6bf1a 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/AbstractPipeTableModelTestIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/AbstractPipeTableModelDualManualIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.it.env.MultiEnvFactory; @@ -26,7 +26,7 @@ import org.junit.After; import org.junit.Before; -abstract class AbstractPipeTableModelTestIT { +public abstract class AbstractPipeTableModelDualManualIT { protected BaseEnv senderEnv; protected BaseEnv receiverEnv; diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeAlterIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeAlterIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeAlterIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeAlterIT.java index 1665f9d2ce2b..93bb1424c2b2 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeAlterIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeAlterIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo; @@ -25,8 +25,10 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.junit.Assert; import org.junit.Test; @@ -42,8 +44,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeAlterIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBPipeAlterIT extends AbstractPipeTableModelDualManualIT { @Test public void testBasicAlterPipe() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeDataSinkIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeDataSinkIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeDataSinkIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeDataSinkIT.java index 2867a3402503..7c98f652f73f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeDataSinkIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeDataSinkIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,9 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.write.record.Tablet; @@ -47,8 +49,8 @@ import java.util.function.Consumer; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeDataSinkIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBPipeDataSinkIT extends AbstractPipeTableModelDualManualIT { @Test public void testThriftConnectorWithRealtimeFirstDisabled() throws Exception { @@ -190,7 +192,7 @@ private void testSinkFormat(final String format) throws Exception { return; } - TableModelUtils.assertCountData("test", "test", 150, receiverEnv); + TableModelUtils.assertCountData("test", "test", 150, receiverEnv, handleFailure); TestUtils.assertDataEventuallyOnEnv( receiverEnv, @@ -235,7 +237,7 @@ private void testSinkFormat(final String format) throws Exception { new HashSet<>(Arrays.asList("0,1.0,", "1,1.0,", "2,1.0,", "3,1.0,", "4,1.0,"))), handleFailure); - TableModelUtils.assertCountData("test", "test", 350, receiverEnv); + TableModelUtils.assertCountData("test", "test", 350, receiverEnv, handleFailure); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeExtractorIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeExtractorIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeExtractorIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeExtractorIT.java index 41d6a8434d1e..d432f4c54480 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeExtractorIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeExtractorIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,8 +27,10 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -50,8 +52,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeExtractorIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBPipeExtractorIT extends AbstractPipeTableModelDualManualIT { @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeIsolationIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeIsolationIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeIsolationIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeIsolationIT.java index 57a3be38e217..b0bdb5dd6737 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeIsolationIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeIsolationIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq; @@ -26,8 +26,10 @@ import org.apache.iotdb.confignode.rpc.thrift.TStopPipeReq; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -43,8 +45,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeIsolationIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBPipeIsolationIT extends AbstractPipeTableModelDualManualIT { @Test public void testWritePipeIsolation() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeLifeCycleIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeLifeCycleIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeLifeCycleIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeLifeCycleIT.java index 88cfc1bffd77..cf8dfe005ee8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeLifeCycleIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeLifeCycleIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,9 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -41,8 +43,8 @@ import java.util.function.Consumer; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeLifeCycleIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBPipeLifeCycleIT extends AbstractPipeTableModelDualManualIT { @Test public void testLifeCycleWithHistoryEnabled() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeProtocolIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeProtocolIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeProtocolIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeProtocolIT.java index 046c5f68fece..3fe82b52b97c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeProtocolIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeProtocolIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -28,7 +28,9 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -43,8 +45,8 @@ /** Test pipe's basic functionalities under multiple cluster and consensus protocol settings. */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeProtocolIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBPipeProtocolIT extends AbstractPipeTableModelDualManualIT { @Override @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeSwitchStatusIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeSwitchStatusIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeSwitchStatusIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeSwitchStatusIT.java index 4c80f0ae6731..b6b29deaac2e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeSwitchStatusIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeSwitchStatusIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,7 +27,9 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -40,8 +42,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeSwitchStatusIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBPipeSwitchStatusIT extends AbstractPipeTableModelDualManualIT { @Test public void testPipeSwitchStatus() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeSyntaxIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeSyntaxIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeSyntaxIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeSyntaxIT.java index 96673a93a4a9..bc5233f1dd8c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeSyntaxIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeSyntaxIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -26,8 +26,9 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -46,8 +47,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeSyntaxIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBPipeSyntaxIT extends AbstractPipeTableModelDualManualIT { @Test public void testValidPipeName() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeWithLoadIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeWithLoadIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeWithLoadIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeWithLoadIT.java index d4f689187bfb..72b87d3cc288 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeWithLoadIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeWithLoadIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,8 +27,10 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -48,8 +50,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeWithLoadIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBPipeWithLoadIT extends AbstractPipeTableModelDualManualIT { @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBTablePatternFormatIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBTablePatternFormatIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBTablePatternFormatIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBTablePatternFormatIT.java index ac1e96ab4aa9..b3bd7cd85861 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBTablePatternFormatIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBTablePatternFormatIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,9 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualBasic; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -40,8 +42,8 @@ import java.util.function.Consumer; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBTablePatternFormatIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualBasic.class}) +public class IoTDBTablePatternFormatIT extends AbstractPipeTableModelDualManualIT { @Test public void testTableNamePattern() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeAutoConflictIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeAutoConflictIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeAutoConflictIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeAutoConflictIT.java index 525be694815a..fc29e3e12a74 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeAutoConflictIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeAutoConflictIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,8 +27,10 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -44,8 +46,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeAutoConflictIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualEnhanced.class}) +public class IoTDBPipeAutoConflictIT extends AbstractPipeTableModelDualManualIT { @Before public void setUp() { MultiEnvFactory.createEnv(2); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeAutoDropIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeAutoDropIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeAutoDropIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeAutoDropIT.java index 8f19b7f32a7f..cbf2c3073978 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeAutoDropIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeAutoDropIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,7 +27,9 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -48,8 +50,8 @@ import static org.awaitility.Awaitility.await; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeAutoDropIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualEnhanced.class}) +public class IoTDBPipeAutoDropIT extends AbstractPipeTableModelDualManualIT { @Test public void testAutoDropInHistoricalTransfer() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeClusterIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeClusterIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeClusterIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeClusterIT.java index cab7f31a7568..44fae78b362b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeClusterIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeClusterIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.exception.ClientManagerException; @@ -34,7 +34,9 @@ import org.apache.iotdb.it.env.cluster.env.AbstractEnv; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.thrift.TException; @@ -56,8 +58,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeClusterIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualEnhanced.class}) +public class IoTDBPipeClusterIT extends AbstractPipeTableModelDualManualIT { @Override @Before diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeConnectorCompressionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorCompressionIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeConnectorCompressionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorCompressionIT.java index 3b462d0d6ae6..7bdbc0c2fca7 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeConnectorCompressionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorCompressionIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -30,7 +30,9 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -52,8 +54,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeConnectorCompressionIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualEnhanced.class}) +public class IoTDBPipeConnectorCompressionIT extends AbstractPipeTableModelDualManualIT { @Override @Before diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeConnectorParallelIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorParallelIT.java similarity index 91% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeConnectorParallelIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorParallelIT.java index 663d40c5b07c..7c2c56a0fd73 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeConnectorParallelIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorParallelIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,9 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -41,8 +43,8 @@ import java.util.function.Consumer; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeConnectorParallelIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualEnhanced.class}) +public class IoTDBPipeConnectorParallelIT extends AbstractPipeTableModelDualManualIT { @Test public void testIoTConnectorParallel() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeDoubleLivingIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeDoubleLivingIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeDoubleLivingIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeDoubleLivingIT.java index f6573728cf29..55c2aae1290e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeDoubleLivingIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeDoubleLivingIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.enhanced; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; import org.apache.iotdb.confignode.rpc.thrift.TDropPipeReq; @@ -26,8 +26,10 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -46,8 +48,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeDoubleLivingIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualEnhanced.class}) +public class IoTDBPipeDoubleLivingIT extends AbstractPipeTableModelDualManualIT { @Test public void testDoubleLivingInvalidParameter() throws Exception { @@ -106,7 +108,8 @@ public void testDoubleLivingInvalidParameter() throws Exception { } } - // combination of org.apache.iotdb.pipe.it.tablemodel.IoTDBPipeLifeCycleIT.testDoubleLiving and + // combination of + // org.apache.iotdb.pipe.it.tablemodel.autocreate.IoTDBPipeLifeCycleIT.testDoubleLiving and // org.apache.iotdb.pipe.it.autocreate.IoTDBPipeLifeCycleIT.testDoubleLiving @Test public void testBasicDoubleLiving() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeNullValueIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeNullValueIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeNullValueIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeNullValueIT.java index aae3626ee531..de59d7ef8a63 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeNullValueIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeNullValueIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,9 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -38,8 +40,8 @@ import java.util.function.Consumer; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeNullValueIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualEnhanced.class}) +public class IoTDBPipeNullValueIT extends AbstractPipeTableModelDualManualIT { private enum InsertType { SESSION_INSERT_RECORD, diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeTypeConversionISessionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionISessionIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeTypeConversionISessionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionISessionIT.java index dcd48928fdcc..606fba4d17e8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeTypeConversionISessionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionISessionIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.enhanced; import org.apache.iotdb.commons.utils.function.CheckedTriConsumer; import org.apache.iotdb.db.it.utils.TestUtils; @@ -25,8 +25,9 @@ import org.apache.iotdb.isession.ITableSession; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; @@ -53,6 +54,7 @@ import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; import static org.awaitility.Awaitility.await; import static org.junit.Assert.assertEquals; @@ -60,8 +62,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeTypeConversionISessionIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualEnhanced.class}) +public class IoTDBPipeTypeConversionISessionIT extends AbstractPipeTableModelDualManualIT { private static final int generateDataSize = 1000; @Test @@ -122,6 +124,11 @@ private void prepareTypeConversionTest( senderSession.executeNonQueryStatement("flush"); } + final Consumer handleFailure = + o -> { + TestUtils.executeNonQueryWithRetry(senderEnv, "flush"); + TestUtils.executeNonQueryWithRetry(receiverEnv, "flush"); + }; // Verify receiver data long timeoutSeconds = 600; List> expectedValues = @@ -138,7 +145,8 @@ private void prepareTypeConversionTest( query(receiverSession, tablet.getSchemas(), tablet.getTableName()), expectedValues, tablet.getTimestamps()); - } catch (Exception e) { + } catch (Exception | Error e) { + handleFailure.accept(e.getMessage()); fail(e.getMessage()); } }); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeTypeConversionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeTypeConversionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionIT.java index 40e485b580db..d9597574c7b1 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/IoTDBPipeTypeConversionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionIT.java @@ -17,13 +17,14 @@ * under the License. */ -package org.apache.iotdb.pipe.it.tablemodel; +package org.apache.iotdb.pipe.it.dual.tablemodel.manual.enhanced; import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.db.pipe.receiver.transform.converter.ValueConverter; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2TableModel; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTableManualEnhanced; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.tablemodel.manual.AbstractPipeTableModelDualManualIT; import org.apache.iotdb.rpc.RpcUtils; import org.apache.tsfile.enums.TSDataType; @@ -45,10 +46,11 @@ import java.util.List; import java.util.Random; import java.util.Set; +import java.util.function.Consumer; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2TableModel.class}) -public class IoTDBPipeTypeConversionIT extends AbstractPipeTableModelTestIT { +@Category({MultiClusterIT2DualTableManualEnhanced.class}) +public class IoTDBPipeTypeConversionIT extends AbstractPipeTableModelDualManualIT { private static final int generateDataSize = 100; @@ -202,12 +204,18 @@ public void testStringToOtherTypeConversion() { private void executeAndVerifyTypeConversion(TSDataType source, TSDataType target) { List pairs = prepareTypeConversionTest(source, target); + final Consumer handleFailure = + o -> { + TestUtils.executeNonQueryWithRetry(senderEnv, "flush"); + TestUtils.executeNonQueryWithRetry(receiverEnv, "flush"); + }; TestUtils.assertDataEventuallyOnEnv( receiverEnv, String.format("select time,status,s1 from %s2%s", source.name(), target.name()), "time,status,s1,", createExpectedResultSet(pairs, source, target), - "test"); + "test", + handleFailure); } private List prepareTypeConversionTest(TSDataType sourceType, TSDataType targetType) { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/AbstractPipeDualTreeModelAutoIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/AbstractPipeDualTreeModelAutoIT.java index 3ad55920d294..4aa06e7acf31 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/AbstractPipeDualTreeModelAutoIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.consensus.ConsensusFactory; @@ -34,7 +34,7 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -abstract class AbstractPipeDualAutoIT { +public abstract class AbstractPipeDualTreeModelAutoIT { protected BaseEnv senderEnv; protected BaseEnv receiverEnv; diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAlterIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeAlterIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAlterIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeAlterIT.java index a2f5c65cb73e..b1c8c4cf995b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAlterIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeAlterIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo; @@ -25,7 +25,8 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.junit.Assert; import org.junit.Test; @@ -44,8 +45,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeAlterIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBPipeAlterIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testBasicAlterPipe() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorParallelIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeConnectorParallelIT.java similarity index 92% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorParallelIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeConnectorParallelIT.java index 87bb4b465e56..8857f1942179 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorParallelIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeConnectorParallelIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,8 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -40,8 +41,8 @@ import java.util.Set; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeConnectorParallelIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBPipeConnectorParallelIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testIoTConnectorParallel() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeDataSinkIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeDataSinkIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeDataSinkIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeDataSinkIT.java index 7facee0bbf06..8855bf4e25f4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeDataSinkIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeDataSinkIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,8 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -40,8 +41,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeDataSinkIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBPipeDataSinkIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testThriftConnectorWithRealtimeFirstDisabled() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeExtractorIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeExtractorIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeExtractorIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeExtractorIT.java index 0b4636c0d137..32075c4040cc 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeExtractorIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeExtractorIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -29,8 +29,9 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -52,8 +53,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeExtractorIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBPipeExtractorIT extends AbstractPipeDualTreeModelAutoIT { @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeLifeCycleIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeLifeCycleIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeLifeCycleIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeLifeCycleIT.java index f151463b396c..c6e2e5479232 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeLifeCycleIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeLifeCycleIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.auth.entity.PrivilegeType; @@ -26,7 +26,8 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -51,8 +52,8 @@ import static org.apache.iotdb.db.it.utils.TestUtils.tryExecuteNonQueryWithRetry; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeLifeCycleIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBPipeLifeCycleIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testLifeCycleWithHistoryEnabled() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProcessorIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeProcessorIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProcessorIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeProcessorIT.java index 27bc5be96599..4a17939065f4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProcessorIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeProcessorIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,7 +27,8 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -43,8 +44,8 @@ import java.util.Set; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeProcessorIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBPipeProcessorIT extends AbstractPipeDualTreeModelAutoIT { @Before public void setUp() { MultiEnvFactory.createEnv(2); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeProtocolIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeProtocolIT.java index c5d41f001cb8..6035ed9c16a0 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeProtocolIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -28,7 +28,8 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -44,8 +45,8 @@ /** Test pipe's basic functionalities under multiple cluster and consensus protocol settings. */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeProtocolIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBPipeProtocolIT extends AbstractPipeDualTreeModelAutoIT { @Override @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeSwitchStatusIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSwitchStatusIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeSwitchStatusIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSwitchStatusIT.java index 03e52a982e61..ee70f1a3a3ba 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeSwitchStatusIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSwitchStatusIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -28,7 +28,8 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -41,8 +42,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeSwitchStatusIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBPipeSwitchStatusIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testPipeSwitchStatus() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeSyntaxIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSyntaxIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeSyntaxIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSyntaxIT.java index b9de28b71586..a0450942d473 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeSyntaxIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSyntaxIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -26,7 +26,8 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -45,8 +46,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeSyntaxIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBPipeSyntaxIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testValidPipeName() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBTreePatternFormatIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBTreePatternFormatIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBTreePatternFormatIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBTreePatternFormatIT.java index b62102f545df..28fa66213126 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBTreePatternFormatIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBTreePatternFormatIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.basic; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,8 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -40,8 +41,8 @@ import java.util.Set; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBTreePatternFormatIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoBasic.class}) +public class IoTDBTreePatternFormatIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testPrefixPattern() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeAutoConflictIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeAutoConflictIT.java index 65eb2458df77..65eb0d1ea140 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeAutoConflictIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,7 +27,8 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -44,8 +45,8 @@ import java.util.Set; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeAutoConflictIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class IoTDBPipeAutoConflictIT extends AbstractPipeDualTreeModelAutoIT { @Before public void setUp() { MultiEnvFactory.createEnv(2); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoDropIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeAutoDropIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoDropIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeAutoDropIT.java index adff5e5f53da..f1c3672e14a2 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoDropIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeAutoDropIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,7 +27,8 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -47,8 +48,8 @@ import static org.awaitility.Awaitility.await; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeAutoDropIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class IoTDBPipeAutoDropIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testAutoDropInHistoricalTransfer() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeClusterIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeClusterIT.java index ad8c86ea054c..ff827d6332b6 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeClusterIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.exception.ClientManagerException; @@ -34,8 +34,9 @@ import org.apache.iotdb.it.env.cluster.env.AbstractEnv; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; -import org.apache.iotdb.pipe.it.tablemodel.TableModelUtils; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.thrift.TException; @@ -59,8 +60,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeClusterIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class IoTDBPipeClusterIT extends AbstractPipeDualTreeModelAutoIT { @Override @Before diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConditionalOperationsIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeConditionalOperationsIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConditionalOperationsIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeConditionalOperationsIT.java index e6dfd37a307d..36a12d5bcd6e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConditionalOperationsIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeConditionalOperationsIT.java @@ -17,14 +17,15 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo; import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.junit.Assert; import org.junit.Test; @@ -39,8 +40,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeConditionalOperationsIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class IoTDBPipeConditionalOperationsIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testBasicCreatePipeIfNotExists() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorCompressionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeConnectorCompressionIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorCompressionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeConnectorCompressionIT.java index 2a2c83522715..37a542e6aa9f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorCompressionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeConnectorCompressionIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -30,7 +30,8 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -51,8 +52,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeConnectorCompressionIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class IoTDBPipeConnectorCompressionIT extends AbstractPipeDualTreeModelAutoIT { @Override @Before diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeIdempotentIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeIdempotentIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeIdempotentIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeIdempotentIT.java index cbe1ad065578..979fd60098c3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeIdempotentIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeIdempotentIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,9 +27,10 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; import org.apache.iotdb.itbase.env.BaseEnv; -import org.apache.iotdb.pipe.it.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -46,8 +47,8 @@ import java.util.Set; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeIdempotentIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class IoTDBPipeIdempotentIT extends AbstractPipeDualTreeModelAutoIT { @Override @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeNullValueIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeNullValueIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeNullValueIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeNullValueIT.java index 3231fc523aab..765104e1f523 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeNullValueIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeNullValueIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -26,7 +26,8 @@ import org.apache.iotdb.isession.ISession; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.TSStatusCode; @@ -51,8 +52,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeNullValueIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class IoTDBPipeNullValueIT extends AbstractPipeDualTreeModelAutoIT { // Test dimensions: // 1. is or not aligned diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTableManualIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeTableManualIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTableManualIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeTableManualIT.java index f375bd35e81b..866f51e58408 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTableManualIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeTableManualIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,9 +25,10 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; import org.apache.iotdb.itbase.env.BaseEnv; -import org.apache.iotdb.pipe.it.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.treemodel.manual.AbstractPipeDualTreeModelManualIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -42,8 +43,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeTableManualIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class IoTDBPipeTableManualIT extends AbstractPipeDualTreeModelManualIT { @Test public void testTableSync() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeWithLoadIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeWithLoadIT.java similarity index 93% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeWithLoadIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeWithLoadIT.java index 563377c927ea..0b929e4daf88 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeWithLoadIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeWithLoadIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,7 +27,8 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -42,8 +43,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class IoTDBPipeWithLoadIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class IoTDBPipeWithLoadIT extends AbstractPipeDualTreeModelAutoIT { @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/PipeNowFunctionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/PipeNowFunctionIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/PipeNowFunctionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/PipeNowFunctionIT.java index 6a2106b554d1..471a1e815948 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/PipeNowFunctionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/PipeNowFunctionIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.autocreate; +package org.apache.iotdb.pipe.it.dual.treemodel.auto.enhanced; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,8 +27,9 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoEnhanced; import org.apache.iotdb.itbase.env.BaseEnv; +import org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -46,8 +47,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2AutoCreateSchema.class}) -public class PipeNowFunctionIT extends AbstractPipeDualAutoIT { +@Category({MultiClusterIT2DualTreeAutoEnhanced.class}) +public class PipeNowFunctionIT extends AbstractPipeDualTreeModelAutoIT { @Test public void testPipeNowFunction() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/AbstractPipeDualManualIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/AbstractPipeDualTreeModelManualIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/AbstractPipeDualManualIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/AbstractPipeDualTreeModelManualIT.java index c93f80a513a4..581d363cdb5c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/AbstractPipeDualManualIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/AbstractPipeDualTreeModelManualIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.consensus.ConsensusFactory; @@ -34,7 +34,7 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -abstract class AbstractPipeDualManualIT { +public abstract class AbstractPipeDualTreeModelManualIT { protected BaseEnv senderEnv; protected BaseEnv receiverEnv; diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeInclusionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeInclusionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java index 76affe08850f..4bc4505c1b6f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeInclusionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,7 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -40,8 +40,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeInclusionIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipeInclusionIT extends AbstractPipeDualTreeModelManualIT { @Test public void testPureSchemaInclusion() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeManualConflictIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeManualConflictIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeManualConflictIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeManualConflictIT.java index dbb181092286..63bef4ff759c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeManualConflictIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeManualConflictIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,7 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -40,8 +40,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeManualConflictIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipeManualConflictIT extends AbstractPipeDualTreeModelManualIT { @Test public void testDoubleLivingTimeseries() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMetaHistoricalIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMetaHistoricalIT.java index 6c36de7b6966..c351aad274c4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMetaHistoricalIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -28,7 +28,7 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -44,8 +44,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeMetaHistoricalIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipeMetaHistoricalIT extends AbstractPipeDualTreeModelManualIT { @Override @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMetaLeaderChangeIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMetaLeaderChangeIT.java index c03f56bad4ee..00281253abb0 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMetaLeaderChangeIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,7 +27,7 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -41,8 +41,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeMetaLeaderChangeIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipeMetaLeaderChangeIT extends AbstractPipeDualTreeModelManualIT { @Override @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaRestartIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMetaRestartIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaRestartIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMetaRestartIT.java index 76cd4a90e8b8..ec9930d2642b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaRestartIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMetaRestartIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,7 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -38,8 +38,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeMetaRestartIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipeMetaRestartIT extends AbstractPipeDualTreeModelManualIT { @Test public void testAutoRestartSchemaTask() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMultiSchemaRegionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMultiSchemaRegionIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMultiSchemaRegionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMultiSchemaRegionIT.java index 769b940c78d2..8c210f64638d 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMultiSchemaRegionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeMultiSchemaRegionIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -25,7 +25,7 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -39,8 +39,8 @@ import java.util.Map; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeMultiSchemaRegionIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipeMultiSchemaRegionIT extends AbstractPipeDualTreeModelManualIT { @Test public void testMultiSchemaRegion() throws Exception { final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipePermissionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipePermissionIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipePermissionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipePermissionIT.java index 648899b13ea5..52320d52bd95 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipePermissionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipePermissionIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -27,7 +27,7 @@ import org.apache.iotdb.it.env.MultiEnvFactory; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert; @@ -46,8 +46,8 @@ import static org.junit.jupiter.api.Assertions.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipePermissionIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipePermissionIT extends AbstractPipeDualTreeModelManualIT { @Override @Before public void setUp() { diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeReqAutoSliceIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeReqAutoSliceIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeReqAutoSliceIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeReqAutoSliceIT.java index 953f1faec33c..55b5f72314da 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeReqAutoSliceIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeReqAutoSliceIT.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.commons.utils.function.CheckedTriConsumer; import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.isession.ISession; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; @@ -46,8 +46,8 @@ import java.util.Random; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeReqAutoSliceIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipeReqAutoSliceIT extends AbstractPipeDualTreeModelManualIT { private static final int generateDataSize = 10; @Override diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionISessionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionISessionIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionISessionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionISessionIT.java index b94aea2f2371..23168924aed1 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionISessionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionISessionIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.commons.utils.function.CheckedTriConsumer; import org.apache.iotdb.db.it.utils.TestUtils; @@ -25,7 +25,7 @@ import org.apache.iotdb.isession.ISession; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.itbase.env.BaseEnv; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.RpcUtils; @@ -62,8 +62,8 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeTypeConversionISessionIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipeTypeConversionISessionIT extends AbstractPipeDualTreeModelManualIT { private static final int generateDataSize = 100; @Test diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionIT.java rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionIT.java index f7cb595acbf0..e87bda0f361d 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionIT.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.pipe.it.manual; +package org.apache.iotdb.pipe.it.dual.treemodel.manual; import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.db.pipe.receiver.transform.converter.ValueConverter; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema; +import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeManual; import org.apache.iotdb.itbase.env.BaseEnv; import org.apache.iotdb.rpc.RpcUtils; @@ -46,8 +46,8 @@ import java.util.Set; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2ManualCreateSchema.class}) -public class IoTDBPipeTypeConversionIT extends AbstractPipeDualManualIT { +@Category({MultiClusterIT2DualTreeManual.class}) +public class IoTDBPipeTypeConversionIT extends AbstractPipeDualTreeModelManualIT { private static final int generateDataSize = 100; diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/IoTDBPipeOPCUAIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/IoTDBPipeOPCUAIT.java index 9b8388659771..591881369ed4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/IoTDBPipeOPCUAIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/IoTDBPipeOPCUAIT.java @@ -25,7 +25,7 @@ import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.MultiClusterIT1; import org.apache.iotdb.itbase.env.BaseEnv; -import org.apache.iotdb.pipe.it.tablemodel.TableModelUtils; +import org.apache.iotdb.pipe.it.dual.tablemodel.TableModelUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.junit.Assert;