(iotdb) branch master updated: Fix rest service port conflicts bug (#17401)

[jackietien]

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

jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 77fe3e72a78 Fix rest service port conflicts bug (#17401)
77fe3e72a78 is described below

commit 77fe3e72a7819e4d56298e990a6cfba3c8361b8e
Author: Jackie Tien <jackietie...@gmail.com>
AuthorDate: Tue Mar 31 14:44:34 2026 +0800

    Fix rest service port conflicts bug (#17401)
---
 .../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);