Skip to content

Fix rest service port conflicts bug #17401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackieTien97 merged 1 commit into from
Mar 31, 2026
Merged

Fix rest service port conflicts bug #17401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/DataNodeWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public DataNodeWrapper(
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 =
Expand Down
32 changes: 4 additions & 28 deletions ...ational/it/query/recent/subquery/uncorrelated/IoTDBUncorrelatedInPredicateSubqueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,7 @@ public void testInPredicateSubqueryInHavingClause() {
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 =
Expand All @@ -194,26 +188,14 @@ public void testInPredicateSubqueryInHavingClause() {
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 =
Expand All @@ -223,13 +205,7 @@ public void testInPredicateSubqueryInHavingClause() {
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
Expand Down
3 changes: 2 additions & 1 deletion ...e/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ public void free(String queryId, String fragmentInstanceId, String planNodeId, l
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);
Expand Down
Loading