You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2026/03/31 01:19:32 UTC

(iotdb) branch ty/ci-unreliable created (now 827f03daefa)

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a change to branch ty/ci-unreliable
in repository https://gitbox.apache.org/repos/asf/iotdb.git


      at 827f03daefa Fix rest service port conflicts bug

This branch includes the following new commits:

     new 827f03daefa Fix rest service port conflicts bug

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(iotdb) 01/01: Fix rest service port conflicts bug

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a commit to branch ty/ci-unreliable
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 827f03daefaf59e3818e40dc6b209b23d22435de
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Mar 31 09:19:16 2026 +0800

    Fix rest service port conflicts bug
---
 .../iotdb/it/env/cluster/node/DataNodeWrapper.java |  2 +-
 .../IoTDBUncorrelatedInPredicateSubqueryIT.java    | 32 +++-------------------
 .../queryengine/execution/memory/MemoryPool.java   |  3 +-
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/DataNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/DataNodeWrapper.java
index 96a0fbe27e0..dac6cf3fcc3 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/DataNodeWrapper.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/DataNodeWrapper.java
@@ -103,7 +103,7 @@ public class DataNodeWrapper extends AbstractNodeWrapper {
     this.schemaRegionConsensusPort = portList[4];
     this.mqttPort = portList[5];
     this.pipeAirGapReceiverPort = portList[6];
-    this.restServicePort = portList[10] + 6000;
+    this.restServicePort = portList[7];
     this.defaultNodePropertiesFile =
         EnvUtils.getFilePathFromSysVar(DEFAULT_DATA_NODE_PROPERTIES, clusterIndex);
     this.defaultCommonPropertiesFile =
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/subquery/uncorrelated/IoTDBUncorrelatedInPredicateSubqueryIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/subquery/uncorrelated/IoTDBUncorrelatedInPredicateSubqueryIT.java
index ad26fb55590..add410b3bee 100644
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/subquery/uncorrelated/IoTDBUncorrelatedInPredicateSubqueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/subquery/uncorrelated/IoTDBUncorrelatedInPredicateSubqueryIT.java
@@ -178,13 +178,7 @@ public class IoTDBUncorrelatedInPredicateSubqueryIT {
         new String[] {
           "d01,5,", "d03,5,", "d05,5,", "d07,5,", "d09,5,", "d11,5,", "d13,5,", "d15,5,"
         };
-    for (String measurement : NUMERIC_MEASUREMENTS) {
-      tableResultSetEqualTest(
-          String.format(sql, measurement, measurement, measurement, measurement),
-          expectedHeader,
-          retArray,
-          DATABASE_NAME);
-    }
+    tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME);
 
     // Test case: having s not in (subquery)
     sql =
@@ -194,26 +188,14 @@ public class IoTDBUncorrelatedInPredicateSubqueryIT {
         new String[] {
           "d01,5,", "d03,5,", "d05,5,", "d07,5,", "d09,5,", "d11,5,", "d13,5,", "d15,5,"
         };
-    for (String measurement : NUMERIC_MEASUREMENTS) {
-      tableResultSetEqualTest(
-          String.format(sql, measurement, measurement, measurement, measurement),
-          expectedHeader,
-          retArray,
-          DATABASE_NAME);
-    }
+    tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME);
 
     // Test case: having s in (subquery), subquery returns empty set
     sql =
         "SELECT device_id, count(*) from table1 group by device_id having count(*) + 25 in (SELECT cast(s1 as INT64) from table3 where device_id = 'd010')";
     expectedHeader = new String[] {"device_id", "_col1"};
     retArray = new String[] {};
-    for (String measurement : NUMERIC_MEASUREMENTS) {
-      tableResultSetEqualTest(
-          String.format(sql, measurement, measurement, measurement, measurement),
-          expectedHeader,
-          retArray,
-          DATABASE_NAME);
-    }
+    tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME);
 
     // Test case: having s not in (subquery), subquery returns empty set, should return all rows
     sql =
@@ -223,13 +205,7 @@ public class IoTDBUncorrelatedInPredicateSubqueryIT {
         new String[] {
           "d01,5,", "d03,5,", "d05,5,", "d07,5,", "d09,5,", "d11,5,", "d13,5,", "d15,5,"
         };
-    for (String measurement : NUMERIC_MEASUREMENTS) {
-      tableResultSetEqualTest(
-          String.format(sql, measurement, measurement, measurement, measurement),
-          expectedHeader,
-          retArray,
-          DATABASE_NAME);
-    }
+    tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME);
   }
 
   @Test
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
index 3a062b74579..3e00c845dab 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
@@ -338,7 +338,8 @@ public class MemoryPool {
                 return reservedMemory - bytes;
               });
     } catch (NullPointerException e) {
-      throw new IllegalArgumentException("RelatedMemoryReserved can't be null when freeing memory");
+      throw new IllegalArgumentException(
+          "RelatedMemoryReserved can't be null when freeing memory", e);
     }
 
     memoryBlock.release(bytes);