Support active schema query (#12718)

apache · Jun 18, 2024 · fcd7069 · fcd7069
1 parent 1cd5ecd
commit fcd7069
Show file tree

Hide file tree

Showing 75 changed files with 1,951 additions and 495 deletions.
diff --git a/...t/regionscan/IoTDBActiveRegionScanIT.java → ...a/regionscan/IoTDBActiveRegionScanIT.java b/...t/regionscan/IoTDBActiveRegionScanIT.java → ...a/regionscan/IoTDBActiveRegionScanIT.java
@@ -17,18 +17,17 @@
  * under the License.
  */
 
-package org.apache.iotdb.db.it.regionscan;
+package org.apache.iotdb.db.it.schema.regionscan;
 
 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.util.AbstractSchemaIT;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -45,9 +44,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-@RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
-public class IoTDBActiveRegionScanIT {
+public class IoTDBActiveRegionScanIT extends AbstractSchemaIT {
   // Data can be viewed in
   // https://docs.google.com/spreadsheets/d/11tNRIaHmNdFWc0RC4yAloO6JJbmo9S5qxwAqWxeVY6c/edit#gid=0
   public static final String[] common_insert_sqls =
@@ -145,6 +143,10 @@ public class IoTDBActiveRegionScanIT {
   public static final String COUNT_TIMESERIES_COLUMN_NAMES = "count(timeseries)";
   public static final String COUNT_DEVICES_COLUMN_NAMES = "count(devices)";
 
+  public IoTDBActiveRegionScanIT(SchemaTestMode schemaTestMode) {
+    super(schemaTestMode);
+  }
+
   public static void insertData() {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {

diff --git a/.../regionscan/IoTDBActiveRegionScanIT2.java → .../regionscan/IoTDBActiveRegionScanIT2.java b/.../regionscan/IoTDBActiveRegionScanIT2.java → .../regionscan/IoTDBActiveRegionScanIT2.java
@@ -17,21 +17,22 @@
  * under the License.
  */
 
-package org.apache.iotdb.db.it.regionscan;
+package org.apache.iotdb.db.it.schema.regionscan;
 
 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.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
 
-@RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
 public class IoTDBActiveRegionScanIT2 extends IoTDBActiveRegionScanIT {
+  public IoTDBActiveRegionScanIT2(SchemaTestMode schemaTestMode) {
+    super(schemaTestMode);
+  }
+
   @BeforeClass
   public static void setUp() throws Exception {
     EnvFactory.getEnv()

diff --git a/...scan/IoTDBActiveRegionScanWithModsIT.java → ...scan/IoTDBActiveRegionScanWithModsIT.java b/...scan/IoTDBActiveRegionScanWithModsIT.java → ...scan/IoTDBActiveRegionScanWithModsIT.java
@@ -17,34 +17,32 @@
  * under the License.
  */
 
-package org.apache.iotdb.db.it.regionscan;
+package org.apache.iotdb.db.it.schema.regionscan;
 
 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.util.AbstractSchemaIT;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
 
 import java.sql.Connection;
 import java.sql.Statement;
 
-import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.COUNT_DEVICES_COLUMN_NAMES;
-import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.COUNT_TIMESERIES_COLUMN_NAMES;
-import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.SHOW_DEVICES_COLUMN_NAMES;
-import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.SHOW_TIMESERIES_COLUMN_NAMES;
-import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.basicCountActiveDeviceTest;
-import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.basicShowActiveDeviceTest;
-import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.common_insert_sqls;
+import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.COUNT_DEVICES_COLUMN_NAMES;
+import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.COUNT_TIMESERIES_COLUMN_NAMES;
+import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.SHOW_DEVICES_COLUMN_NAMES;
+import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.SHOW_TIMESERIES_COLUMN_NAMES;
+import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.basicCountActiveDeviceTest;
+import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.basicShowActiveDeviceTest;
+import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.common_insert_sqls;
 import static org.junit.Assert.fail;
 
-@RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
-public class IoTDBActiveRegionScanWithModsIT {
+public class IoTDBActiveRegionScanWithModsIT extends AbstractSchemaIT {
 
   private static String[] delete_sqls =
       new String[] {
@@ -57,6 +55,10 @@ public class IoTDBActiveRegionScanWithModsIT {
         "delete from root.sg.unaligned.d2.* where time > 40 and time <= 43"
       };
 
+  public IoTDBActiveRegionScanWithModsIT(SchemaTestMode schemaTestMode) {
+    super(schemaTestMode);
+  }
+
   public static void insertData() {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {

diff --git a/...can/IoTDBActiveRegionScanWithModsIT2.java → ...can/IoTDBActiveRegionScanWithModsIT2.java b/...can/IoTDBActiveRegionScanWithModsIT2.java → ...can/IoTDBActiveRegionScanWithModsIT2.java
@@ -17,21 +17,22 @@
  * under the License.
  */
 
-package org.apache.iotdb.db.it.regionscan;
+package org.apache.iotdb.db.it.schema.regionscan;
 
 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.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
 
-@RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
 public class IoTDBActiveRegionScanWithModsIT2 extends IoTDBActiveRegionScanWithModsIT {
+  public IoTDBActiveRegionScanWithModsIT2(SchemaTestMode schemaTestMode) {
+    super(schemaTestMode);
+  }
+
   @BeforeClass
   public static void setUp() throws Exception {
     EnvFactory.getEnv()