This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch EnhancedDeviceCrossRegionIT in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6c6b3c0f94739ae44b97ed6f694c3da8adbf7e98 Author: JackieTien97 <[email protected]> AuthorDate: Mon Sep 1 19:23:18 2025 +0800 Add IT for one device cross different regions --- .../partition/IoTDBPartitionShuffleStrategyIT.java | 4 ++-- .../it/IoTDBPatternAggregation2IT.java} | 26 ++++++++------------- .../it/db/it/IoTDBPatternAggregationIT.java | 6 ++--- .../it/IoTDBPatternRecognition2IT.java} | 27 ++++++++-------------- .../it/db/it/IoTDBPatternRecognitionIT.java | 6 ++--- .../it/IoTDBWindowFunction2IT.java} | 26 ++++++++------------- .../relational/it/db/it/IoTDBWindowFunctionIT.java | 6 ++--- .../it/IoTDBWindowTVF2IT.java} | 27 ++++++++-------------- .../relational/it/db/it/IoTDBWindowTVFIT.java | 2 +- ...tionNonStreamIT.java => IoTDBFillTable2IT.java} | 21 ++++++----------- .../it/query/recent/IoTDBFillTableIT.java | 6 ++--- ...nNonStreamIT.java => IoTDBGapFillTable2IT.java} | 20 ++++++---------- .../it/query/recent/IoTDBGapFillTableIT.java | 6 ++--- ...StreamIT.java => IoTDBTableAggregation2IT.java} | 18 +++++---------- ...java => IoTDBTableAggregationNonStream2IT.java} | 12 +++++----- .../recent/IoTDBTableAggregationNonStreamIT.java | 7 ++---- 16 files changed, 82 insertions(+), 138 deletions(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionShuffleStrategyIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionShuffleStrategyIT.java index 70f170caa11..1294c911d6b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionShuffleStrategyIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionShuffleStrategyIT.java @@ -53,7 +53,7 @@ public class IoTDBPartitionShuffleStrategyIT { private static final String testDataRegionConsensusProtocolClass = ConsensusFactory.RATIS_CONSENSUS; private static final int testReplicationFactor = 1; - private static final String testDataPartitionAllocationStrategy = "SHUFFLE"; + public static final String SHUFFLE = "SHUFFLE"; private static final int testSeriesSlotNum = 1000; private static final long testTimePartitionInterval = 604800000; private static final double testDataRegionPerDataNode = 5.0; @@ -70,7 +70,7 @@ public class IoTDBPartitionShuffleStrategyIT { .setDataReplicationFactor(testReplicationFactor) .setTimePartitionInterval(testTimePartitionInterval) .setSeriesSlotNum(testSeriesSlotNum) - .setDataPartitionAllocationStrategy(testDataPartitionAllocationStrategy) + .setDataPartitionAllocationStrategy(SHUFFLE) .setDataRegionPerDataNode(testDataRegionPerDataNode); // Init 1C1D environment diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternAggregation2IT.java similarity index 55% copy from integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java copy to integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternAggregation2IT.java index 5a402b81ff7..7d89c434c79 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternAggregation2IT.java @@ -17,40 +17,32 @@ * under the License. */ -package org.apache.iotdb.relational.it.query.recent; +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.TableClusterIT; import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; +import static org.apache.iotdb.confignode.it.partition.IoTDBPartitionShuffleStrategyIT.SHUFFLE; -@RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) -public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { +public class IoTDBPatternAggregation2IT extends IoTDBPatternAggregationIT { @BeforeClass - public static void setUp() throws Exception { - EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); - EnvFactory.getEnv().getConfig().getCommonConfig().setMaxTsBlockSizeInByte(4 * 1024); + public static void setUp() { + EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(1024 * 1024); + EnvFactory.getEnv().getConfig().getCommonConfig().setTimePartitionInterval(60_000); + EnvFactory.getEnv().getConfig().getCommonConfig().setDataPartitionAllocationStrategy(SHUFFLE); EnvFactory.getEnv().initClusterEnvironment(); - String original = createSqls[2]; - // make 'province', 'city', 'region' be FIELD to cover cases using GroupedAccumulator - createSqls[2] = - "CREATE TABLE table1(province STRING FIELD, city STRING FIELD, region STRING FIELD, device_id STRING TAG, color STRING ATTRIBUTE, type STRING ATTRIBUTE, s1 INT32 FIELD, s2 INT64 FIELD, s3 FLOAT FIELD, s4 DOUBLE FIELD, s5 BOOLEAN FIELD, s6 TEXT FIELD, s7 STRING FIELD, s8 BLOB FIELD, s9 TIMESTAMP FIELD, s10 DATE FIELD)"; - prepareTableData(createSqls); - // rollback original content - createSqls[2] = original; + insertData(); } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternAggregationIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternAggregationIT.java index 772002a93d8..6e543f64cff 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternAggregationIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternAggregationIT.java @@ -95,7 +95,7 @@ public class IoTDBPatternAggregationIT { "INSERT INTO t3 VALUES (2025-01-01T00:05:00, -8)", }; - private static void insertData() { + protected static void insertData() { try (Connection connection = EnvFactory.getEnv().getTableConnection(); Statement statement = connection.createStatement()) { for (String sql : sqls) { @@ -107,13 +107,13 @@ public class IoTDBPatternAggregationIT { } @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { EnvFactory.getEnv().initClusterEnvironment(); insertData(); } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternRecognition2IT.java similarity index 55% copy from integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java copy to integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternRecognition2IT.java index 5a402b81ff7..881c21d8268 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternRecognition2IT.java @@ -17,40 +17,31 @@ * under the License. */ -package org.apache.iotdb.relational.it.query.recent; +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.TableClusterIT; import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; +import static org.apache.iotdb.confignode.it.partition.IoTDBPartitionShuffleStrategyIT.SHUFFLE; -@RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) -public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { - +public class IoTDBPatternRecognition2IT extends IoTDBPatternRecognitionIT { @BeforeClass - public static void setUp() throws Exception { - EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); - EnvFactory.getEnv().getConfig().getCommonConfig().setMaxTsBlockSizeInByte(4 * 1024); + public static void setUp() { + EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(1024 * 1024); + EnvFactory.getEnv().getConfig().getCommonConfig().setTimePartitionInterval(60_000); + EnvFactory.getEnv().getConfig().getCommonConfig().setDataPartitionAllocationStrategy(SHUFFLE); EnvFactory.getEnv().initClusterEnvironment(); - String original = createSqls[2]; - // make 'province', 'city', 'region' be FIELD to cover cases using GroupedAccumulator - createSqls[2] = - "CREATE TABLE table1(province STRING FIELD, city STRING FIELD, region STRING FIELD, device_id STRING TAG, color STRING ATTRIBUTE, type STRING ATTRIBUTE, s1 INT32 FIELD, s2 INT64 FIELD, s3 FLOAT FIELD, s4 DOUBLE FIELD, s5 BOOLEAN FIELD, s6 TEXT FIELD, s7 STRING FIELD, s8 BLOB FIELD, s9 TIMESTAMP FIELD, s10 DATE FIELD)"; - prepareTableData(createSqls); - // rollback original content - createSqls[2] = original; + insertData(); } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternRecognitionIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternRecognitionIT.java index 1ffa93cfa42..f645d015a65 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternRecognitionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBPatternRecognitionIT.java @@ -103,7 +103,7 @@ public class IoTDBPatternRecognitionIT { "INSERT INTO t5 VALUES (2025-01-01T00:01:00, 'p1', 1, 10.0)", }; - private static void insertData() { + protected static void insertData() { try (Connection connection = EnvFactory.getEnv().getTableConnection(); Statement statement = connection.createStatement()) { for (String sql : sqls) { @@ -115,13 +115,13 @@ public class IoTDBPatternRecognitionIT { } @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { EnvFactory.getEnv().initClusterEnvironment(); insertData(); } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowFunction2IT.java similarity index 55% copy from integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java copy to integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowFunction2IT.java index 5a402b81ff7..b520e81c76d 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowFunction2IT.java @@ -17,40 +17,32 @@ * under the License. */ -package org.apache.iotdb.relational.it.query.recent; +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.TableClusterIT; import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; +import static org.apache.iotdb.confignode.it.partition.IoTDBPartitionShuffleStrategyIT.SHUFFLE; -@RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) -public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { +public class IoTDBWindowFunction2IT extends IoTDBWindowFunctionIT { @BeforeClass - public static void setUp() throws Exception { - EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); - EnvFactory.getEnv().getConfig().getCommonConfig().setMaxTsBlockSizeInByte(4 * 1024); + public static void setUp() { + EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(1024 * 1024); + EnvFactory.getEnv().getConfig().getCommonConfig().setTimePartitionInterval(60_000); + EnvFactory.getEnv().getConfig().getCommonConfig().setDataPartitionAllocationStrategy(SHUFFLE); EnvFactory.getEnv().initClusterEnvironment(); - String original = createSqls[2]; - // make 'province', 'city', 'region' be FIELD to cover cases using GroupedAccumulator - createSqls[2] = - "CREATE TABLE table1(province STRING FIELD, city STRING FIELD, region STRING FIELD, device_id STRING TAG, color STRING ATTRIBUTE, type STRING ATTRIBUTE, s1 INT32 FIELD, s2 INT64 FIELD, s3 FLOAT FIELD, s4 DOUBLE FIELD, s5 BOOLEAN FIELD, s6 TEXT FIELD, s7 STRING FIELD, s8 BLOB FIELD, s9 TIMESTAMP FIELD, s10 DATE FIELD)"; - prepareTableData(createSqls); - // rollback original content - createSqls[2] = original; + insertData(); } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowFunctionIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowFunctionIT.java index c3ddf198366..dc19bcd5d7c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowFunctionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowFunctionIT.java @@ -88,7 +88,7 @@ public class IoTDBWindowFunctionIT { "CLEAR ATTRIBUTE CACHE", }; - private static void insertData() { + protected static void insertData() { try (Connection connection = EnvFactory.getEnv().getTableConnection(); Statement statement = connection.createStatement()) { for (String sql : sqlsWithoutNulls) { @@ -106,14 +106,14 @@ public class IoTDBWindowFunctionIT { } @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(1024 * 1024); EnvFactory.getEnv().initClusterEnvironment(); insertData(); } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowTVF2IT.java similarity index 55% copy from integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java copy to integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowTVF2IT.java index 5a402b81ff7..65fa9e9bdd8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowTVF2IT.java @@ -17,40 +17,31 @@ * under the License. */ -package org.apache.iotdb.relational.it.query.recent; +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.TableClusterIT; import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; +import static org.apache.iotdb.confignode.it.partition.IoTDBPartitionShuffleStrategyIT.SHUFFLE; -@RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) -public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { - +public class IoTDBWindowTVF2IT extends IoTDBWindowTVFIT { @BeforeClass - public static void setUp() throws Exception { - EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); - EnvFactory.getEnv().getConfig().getCommonConfig().setMaxTsBlockSizeInByte(4 * 1024); + public static void setUp() { + EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(512 * 1024); + EnvFactory.getEnv().getConfig().getCommonConfig().setTimePartitionInterval(60_000); + EnvFactory.getEnv().getConfig().getCommonConfig().setDataPartitionAllocationStrategy(SHUFFLE); EnvFactory.getEnv().initClusterEnvironment(); - String original = createSqls[2]; - // make 'province', 'city', 'region' be FIELD to cover cases using GroupedAccumulator - createSqls[2] = - "CREATE TABLE table1(province STRING FIELD, city STRING FIELD, region STRING FIELD, device_id STRING TAG, color STRING ATTRIBUTE, type STRING ATTRIBUTE, s1 INT32 FIELD, s2 INT64 FIELD, s3 FLOAT FIELD, s4 DOUBLE FIELD, s5 BOOLEAN FIELD, s6 TEXT FIELD, s7 STRING FIELD, s8 BLOB FIELD, s9 TIMESTAMP FIELD, s10 DATE FIELD)"; - prepareTableData(createSqls); - // rollback original content - createSqls[2] = original; + insertData(); } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowTVFIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowTVFIT.java index 702a29df544..24b1c16320c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowTVFIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowTVFIT.java @@ -66,7 +66,7 @@ public class IoTDBWindowTVFIT { "CLEAR ATTRIBUTE CACHE", }; - private static void insertData() { + protected static void insertData() { try (Connection connection = EnvFactory.getEnv().getTableConnection(); Statement statement = connection.createStatement()) { for (String sql : sqls) { diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBFillTable2IT.java similarity index 58% copy from integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java copy to integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBFillTable2IT.java index 5a402b81ff7..bbe15bf97da 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBFillTable2IT.java @@ -20,37 +20,30 @@ 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.TableClusterIT; import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; +import static org.apache.iotdb.confignode.it.partition.IoTDBPartitionShuffleStrategyIT.SHUFFLE; import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; -@RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) -public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { +public class IoTDBFillTable2IT extends IoTDBFillTableIT { @BeforeClass - public static void setUp() throws Exception { - EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); - EnvFactory.getEnv().getConfig().getCommonConfig().setMaxTsBlockSizeInByte(4 * 1024); + public static void setUp() { + EnvFactory.getEnv().getConfig().getCommonConfig().setEnableCrossSpaceCompaction(false); + EnvFactory.getEnv().getConfig().getCommonConfig().setTimePartitionInterval(3_600_000); // 1ms + EnvFactory.getEnv().getConfig().getCommonConfig().setDataPartitionAllocationStrategy(SHUFFLE); EnvFactory.getEnv().initClusterEnvironment(); - String original = createSqls[2]; - // make 'province', 'city', 'region' be FIELD to cover cases using GroupedAccumulator - createSqls[2] = - "CREATE TABLE table1(province STRING FIELD, city STRING FIELD, region STRING FIELD, device_id STRING TAG, color STRING ATTRIBUTE, type STRING ATTRIBUTE, s1 INT32 FIELD, s2 INT64 FIELD, s3 FLOAT FIELD, s4 DOUBLE FIELD, s5 BOOLEAN FIELD, s6 TEXT FIELD, s7 STRING FIELD, s8 BLOB FIELD, s9 TIMESTAMP FIELD, s10 DATE FIELD)"; prepareTableData(createSqls); - // rollback original content - createSqls[2] = original; } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBFillTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBFillTableIT.java index 3884b1f2be1..9ec97c48768 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBFillTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBFillTableIT.java @@ -39,7 +39,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBFillTableIT { private static final String DATABASE_NAME = "test"; - private static final String[] createSqls = + protected static final String[] createSqls = new String[] { "CREATE DATABASE " + DATABASE_NAME, "USE " + DATABASE_NAME, @@ -84,14 +84,14 @@ public class IoTDBFillTableIT { }; @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { EnvFactory.getEnv().getConfig().getCommonConfig().setEnableCrossSpaceCompaction(false); EnvFactory.getEnv().initClusterEnvironment(); prepareTableData(createSqls); } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBGapFillTable2IT.java similarity index 62% copy from integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java copy to integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBGapFillTable2IT.java index 5a402b81ff7..b69b442cd6e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBGapFillTable2IT.java @@ -20,37 +20,31 @@ 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.TableClusterIT; import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; +import static org.apache.iotdb.confignode.it.partition.IoTDBPartitionShuffleStrategyIT.SHUFFLE; import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; -@RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) -public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { +public class IoTDBGapFillTable2IT extends IoTDBGapFillTableIT { @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); - EnvFactory.getEnv().getConfig().getCommonConfig().setMaxTsBlockSizeInByte(4 * 1024); + EnvFactory.getEnv().getConfig().getCommonConfig().setEnableCrossSpaceCompaction(false); + EnvFactory.getEnv().getConfig().getCommonConfig().setTimePartitionInterval(3_600_000); // 1h + EnvFactory.getEnv().getConfig().getCommonConfig().setDataPartitionAllocationStrategy(SHUFFLE); EnvFactory.getEnv().initClusterEnvironment(); - String original = createSqls[2]; - // make 'province', 'city', 'region' be FIELD to cover cases using GroupedAccumulator - createSqls[2] = - "CREATE TABLE table1(province STRING FIELD, city STRING FIELD, region STRING FIELD, device_id STRING TAG, color STRING ATTRIBUTE, type STRING ATTRIBUTE, s1 INT32 FIELD, s2 INT64 FIELD, s3 FLOAT FIELD, s4 DOUBLE FIELD, s5 BOOLEAN FIELD, s6 TEXT FIELD, s7 STRING FIELD, s8 BLOB FIELD, s9 TIMESTAMP FIELD, s10 DATE FIELD)"; prepareTableData(createSqls); - // rollback original content - createSqls[2] = original; } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBGapFillTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBGapFillTableIT.java index 3c8a6f3af80..1bc7382ea76 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBGapFillTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBGapFillTableIT.java @@ -39,7 +39,7 @@ import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBGapFillTableIT { private static final String DATABASE_NAME = "test"; - private static final String[] createSqls = + protected static final String[] createSqls = new String[] { "CREATE DATABASE " + DATABASE_NAME, "USE " + DATABASE_NAME, @@ -61,7 +61,7 @@ public class IoTDBGapFillTableIT { + ": could not infer startTime or endTime from WHERE clause"; @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); EnvFactory.getEnv().getConfig().getCommonConfig().setEnableCrossSpaceCompaction(false); EnvFactory.getEnv().initClusterEnvironment(); @@ -69,7 +69,7 @@ public class IoTDBGapFillTableIT { } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregation2IT.java similarity index 66% copy from integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java copy to integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregation2IT.java index 5a402b81ff7..04538a55a84 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregation2IT.java @@ -20,37 +20,31 @@ 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.TableClusterIT; import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; +import static org.apache.iotdb.confignode.it.partition.IoTDBPartitionShuffleStrategyIT.SHUFFLE; import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; -@RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) -public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { +public class IoTDBTableAggregation2IT extends IoTDBTableAggregationIT { @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); EnvFactory.getEnv().getConfig().getCommonConfig().setMaxTsBlockSizeInByte(4 * 1024); + EnvFactory.getEnv().getConfig().getCommonConfig().setTimePartitionInterval(5_000); + EnvFactory.getEnv().getConfig().getCommonConfig().setDataPartitionAllocationStrategy(SHUFFLE); EnvFactory.getEnv().initClusterEnvironment(); - String original = createSqls[2]; - // make 'province', 'city', 'region' be FIELD to cover cases using GroupedAccumulator - createSqls[2] = - "CREATE TABLE table1(province STRING FIELD, city STRING FIELD, region STRING FIELD, device_id STRING TAG, color STRING ATTRIBUTE, type STRING ATTRIBUTE, s1 INT32 FIELD, s2 INT64 FIELD, s3 FLOAT FIELD, s4 DOUBLE FIELD, s5 BOOLEAN FIELD, s6 TEXT FIELD, s7 STRING FIELD, s8 BLOB FIELD, s9 TIMESTAMP FIELD, s10 DATE FIELD)"; prepareTableData(createSqls); - // rollback original content - createSqls[2] = original; } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStream2IT.java similarity index 83% copy from integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java copy to integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStream2IT.java index 5a402b81ff7..27cd9ad89c5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStream2IT.java @@ -20,25 +20,25 @@ 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.TableClusterIT; import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; +import static org.apache.iotdb.confignode.it.partition.IoTDBPartitionShuffleStrategyIT.SHUFFLE; import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; -@RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) -public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { +public class IoTDBTableAggregationNonStream2IT extends IoTDBTableAggregationNonStreamIT { @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); EnvFactory.getEnv().getConfig().getCommonConfig().setMaxTsBlockSizeInByte(4 * 1024); + EnvFactory.getEnv().getConfig().getCommonConfig().setTimePartitionInterval(5_000); + EnvFactory.getEnv().getConfig().getCommonConfig().setDataPartitionAllocationStrategy(SHUFFLE); EnvFactory.getEnv().initClusterEnvironment(); String original = createSqls[2]; // make 'province', 'city', 'region' be FIELD to cover cases using GroupedAccumulator @@ -50,7 +50,7 @@ public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java index 5a402b81ff7..191e2a3e489 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationNonStreamIT.java @@ -20,23 +20,20 @@ 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.TableClusterIT; import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; import static org.apache.iotdb.db.it.utils.TestUtils.prepareTableData; -@RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(128 * 1024); EnvFactory.getEnv().getConfig().getCommonConfig().setMaxTsBlockSizeInByte(4 * 1024); EnvFactory.getEnv().initClusterEnvironment(); @@ -50,7 +47,7 @@ public class IoTDBTableAggregationNonStreamIT extends IoTDBTableAggregationIT { } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { EnvFactory.getEnv().cleanClusterEnvironment(); } }
