Merge branch 'master' into pattern-prune

Author: VGalaxies

dependencies.json

@@ -32,13 +32,13 @@
     "com.nimbusds:nimbus-jose-jwt",
     "com.nimbusds:oauth2-oidc-sdk",
     "com.sun.istack:istack-commons-runtime",
-    "com.timecho.ratis:ratis-client",
-    "com.timecho.ratis:ratis-common",
-    "com.timecho.ratis:ratis-grpc",
-    "com.timecho.ratis:ratis-metrics-api",
-    "com.timecho.ratis:ratis-proto",
-    "com.timecho.ratis:ratis-server",
-    "com.timecho.ratis:ratis-server-api",
+    "org.apache.ratis:ratis-client",
+    "org.apache.ratis:ratis-common",
+    "org.apache.ratis:ratis-grpc",
+    "org.apache.ratis:ratis-metrics-api",
+    "org.apache.ratis:ratis-proto",
+    "org.apache.ratis:ratis-server",
+    "org.apache.ratis:ratis-server-api",
     "com.zaxxer:HikariCP",
     "commons-cli:commons-cli",
     "commons-codec:commons-codec",

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

@@ -54,6 +54,7 @@
 import static org.apache.iotdb.commons.auth.entity.User.INTERNAL_USER_END_ID;
 import static org.apache.iotdb.db.audit.DNAuditLogger.PREFIX_PASSWORD_HISTORY;
 import static org.apache.iotdb.db.it.utils.TestUtils.createUser;
+import static org.apache.iotdb.db.it.utils.TestUtils.executeNonQuery;
 import static org.apache.iotdb.db.it.utils.TestUtils.resultSetEqualTest;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -1381,6 +1382,7 @@ public void noNeedPrivilegeTest() {
           "tempuser,",
         };
     resultSetEqualTest("show current_user", expectedHeader, retArray, "tempuser", "temppw123456");
+    executeNonQuery("SHOW AVAILABLE URLS", "tempuser", "temppw123456");
   }
 
   @Ignore

integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBDeletionTableIT.java

