This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch TableITAnnotation in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 30efa42ae37b0ee908cadb254b5ea155f51ab3c8 Author: JackieTien97 <[email protected]> AuthorDate: Fri Aug 16 14:47:03 2024 +0800 Split IT for Table model --- .github/workflows/table-cluster-it-1c1d.yml | 90 ++++++++++++++++++++++ .github/workflows/table-cluster-it-1c3d.yml | 68 ++++++++++++++++ integration-test/pom.xml | 28 +++++++ .../java/org/apache/iotdb/it/env/EnvFactory.java | 2 + .../main/java/org/apache/iotdb/it/env/EnvType.java | 3 +- .../category/TableClusterIT.java} | 15 +--- .../category/TableLocalStandaloneIT.java} | 15 +--- .../it/db/it/IoTDBExecuteBatchTableIT.java | 7 +- .../it/db/it/IoTDBFlushQueryTableIT.java | 6 +- .../it/db/it/IoTDBInsertAlignedValuesTableIT.java | 6 +- .../relational/it/db/it/IoTDBInsertTableIT.java | 7 +- .../it/db/it/IoTDBMultiDeviceTableIT.java | 6 +- .../relational/it/db/it/IoTDBRecoverTableIT.java | 6 +- .../it/db/it/IoTDBRecoverUnclosedTableIT.java | 6 +- .../relational/it/db/it/IoTDBRestartTableIT.java | 6 +- .../it/db/it/IoTDBSetConfigurationTableIT.java | 4 +- .../it/query/old/IoTDBDatetimeFormatTableIT.java | 6 +- .../it/query/old/IoTDBFilterBetweenTableIT.java | 6 +- .../it/query/old/IoTDBFilterNullTableIT.java | 6 +- .../it/query/old/IoTDBFilterTableIT.java | 5 +- .../it/query/old/IoTDBNestedQueryTableIT.java | 6 +- .../it/query/old/IoTDBSimpleQueryTableIT.java | 6 +- .../alignbydevice/IoTDBAlignByDeviceTable2IT.java | 6 +- .../alignbydevice/IoTDBAlignByDeviceTable3IT.java | 6 +- .../alignbydevice/IoTDBAlignByDeviceTableIT.java | 6 +- .../IoTDBAlignByDeviceWithTemplateTable2IT.java | 6 +- .../IoTDBAlignByDeviceWithTemplateTableIT.java | 6 +- ...TDBOrderByLimitOffsetAlignByDeviceTable2IT.java | 6 +- ...oTDBOrderByLimitOffsetAlignByDeviceTableIT.java | 6 +- .../IoTDBOrderByWithAlignByDeviceTable2IT.java | 6 +- .../IoTDBOrderByWithAlignByDeviceTable3IT.java | 6 +- .../IoTDBOrderByWithAlignByDeviceTableIT.java | 6 +- .../IoTDBAlignedOffsetLimitPushDownTableIT.java | 6 +- .../aligned/IoTDBAlignedSeriesQueryTable2IT.java | 6 +- .../aligned/IoTDBAlignedSeriesQueryTable3IT.java | 6 +- .../aligned/IoTDBAlignedSeriesQueryTable4IT.java | 6 +- .../aligned/IoTDBAlignedSeriesQueryTable5IT.java | 6 +- .../aligned/IoTDBAlignedSeriesQueryTableIT.java | 6 +- .../aligned/IoTDBPredicatePushDownTable2IT.java | 6 +- .../aligned/IoTDBPredicatePushDownTable3IT.java | 6 +- .../aligned/IoTDBPredicatePushDownTable4IT.java | 6 +- .../old/aligned/IoTDBPredicatePushDownTableIT.java | 6 +- .../scalar/IoTDBCastFunctionTableIT.java | 6 +- .../scalar/IoTDBDiffFunctionTable2IT.java | 6 +- .../scalar/IoTDBDiffFunctionTable3IT.java | 6 +- .../scalar/IoTDBDiffFunctionTableIT.java | 6 +- .../scalar/IoTDBReplaceFunctionTableIT.java | 6 +- .../scalar/IoTDBRoundFunctionTableIT.java | 6 +- .../scalar/IoTDBSubStringFunctionTableIT.java | 6 +- .../IoTDBMultiIDsWithAttributesTableIT.java | 6 +- .../it/query/old/orderBy/IoTDBOrderByTableIT.java | 6 +- .../it/query/old/query/IoTDBArithmeticTableIT.java | 6 +- .../query/old/query/IoTDBCaseWhenThenTableIT.java | 6 +- .../it/query/old/query/IoTDBFuzzyQueryTableIT.java | 6 +- .../it/query/old/query/IoTDBInTableIT.java | 6 +- ...oTDBNoSelectExpressionAfterAnalyzedTableIT.java | 6 +- .../query/old/query/IoTDBNullOperandTableIT.java | 6 +- .../query/old/query/IoTDBNullValueFillTableIT.java | 6 +- .../it/query/old/query/IoTDBPaginationTableIT.java | 6 +- .../it/query/old/query/IoTDBQueryDemoTableIT.java | 6 +- .../IoTDBQueryWithComplexValueFilterTableIT.java | 6 +- .../it/query/old/query/IoTDBResultSetTableIT.java | 6 +- .../query/IoTDBSelectCompareExpressionTableIT.java | 6 +- .../query/old/query/IoTDBSelectSchemaTableIT.java | 6 +- .../it/query/recent/IoTDBNullIdQueryIT.java | 6 +- .../relational/it/schema/IoTDBDatabaseIT.java | 6 +- .../relational/it/schema/IoTDBDeviceQueryIT.java | 6 +- .../iotdb/relational/it/schema/IoTDBTableIT.java | 6 +- .../it/session/IoTDBTableModelSessionIT.java | 6 +- .../session/pool/IoTDBTableModelSessionPoolIT.java | 6 +- 70 files changed, 382 insertions(+), 216 deletions(-) diff --git a/.github/workflows/table-cluster-it-1c1d.yml b/.github/workflows/table-cluster-it-1c1d.yml new file mode 100644 index 00000000000..6d94e7353f6 --- /dev/null +++ b/.github/workflows/table-cluster-it-1c1d.yml @@ -0,0 +1,90 @@ +name: Cluster IT - 1C1D + +on: + push: + branches: + - master + - 'rel/1.*' + - pipe-meta-sync + - 'rc/1.*' + paths-ignore: + - 'docs/**' + - 'site/**' + pull_request: + branches: + - master + - 'rel/1.*' + - pipe-meta-sync + - 'rc/1.*' + paths-ignore: + - 'docs/**' + - 'site/**' + # allow manually run the action: + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 + MAVEN_ARGS: --batch-mode --no-transfer-progress + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + +jobs: + Table_Simple: + strategy: + fail-fast: false + max-parallel: 15 + matrix: + os: [ ubuntu-latest, windows-latest ] + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: liberica + java-version: 17 + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2- + - name: Adjust network dynamic TCP ports range + if: ${{ runner.os == 'Windows' }} + shell: pwsh + run: | + netsh int ipv4 set dynamicport tcp start=32768 num=32768 + netsh int ipv4 set dynamicport udp start=32768 num=32768 + netsh int ipv6 set dynamicport tcp start=32768 num=32768 + netsh int ipv6 set dynamicport udp start=32768 num=32768 + - name: Adjust Linux kernel somaxconn + if: ${{ runner.os == 'Linux' }} + shell: bash + run: sudo sysctl -w net.core.somaxconn=65535 +# - name: Adjust Mac kernel somaxconn +# if: ${{ runner.os == 'macOS' }} +# shell: bash +# run: sudo sysctl -w kern.ipc.somaxconn=65535 + - name: IT/UT 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: | + mvn clean verify \ + -P with-integration-tests \ + -DskipUTs \ + -DintegrationTest.forkCount=2 \ + -pl integration-test \ + -am -PTableSimpleIT + - name: Upload Artifact + if: failure() + uses: actions/upload-artifact@v4 + with: + name: table-standalone-log-java${{ matrix.java }}-${{ runner.os }} + path: integration-test/target/cluster-logs + retention-days: 1 + diff --git a/.github/workflows/table-cluster-it-1c3d.yml b/.github/workflows/table-cluster-it-1c3d.yml new file mode 100644 index 00000000000..cfa0f372a20 --- /dev/null +++ b/.github/workflows/table-cluster-it-1c3d.yml @@ -0,0 +1,68 @@ +name: Cluster IT - 1C3D + +on: + push: + branches: + - master + - 'rel/1.*' + - pipe-meta-sync + - 'rc/1.*' + paths-ignore: + - 'docs/**' + - 'site/**' + pull_request: + branches: + - master + - 'rel/1.*' + - pipe-meta-sync + - 'rc/1.*' + paths-ignore: + - 'docs/**' + - 'site/**' + # allow manually run the action: + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 + MAVEN_ARGS: --batch-mode --no-transfer-progress + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + +jobs: + Simple: + strategy: + fail-fast: false + max-parallel: 20 + matrix: + java: [ 8, 11, 17 ] + runs-on: [self-hosted, iotdb] +# group: self-hosted +# labels: iotdb + steps: + - uses: actions/checkout@v4 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + distribution: liberica + java-version: ${{ matrix.java }} + - name: IT/UT 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: | + mvn clean verify \ + -P with-integration-tests \ + -DskipUTs \ + -DintegrationTest.forkCount=6 -DConfigNodeMaxHeapSize=1024 -DDataNodeMaxHeapSize=1024 \ + -pl integration-test \ + -am -PTableClusterIT + - name: Upload Artifact + if: failure() + uses: actions/upload-artifact@v4 + with: + name: table-cluster-log-java${{ matrix.java }}-${{ runner.os }} + path: integration-test/target/cluster-logs + retention-days: 1 diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 1a63f167905..e8d036beb56 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -520,5 +520,33 @@ <integrationTest.testEnv>Cluster1</integrationTest.testEnv> </properties> </profile> + <profile> + <id>TableSimpleIT</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <integrationTest.excludedGroups/> + <integrationTest.includedGroups>org.apache.iotdb.itbase.category.TableLocalStandaloneIT</integrationTest.includedGroups> + <integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM> + <integrationTest.randomSelectWriteNode>false</integrationTest.randomSelectWriteNode> + <integrationTest.readAndVerifyWithMultiNode>false</integrationTest.readAndVerifyWithMultiNode> + <integrationTest.testEnv>TABLE_SIMPLE</integrationTest.testEnv> + </properties> + </profile> + <profile> + <id>TableClusterIT</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <integrationTest.excludedGroups/> + <integrationTest.includedGroups>org.apache.iotdb.itbase.category.TableClusterIT</integrationTest.includedGroups> + <integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM> + <integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode> + <integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode> + <integrationTest.testEnv>TABLE_CLUSTER1</integrationTest.testEnv> + </properties> + </profile> </profiles> </project> diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java b/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java index 8ea62903e1f..054127da6f9 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java @@ -44,9 +44,11 @@ public class EnvFactory { EnvType envType = EnvType.getSystemEnvType(); switch (envType) { case Simple: + case TABLE_SIMPLE: env = new SimpleEnv(); break; case Cluster1: + case TABLE_CLUSTER1: env = new Cluster1Env(); break; case Remote: diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java b/integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java index 5be5da287c7..974af1fc22c 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java @@ -24,7 +24,8 @@ public enum EnvType { Simple, Cluster1, MultiCluster, - ; + TABLE_SIMPLE, + TABLE_CLUSTER1; public static EnvType getSystemEnvType() { String envValue = System.getProperty("TestEnv", Simple.name()); diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/TableClusterIT.java similarity index 75% copy from integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java copy to integration-test/src/main/java/org/apache/iotdb/itbase/category/TableClusterIT.java index 5be5da287c7..0ba2c4bafc8 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/TableClusterIT.java @@ -17,17 +17,6 @@ * under the License. */ -package org.apache.iotdb.it.env; +package org.apache.iotdb.itbase.category; -public enum EnvType { - Remote, - Simple, - Cluster1, - MultiCluster, - ; - - public static EnvType getSystemEnvType() { - String envValue = System.getProperty("TestEnv", Simple.name()); - return EnvType.valueOf(envValue); - } -} +public interface TableClusterIT {} diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/TableLocalStandaloneIT.java similarity index 75% copy from integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java copy to integration-test/src/main/java/org/apache/iotdb/itbase/category/TableLocalStandaloneIT.java index 5be5da287c7..c6b39ad0dd5 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvType.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/TableLocalStandaloneIT.java @@ -17,17 +17,6 @@ * under the License. */ -package org.apache.iotdb.it.env; +package org.apache.iotdb.itbase.category; -public enum EnvType { - Remote, - Simple, - Cluster1, - MultiCluster, - ; - - public static EnvType getSystemEnvType() { - String envValue = System.getProperty("TestEnv", Simple.name()); - return EnvType.valueOf(envValue); - } -} +public interface TableLocalStandaloneIT {} diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBExecuteBatchTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBExecuteBatchTableIT.java index 51960ba76b6..98506fb8cd0 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBExecuteBatchTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBExecuteBatchTableIT.java @@ -20,9 +20,8 @@ package org.apache.iotdb.relational.it.db.it; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; -import org.apache.iotdb.itbase.category.RemoteIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.After; import org.junit.Before; @@ -41,7 +40,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class, RemoteIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) @Ignore // 'Drop Table' and 'Alter table' is not supported public class IoTDBExecuteBatchTableIT { @Before diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBFlushQueryTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBFlushQueryTableIT.java index 584fad84965..d69fbd9892f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBFlushQueryTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBFlushQueryTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.db.it; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBFlushQueryTableIT { private static String[] sqls = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertAlignedValuesTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertAlignedValuesTableIT.java index 6bd12b8eeb5..ad658b91a00 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertAlignedValuesTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertAlignedValuesTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.db.it; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBInsertAlignedValuesTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java index 1908b36f80f..a9983494dce 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java @@ -23,9 +23,8 @@ import org.apache.iotdb.isession.ISession; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; -import org.apache.iotdb.itbase.category.RemoteIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.apache.iotdb.rpc.TSStatusCode; @@ -63,7 +62,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class, RemoteIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBInsertTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiDeviceTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiDeviceTableIT.java index b034a2de087..02f71129f3f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiDeviceTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiDeviceTableIT.java @@ -20,8 +20,8 @@ package org.apache.iotdb.relational.it.db.it; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -46,7 +46,7 @@ import static org.junit.Assert.fail; * IoTDB server should be defined as integration test. */ @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBMultiDeviceTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRecoverTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRecoverTableIT.java index fc9133ad852..881027d3947 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRecoverTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRecoverTableIT.java @@ -22,8 +22,8 @@ package org.apache.iotdb.relational.it.db.it; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.env.cluster.env.AbstractEnv; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.After; @@ -49,7 +49,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) @Ignore // aggregation public class IoTDBRecoverTableIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRecoverUnclosedTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRecoverUnclosedTableIT.java index aa4acae1ce3..033f0e53d70 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRecoverUnclosedTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRecoverUnclosedTableIT.java @@ -22,8 +22,8 @@ package org.apache.iotdb.relational.it.db.it; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.env.cluster.env.AbstractEnv; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.After; @@ -51,7 +51,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) @Ignore // aggregation public class IoTDBRecoverUnclosedTableIT { private static final Logger logger = LoggerFactory.getLogger(IoTDBRecoverUnclosedTableIT.class); diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRestartTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRestartTableIT.java index dc7b6e4608d..9a0f8725fb6 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRestartTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRestartTableIT.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.After; @@ -48,7 +48,7 @@ import static org.junit.Assert.fail; @Ignore @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBRestartTableIT { private final Logger logger = LoggerFactory.getLogger(IoTDBRestartTableIT.class); diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBSetConfigurationTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBSetConfigurationTableIT.java index 0f5d10c1b88..92cde92d288 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBSetConfigurationTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBSetConfigurationTableIT.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.env.cluster.node.AbstractNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -41,7 +41,7 @@ import java.sql.Statement; import java.util.Arrays; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class}) +@Category({TableLocalStandaloneIT.class}) public class IoTDBSetConfigurationTableIT { @BeforeClass public static void setUp() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBDatetimeFormatTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBDatetimeFormatTableIT.java index b5cbabd5700..b7ff60e40b4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBDatetimeFormatTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBDatetimeFormatTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -40,7 +40,7 @@ import java.sql.Statement; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBDatetimeFormatTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterBetweenTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterBetweenTableIT.java index 2c8f085c424..5c21a3ccb55 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterBetweenTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterBetweenTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -44,7 +44,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBFilterBetweenTableIT { protected static final int ITERATION_TIMES = 10; private static final String DATABASE_NAME = "test"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterNullTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterNullTableIT.java index 64ccec89a71..2f93773d676 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterNullTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterNullTableIT.java @@ -20,8 +20,8 @@ package org.apache.iotdb.relational.it.query.old; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBFilterNullTableIT { private static final String DATABASE_NAME = "test"; private static final String[] createSqls = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterTableIT.java index 57ee78c3465..e2536adcba0 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBFilterTableIT.java @@ -21,7 +21,8 @@ package org.apache.iotdb.relational.it.query.old; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -43,7 +44,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBFilterTableIT { protected static final int ITERATION_TIMES = 10; private static final String DATABASE_NAME = "test"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBNestedQueryTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBNestedQueryTableIT.java index d2bc1f172c0..8c0127e5f3b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBNestedQueryTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBNestedQueryTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBNestedQueryTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBSimpleQueryTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBSimpleQueryTableIT.java index d253bdbeabc..92a174d1a82 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBSimpleQueryTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBSimpleQueryTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old; import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import com.google.common.collect.ImmutableSet; @@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBSimpleQueryTableIT { private static final String DATABASE_NAME = "test"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable2IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable2IT.java index ea22855e248..c994d5807e1 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable2IT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignByDeviceTable2IT extends IoTDBAlignByDeviceTableIT { @BeforeClass public static void setUp() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable3IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable3IT.java index cd60f5e8dd7..afae14ad746 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable3IT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignByDeviceTable3IT extends IoTDBAlignByDeviceTableIT { @BeforeClass public static void setUp() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTableIT.java index f09183f5032..3d52c616d72 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -38,7 +38,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignByDeviceTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateTable2IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateTable2IT.java index 33f3ed9f62f..a78b1e35780 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateTable2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateTable2IT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignByDeviceWithTemplateTable2IT extends IoTDBAlignByDeviceWithTemplateTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateTableIT.java index 71c5220a1fe..7e058e422ee 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateTableIT.java @@ -20,8 +20,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignByDeviceWithTemplateTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTable2IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTable2IT.java index d1e858e1d7f..a1998362310 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTable2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTable2IT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBOrderByLimitOffsetAlignByDeviceTable2IT extends IoTDBOrderByLimitOffsetAlignByDeviceTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTableIT.java index 5583dfe8d82..462cff58ef5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -37,7 +37,7 @@ import java.sql.Statement; import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBOrderByLimitOffsetAlignByDeviceTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable2IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable2IT.java index d0e4219d2fb..0c75ced0809 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable2IT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBOrderByWithAlignByDeviceTable2IT extends IoTDBOrderByWithAlignByDeviceTableIT { @BeforeClass public static void setUp() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable3IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable3IT.java index 282ba80b165..940712448aa 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable3IT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBOrderByWithAlignByDeviceTable3IT extends IoTDBOrderByWithAlignByDeviceTableIT { @BeforeClass public static void setUp() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTableIT.java index 5f988358b58..a50aa772066 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.alignbydevice; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.apache.iotdb.rpc.RpcUtils; @@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBOrderByWithAlignByDeviceTableIT { protected static final String DATABASE_NAME = "db"; protected static final String[] places = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedOffsetLimitPushDownTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedOffsetLimitPushDownTableIT.java index fc344846b0f..d58f4bc1412 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedOffsetLimitPushDownTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedOffsetLimitPushDownTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -43,7 +43,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignedOffsetLimitPushDownTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable2IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable2IT.java index 4855767c868..dc70ac41941 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable2IT.java @@ -20,8 +20,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignedSeriesQueryTable2IT extends IoTDBAlignedSeriesQueryTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable3IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable3IT.java index 6e08514eba3..dcaa4b9638f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable3IT.java @@ -20,8 +20,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignedSeriesQueryTable3IT extends IoTDBAlignedSeriesQueryTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable4IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable4IT.java index 59374ddfaa4..349e71795b5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable4IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable4IT.java @@ -20,8 +20,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignedSeriesQueryTable4IT extends IoTDBAlignedSeriesQueryTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable5IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable5IT.java index 560aad5b404..916934a0a0b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable5IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable5IT.java @@ -20,8 +20,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignedSeriesQueryTable5IT extends IoTDBAlignedSeriesQueryTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTableIT.java index 3d9c3e43fec..f2868fd576c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.Assert; @@ -56,7 +56,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBAlignedSeriesQueryTableIT { private static final double DELTA = 1e-6; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable2IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable2IT.java index 3b0a379d9f3..bf16fe3bd40 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable2IT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBPredicatePushDownTable2IT extends IoTDBPredicatePushDownTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable3IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable3IT.java index 72d786abf6d..ef8d81479bb 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable3IT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBPredicatePushDownTable3IT extends IoTDBPredicatePushDownTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable4IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable4IT.java index 590f0233625..e2f215f3a97 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable4IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable4IT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBPredicatePushDownTable4IT extends IoTDBPredicatePushDownTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTableIT.java index f1f58cd41e5..33baa557d43 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.aligned; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -34,7 +34,7 @@ import org.junit.runner.RunWith; import static org.apache.iotdb.relational.it.query.old.aligned.TableUtils.tableResultSetEqualTest; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBPredicatePushDownTableIT { private final String database = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java index f9d7e675393..c390fd33f92 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -40,7 +40,7 @@ import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBCastFunctionTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable2IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable2IT.java index 1443d1a8c0d..9976d83055e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable2IT.java @@ -21,15 +21,15 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBDiffFunctionTable2IT extends IoTDBDiffFunctionTableIT { @BeforeClass public static void setUp() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable3IT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable3IT.java index 8819fbbb217..1f8278fef31 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable3IT.java @@ -21,15 +21,15 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBDiffFunctionTable3IT extends IoTDBDiffFunctionTableIT { @BeforeClass public static void setUp() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTableIT.java index bc0cc0ce00d..59af06c3e92 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -37,7 +37,7 @@ import java.sql.Statement; import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBDiffFunctionTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBReplaceFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBReplaceFunctionTableIT.java index d44636febf4..79b8b653774 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBReplaceFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBReplaceFunctionTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -40,7 +40,7 @@ import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBReplaceFunctionTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBRoundFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBRoundFunctionTableIT.java index 7b5d658b303..c90e2659d63 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBRoundFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBRoundFunctionTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.apache.iotdb.rpc.TSStatusCode; @@ -40,7 +40,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBRoundFunctionTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBSubStringFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBSubStringFunctionTableIT.java index d2f5a081f0c..1ea049ebfd7 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBSubStringFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBSubStringFunctionTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.apache.iotdb.rpc.TSStatusCode; @@ -39,7 +39,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.tableAssertTestFail; import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBSubStringFunctionTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBMultiIDsWithAttributesTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBMultiIDsWithAttributesTableIT.java index c2528c32193..aee3ff0ab2b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBMultiIDsWithAttributesTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBMultiIDsWithAttributesTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.orderBy; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -38,7 +38,7 @@ import static org.junit.Assert.fail; /** In this IT, table has more than one IDs and Attributes. */ @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBMultiIDsWithAttributesTableIT { private static final String DATABASE_NAME = "db"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBOrderByTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBOrderByTableIT.java index 5d9dcc43ee4..91ff9309c82 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBOrderByTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBOrderByTableIT.java @@ -22,8 +22,8 @@ package org.apache.iotdb.relational.it.query.old.orderBy; import org.apache.iotdb.isession.ISession; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.commons.lang3.ArrayUtils; import org.apache.tsfile.enums.TSDataType; @@ -55,7 +55,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBOrderByTableIT { // the data can be viewed in diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java index ab47aa3e6a1..27304ad2ada 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBArithmeticTableIT { private static final double E = 0.0001; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBCaseWhenThenTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBCaseWhenThenTableIT.java index bce02fea0bd..d639837a043 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBCaseWhenThenTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBCaseWhenThenTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -42,7 +42,7 @@ import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR; @Ignore // TODO in V2 @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBCaseWhenThenTableIT { private static final String[] SQLs = new String[] { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBFuzzyQueryTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBFuzzyQueryTableIT.java index 731d8ee042e..b6d807a2cf8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBFuzzyQueryTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBFuzzyQueryTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.Assert; @@ -47,7 +47,7 @@ import static org.junit.Assert.fail; @Ignore // TODO in V2 @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBFuzzyQueryTableIT { private static List<String> sqls = new ArrayList<>(); diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBInTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBInTableIT.java index 36e05aa9384..9a4a5a144f5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBInTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBInTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.apache.iotdb.rpc.TSStatusCode; @@ -50,7 +50,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.tableAssertTestFail; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBInTableIT { private static final String DATABASE_NAME = "test"; private static String[] sqls = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNoSelectExpressionAfterAnalyzedTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNoSelectExpressionAfterAnalyzedTableIT.java index bcab979e5a2..2d7ee87f210 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNoSelectExpressionAfterAnalyzedTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNoSelectExpressionAfterAnalyzedTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -35,7 +35,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.tableAssertTestFail; import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBNoSelectExpressionAfterAnalyzedTableIT { private static final String DATABASE_NAME = "test"; private static final String[] SQLs = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNullOperandTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNullOperandTableIT.java index 60487b6c998..3db69f899c9 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNullOperandTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNullOperandTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -36,7 +36,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBNullOperandTableIT { private static final String DATABASE_NAME = "test"; private static final String[] SQLs = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNullValueFillTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNullValueFillTableIT.java index 9763dfa4875..a7ba0315d52 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNullValueFillTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBNullValueFillTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -37,7 +37,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.resultSetEqualWithDescOrder @Ignore @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBNullValueFillTableIT { private static final String DATABASE_NAME = "test"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBPaginationTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBPaginationTableIT.java index 82a969c6621..17dcab059b3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBPaginationTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBPaginationTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -38,7 +38,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBPaginationTableIT { private static final String DATABASE_NAME = "test"; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBQueryDemoTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBQueryDemoTableIT.java index f9269ed24ee..e65ad99bb14 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBQueryDemoTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBQueryDemoTableIT.java @@ -20,8 +20,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -48,7 +48,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBQueryDemoTableIT { private static final String DATABASE_NAME = "test"; private static String[] sqls = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBQueryWithComplexValueFilterTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBQueryWithComplexValueFilterTableIT.java index a62a5cc4244..292d4f14d41 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBQueryWithComplexValueFilterTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBQueryWithComplexValueFilterTableIT.java @@ -20,8 +20,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -39,7 +39,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBQueryWithComplexValueFilterTableIT { private static final String DATABASE_NAME = "test"; private static final String[] SQLs = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBResultSetTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBResultSetTableIT.java index a462c02b1ae..9fbc4da1950 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBResultSetTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBResultSetTableIT.java @@ -22,8 +22,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -49,7 +49,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBResultSetTableIT { private static final String DATABASE_NAME = "test"; private static final String[] SQLs = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBSelectCompareExpressionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBSelectCompareExpressionTableIT.java index 23d5d8713a0..75b1f404415 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBSelectCompareExpressionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBSelectCompareExpressionTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBSelectCompareExpressionTableIT { private static final String DATABASE_NAME = "test"; private static String[] INSERTION_SQLS; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBSelectSchemaTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBSelectSchemaTableIT.java index fc00fe5114a..aee30ec1de2 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBSelectSchemaTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBSelectSchemaTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.old.query; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBSelectSchemaTableIT { private static final String DATABASE_NAME = "test"; private static String[] SQLS = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBNullIdQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBNullIdQueryIT.java index 19370bb947d..b741f8f7b68 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBNullIdQueryIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBNullIdQueryIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.query.recent; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBNullIdQueryIT { private static final String DATABASE_NAME = "test"; private static final String[] createSqls = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java index c6bb263dc5d..9ba931c43e5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.schema; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBDatabaseIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDeviceQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDeviceQueryIT.java index ee25eeccd75..02348a76dc5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDeviceQueryIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDeviceQueryIT.java @@ -22,8 +22,8 @@ package org.apache.iotdb.relational.it.schema; import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBDeviceQueryIT { @BeforeClass public static void setUp() throws Exception { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java index 982b056d981..1bcde880efc 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java @@ -21,8 +21,8 @@ package org.apache.iotdb.relational.it.schema; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.itbase.env.BaseEnv; import org.junit.AfterClass; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBTableIT { @BeforeClass diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBTableModelSessionIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBTableModelSessionIT.java index ccd7042f802..eb64a57bde5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBTableModelSessionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBTableModelSessionIT.java @@ -23,8 +23,8 @@ import org.apache.iotdb.isession.ISession; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBTableModelSessionIT { @Before diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBTableModelSessionPoolIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBTableModelSessionPoolIT.java index 314a1f2df8c..7e5590010c4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBTableModelSessionPoolIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBTableModelSessionPoolIT.java @@ -24,8 +24,8 @@ import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.isession.pool.ISessionPool; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.ClusterIT; -import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.itbase.category.TableClusterIT; +import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; @@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({LocalStandaloneIT.class, ClusterIT.class}) +@Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBTableModelSessionPoolIT { @Before
