Merge branch 'master' into update_last_cache_in_load

Author: jt2594838

.github/workflows/greeting-ainode.yml

@@ -0,0 +1,52 @@
+name: AINode Code Style Check
+
+on:
+  push:
+    branches:
+      - master
+      - "rc/*"
+    paths:
+      - 'iotdb-core/ainode/**'
+  pull_request:
+    branches:
+      - master
+      - "rc/*"
+    paths:
+      - 'iotdb-core/ainode/**'
+  # 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
+
+jobs:
+  check-style:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          pip3 install black==25.1.0 isort==6.0.1
+      - name: Check code formatting (Black)
+        run: |
+          cd iotdb-core/ainode
+          black --check .
+        continue-on-error: false
+
+      - name: Check import order (Isort)
+        run: |
+          cd iotdb-core/ainode
+          isort --check-only --profile black .
+        continue-on-error: false

.github/workflows/pipe-it.yml

@@ -438,7 +438,7 @@ jobs:
       matrix:
         java: [ 17 ]
         # StrongConsistencyClusterMode is ignored now because RatisConsensus has not been supported yet.
-        cluster1: [ ScalableSingleNodeMode ]
+        cluster1: [ ScalableSingleNodeMode, PipeConsensusBatchMode, PipeConsensusStreamMode ]
         cluster2: [ ScalableSingleNodeMode ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
@@ -606,7 +606,7 @@ jobs:
       matrix:
         java: [ 17 ]
         # do not use HighPerformanceMode here, otherwise some tests will cause the GH runner to receive a shutdown signal
-        cluster1: [ ScalableSingleNodeMode ]
+        cluster1: [ ScalableSingleNodeMode, PipeConsensusBatchMode, PipeConsensusStreamMode ]
         cluster2: [ ScalableSingleNodeMode ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
@@ -690,7 +690,7 @@ jobs:
       matrix:
         java: [ 17 ]
         # do not use HighPerformanceMode here, otherwise some tests will cause the GH runner to receive a shutdown signal
-        cluster1: [ ScalableSingleNodeMode ]
+        cluster1: [ ScalableSingleNodeMode, PipeConsensusBatchMode, PipeConsensusStreamMode ]
         cluster2: [ ScalableSingleNodeMode ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java

@@ -40,7 +40,11 @@
 import org.apache.iotdb.isession.pool.ITableSessionPool;
 import org.apache.iotdb.it.env.EnvFactory;
 import org.apache.iotdb.it.env.cluster.EnvUtils;
-import org.apache.iotdb.it.env.cluster.config.*;
+import org.apache.iotdb.it.env.cluster.config.MppClusterConfig;
+import org.apache.iotdb.it.env.cluster.config.MppCommonConfig;
+import org.apache.iotdb.it.env.cluster.config.MppConfigNodeConfig;
+import org.apache.iotdb.it.env.cluster.config.MppDataNodeConfig;
+import org.apache.iotdb.it.env.cluster.config.MppJVMConfig;
 import org.apache.iotdb.it.env.cluster.node.AINodeWrapper;
 import org.apache.iotdb.it.env.cluster.node.AbstractNodeWrapper;
 import org.apache.iotdb.it.env.cluster.node.ConfigNodeWrapper;
@@ -49,7 +53,11 @@
 import org.apache.iotdb.itbase.env.BaseEnv;
 import org.apache.iotdb.itbase.env.BaseNodeWrapper;
 import org.apache.iotdb.itbase.env.ClusterConfig;
-import org.apache.iotdb.itbase.runtime.*;
+import org.apache.iotdb.itbase.runtime.ClusterTestConnection;
+import org.apache.iotdb.itbase.runtime.NodeConnection;
+import org.apache.iotdb.itbase.runtime.ParallelRequestDelegate;
+import org.apache.iotdb.itbase.runtime.RequestDelegate;
+import org.apache.iotdb.itbase.runtime.SerialRequestDelegate;
 import org.apache.iotdb.jdbc.Config;
 import org.apache.iotdb.jdbc.Constant;
 import org.apache.iotdb.jdbc.IoTDBConnection;
@@ -70,13 +78,23 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.apache.iotdb.it.env.cluster.ClusterConstant.*;
+import static org.apache.iotdb.it.env.cluster.ClusterConstant.NODE_NETWORK_TIMEOUT_MS;
+import static org.apache.iotdb.it.env.cluster.ClusterConstant.NODE_START_TIMEOUT;
+import static org.apache.iotdb.it.env.cluster.ClusterConstant.TEMPLATE_NODE_LIB_PATH;
+import static org.apache.iotdb.it.env.cluster.ClusterConstant.TEMPLATE_NODE_PATH;
+import static org.apache.iotdb.it.env.cluster.ClusterConstant.ZERO_TIME_ZONE;
 import static org.apache.iotdb.jdbc.Config.VERSION;
 
 public abstract class AbstractEnv implements BaseEnv {

integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java

@@ -38,8 +38,8 @@
 import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.countTimeSeriesColumnHeaders;
 import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showChildNodesColumnHeaders;
 import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showChildPathsColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showDatabasesColumnHeaders;
 import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showDevicesColumnHeaders;
-import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showStorageGroupsColumnHeaders;
 import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showTTLColumnHeaders;
 import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showTimeSeriesColumnHeaders;
 import static org.apache.iotdb.db.it.utils.TestUtils.assertNonQueryTestFail;
@@ -160,9 +160,7 @@ private void testReadSchema() {
     // show/count databases
     resultSetEqualTest(
         "show databases",
-        showStorageGroupsColumnHeaders.stream()
-            .map(ColumnHeader::getColumnName)
-            .toArray(String[]::new),
+        showDatabasesColumnHeaders.stream().map(ColumnHeader::getColumnName).toArray(String[]::new),
         new String[] {"root.test,1,1,0,604800000,"},
         "test1",
         "test123");

…it/schema/IoTDBDeleteStorageGroupIT.java …/db/it/schema/IoTDBDeleteDatabaseIT.javaintegration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteStorageGroupIT.java renamed to integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteDatabaseIT.java integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteStorageGroupIT.java renamed to integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteDatabaseIT.java

@@ -41,9 +41,9 @@
 import static org.junit.Assert.assertTrue;
 
 @Category({LocalStandaloneIT.class, ClusterIT.class})
-public class IoTDBDeleteStorageGroupIT extends AbstractSchemaIT {
+public class IoTDBDeleteDatabaseIT extends AbstractSchemaIT {
 
-  public IoTDBDeleteStorageGroupIT(SchemaTestMode schemaTestMode) {
+  public IoTDBDeleteDatabaseIT(SchemaTestMode schemaTestMode) {
     super(schemaTestMode);
   }
 
@@ -65,7 +65,7 @@ public void tearDown() throws Exception {
   }
 
   @Test
-  public void testDeleteStorageGroup() throws Exception {
+  public void testDeleteDatabase() throws Exception {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
       statement.execute("CREATE DATABASE root.ln.wf01.wt01");
@@ -90,7 +90,7 @@ public void testDeleteStorageGroup() throws Exception {
   }
 
   @Test
-  public void testDeleteMultipleStorageGroupWithQuote() throws Exception {
+  public void testDeleteMultipleDatabasesWithQuote() throws Exception {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
       statement.execute("CREATE DATABASE root.ln1.wf01.wt01");
@@ -113,7 +113,7 @@ public void testDeleteMultipleStorageGroupWithQuote() throws Exception {
   }
 
   @Test(expected = SQLException.class)
-  public void deleteNonExistStorageGroup() throws Exception {
+  public void deleteNonExistDatabase() throws Exception {
     try (final Connection connection = EnvFactory.getEnv().getConnection();
         final Statement statement = connection.createStatement()) {
       statement.execute("CREATE DATABASE root.ln2.wf01.wt01");
@@ -122,7 +122,7 @@ public void deleteNonExistStorageGroup() throws Exception {
   }
 
   @Test
-  public void testDeleteStorageGroupWithStar() throws Exception {
+  public void testDeleteDatabaseWithStar() throws Exception {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
       statement.execute("CREATE DATABASE root.ln3.wf01.wt01");
@@ -145,7 +145,7 @@ public void testDeleteStorageGroupWithStar() throws Exception {
   }
 
   @Test
-  public void testDeleteAllStorageGroups() throws Exception {
+  public void testDeleteAllDatabases() throws Exception {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
       statement.execute("CREATE DATABASE root.ln4.wf01.wt01");
@@ -164,7 +164,7 @@ public void testDeleteAllStorageGroups() throws Exception {
   }
 
   @Test
-  public void testDeleteStorageGroupAndThenQuery() throws Exception {
+  public void testDeleteDatabaseAndThenQuery() throws Exception {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
       statement.execute("insert into root.sg1.d1(time,s1) values(1,1);");
@@ -185,7 +185,7 @@ public void testDeleteStorageGroupAndThenQuery() throws Exception {
   }
 
   @Test
-  public void testDeleteStorageGroupInvalidateCache() throws Exception {
+  public void testDeleteDatabaseInvalidateCache() throws Exception {
     try (final Connection connection = EnvFactory.getEnv().getConnection();
         final Statement statement = connection.createStatement()) {
       try {

integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java

@@ -38,6 +38,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
@@ -185,37 +186,36 @@ public void showTimeseriesTest() throws SQLException {
   }
 
   @Test
-  public void showStorageGroupTest() throws SQLException {
-    try (Connection connection = EnvFactory.getEnv().getConnection();
-        Statement statement = connection.createStatement()) {
-      String[] sqls =
+  public void showDatabasesTest() throws SQLException {
+    try (final Connection connection = EnvFactory.getEnv().getConnection();
+        final Statement statement = connection.createStatement()) {
+      final String[] sqls =
           new String[] {
             "show databases",
             "show databases root.ln.wf01.**",
             "show databases root.ln.wf01.wt01.status"
           };
-      Set<String>[] standards =
-          new Set[] {
-            new HashSet<>(
-                Arrays.asList(
-                    "root.ln.wf01.wt01",
-                    "root.ln.wf01.wt02",
-                    "root.ln1.wf01.wt01",
-                    "root.ln2.wf01.wt01")),
-            new HashSet<>(Arrays.asList("root.ln.wf01.wt01", "root.ln.wf01.wt02")),
-            new HashSet<>()
+      final List<String>[] standards =
+          new List[] {
+            Arrays.asList(
+                "root.ln.wf01.wt01",
+                "root.ln.wf01.wt02",
+                "root.ln1.wf01.wt01",
+                "root.ln2.wf01.wt01"),
+            Arrays.asList("root.ln.wf01.wt01", "root.ln.wf01.wt02"),
+            Collections.emptyList()
           };
 
       for (int n = 0; n < sqls.length; n++) {
-        String sql = sqls[n];
-        Set<String> standard = standards[n];
-        try (ResultSet resultSet = statement.executeQuery(sql)) {
+        final String sql = sqls[n];
+        final List<String> standard = standards[n];
+        int i = 0;
+        try (final ResultSet resultSet = statement.executeQuery(sql)) {
           while (resultSet.next()) {
-            Assert.assertTrue(standard.contains(resultSet.getString(1)));
-            standard.remove(resultSet.getString(1));
+            assertEquals(standard.get(i++), resultSet.getString(1));
           }
-          assertEquals(0, standard.size());
-        } catch (SQLException e) {
+          assertEquals(i, standard.size());
+        } catch (final SQLException e) {
           e.printStackTrace();
           fail(e.getMessage());
         }

integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java

@@ -43,6 +43,8 @@
 import java.text.DateFormat;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -619,16 +621,19 @@ public static void assertResultSetEqual(
   }
 
   public static void assertResultSetEqual(
-      ResultSet actualResultSet, String expectedHeader, Set<String> expectedRetSet) {
+      final ResultSet actualResultSet,
+      final String expectedHeader,
+      final Collection<String> expectedResult) {
     try {
-      ResultSetMetaData resultSetMetaData = actualResultSet.getMetaData();
-      StringBuilder header = new StringBuilder();
+      final ResultSetMetaData resultSetMetaData = actualResultSet.getMetaData();
+      final StringBuilder header = new StringBuilder();
       for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
         header.append(resultSetMetaData.getColumnName(i)).append(",");
       }
       assertEquals(expectedHeader, header.toString());
 
-      Set<String> actualRetSet = new HashSet<>();
+      final Collection<String> actualRetSet =
+          expectedResult instanceof Set ? new HashSet<>() : new ArrayList<>();
 
       while (actualResultSet.next()) {
         StringBuilder builder = new StringBuilder();
@@ -637,8 +642,8 @@ public static void assertResultSetEqual(
         }
         actualRetSet.add(builder.toString());
       }
-      assertEquals(expectedRetSet, actualRetSet);
-    } catch (Exception e) {
+      assertEquals(expectedResult, actualRetSet);
+    } catch (final Exception e) {
       e.printStackTrace();
       Assert.fail(String.valueOf(e));
     }