@@ -1741,7 +1741,11 @@ private List<TimeRange> collectDataRanges(Statement statement, long timeUpperBou
     List<TimeRange> ranges = new ArrayList<>();
     try (ResultSet set =
         statement.executeQuery(
-            "select time from table" + testNum + " where time <= " + timeUpperBound)) {
+            "select time from table"
+                + testNum
+                + " where time <= "
+                + timeUpperBound
+                + " order by time")) {
       while (set.next()) {
         long time = set.getLong(1);
         if (ranges.isEmpty()) {

integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java

@@ -150,6 +150,22 @@ public void testManageTable() {
         assertEquals(tableNames.length, cnt);
       }
 
+      // Test unsupported, to be deleted
+      try {
+        statement.execute("alter table test1.table1 rename to tableN");
+      } catch (final SQLException e) {
+        assertEquals("701: The renaming for base table is currently unsupported", e.getMessage());
+      }
+
+      // Test unsupported, to be deleted
+      try {
+        statement.execute(
+            "alter table if exists test_db.table1 rename column if exists model to modelType");
+      } catch (final SQLException e) {
+        assertEquals(
+            "701: The renaming for base table column is currently unsupported", e.getMessage());
+      }
+
       // Alter table properties
       statement.execute("alter table test1.table1 set properties ttl=1000000");
       ttls = new String[] {"1000000"};

iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TElasticFramedTransport.java

@@ -31,6 +31,7 @@
 
 import java.io.EOFException;
 import java.net.SocketAddress;
+import java.net.SocketException;
 import java.net.SocketTimeoutException;
 
 // https://github.com/apache/thrift/blob/master/doc/specs/thrift-rpc.md
@@ -125,6 +126,10 @@ public int read(byte[] buf, int off, int len) throws TTransportException {
       // Read another frame of data
       readFrame();
     } catch (TTransportException e) {
+      // Adding this workaround to avoid the Connection reset error log printed.
+      if (e.getCause() instanceof SocketException && e.getMessage().contains("Connection reset")) {
+        throw new TTransportException(TTransportException.END_OF_FILE, e.getCause());
+      }
       // There is a bug fixed in Thrift 0.15. Some unnecessary error logs may be printed.
       // See https://issues.apache.org/jira/browse/THRIFT-5411 and
       // https://github.com/apache/thrift/commit/be20ad7e08fab200391e3eab41acde9da2a4fd07

iotdb-client/session/src/main/java/org/apache/iotdb/session/NodesSupplier.java

@@ -40,16 +40,12 @@ public class NodesSupplier implements INodeSupplier, Runnable {
   private static final Logger LOGGER = LoggerFactory.getLogger(NodesSupplier.class);
 
   private static final long UPDATE_PERIOD_IN_S = 60;
-  private static final String SHOW_DATA_NODES_COMMAND = "SHOW DATANODES";
-
-  private static final String STATUS_COLUMN_NAME = "Status";
+  private static final String SHOW_AVAILABLE_URLS_COMMAND = "SHOW AVAILABLE URLS";
 
   private static final String IP_COLUMN_NAME = "RpcAddress";
 
   private static final String PORT_COLUMN_NAME = "RpcPort";
 
-  private static final String REMOVING_STATUS = "Removing";
-
   // it's ok that TIMEOUT_IN_MS is larger than UPDATE_PERIOD_IN_S, because the next update request
   // won't be scheduled until last time is done.
   private static final long TIMEOUT_IN_MS = 60_000;
@@ -228,28 +224,31 @@ public Optional<TEndPoint> getQueryEndPoint() {
 
   private boolean updateDataNodeList() {
     try (SessionDataSet sessionDataSet =
-        client.executeQueryStatement(SHOW_DATA_NODES_COMMAND, TIMEOUT_IN_MS, FETCH_SIZE)) {
-      SessionDataSet.DataIterator iterator = sessionDataSet.iterator();
-      List<TEndPoint> res = new ArrayList<>();
-      while (iterator.next()) {
-        String ip = iterator.getString(IP_COLUMN_NAME);
-        // ignore 0.0.0.0 and removing DN
-        if (!REMOVING_STATUS.equals(iterator.getString(STATUS_COLUMN_NAME))
-            && !"0.0.0.0".equals(ip)) {
-          String port = iterator.getString(PORT_COLUMN_NAME);
-          if (ip != null && port != null) {
-            res.add(new TEndPoint(ip, Integer.parseInt(port)));
-          }
-        }
-      }
-      // replace the older ones.
-      if (!res.isEmpty()) {
-        availableNodes = res;
-      }
-      return true;
-    } catch (Exception e) {
+        client.executeQueryStatement(SHOW_AVAILABLE_URLS_COMMAND, TIMEOUT_IN_MS, FETCH_SIZE)) {
+      updateAvailableNodes(sessionDataSet);
+    } catch (Exception e1) {
       LOGGER.warn("Failed to fetch data node list from {}.", client.endPoint);
       return false;
     }
+    return true;
+  }
+
+  private void updateAvailableNodes(SessionDataSet sessionDataSet) throws Exception {
+    SessionDataSet.DataIterator iterator = sessionDataSet.iterator();
+    List<TEndPoint> res = new ArrayList<>();
+    while (iterator.next()) {
+      String ip = iterator.getString(IP_COLUMN_NAME);
+      // ignore 0.0.0.0
+      if (!"0.0.0.0".equals(ip)) {
+        String port = iterator.getString(PORT_COLUMN_NAME);
+        if (ip != null && port != null) {
+          res.add(new TEndPoint(ip, Integer.parseInt(port)));
+        }
+      }
+    }
+    // replace the older ones.
+    if (!res.isEmpty()) {
+      availableNodes = res;
+    }
   }
 }

iotdb-core/ainode/.gitignore

@@ -14,6 +14,9 @@
 # generated by maven
 /iotdb/ainode/conf/
 
+# generated by poetry
+poetry.lock
+
 # generated by pyinstaller
 /dist/
 /build/

iotdb-core/ainode/build_binary.py

@@ -434,6 +434,14 @@ def verify_poetry_env():
     verify_poetry_env()  # Verify after lock
 
     print("Running poetry install...")
+    subprocess.run(
+        [str(poetry_exe), "lock"],
+        cwd=str(script_dir),
+        env=venv_env,
+        check=True,
+        capture_output=True,
+        text=True,
+    )
     verify_poetry_env()  # Verify before install
     result = subprocess.run(
         [str(poetry_exe), "install"],