Skip to content

Commit 77fe3e7

Browse files
authored
Fix rest service port conflicts bug (#17401)
1 parent 9bfe0b0 commit 77fe3e7

3 files changed

Lines changed: 7 additions & 30 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public DataNodeWrapper(
103103
this.schemaRegionConsensusPort = portList[4];
104104
this.mqttPort = portList[5];
105105
this.pipeAirGapReceiverPort = portList[6];
106-
this.restServicePort = portList[10] + 6000;
106+
this.restServicePort = portList[7];
107107
this.defaultNodePropertiesFile =
108108
EnvUtils.getFilePathFromSysVar(DEFAULT_DATA_NODE_PROPERTIES, clusterIndex);
109109
this.defaultCommonPropertiesFile =

integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/subquery/uncorrelated/IoTDBUncorrelatedInPredicateSubqueryIT.java

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,7 @@ public void testInPredicateSubqueryInHavingClause() {
178178
new String[] {
179179
"d01,5,", "d03,5,", "d05,5,", "d07,5,", "d09,5,", "d11,5,", "d13,5,", "d15,5,"
180180
};
181-
for (String measurement : NUMERIC_MEASUREMENTS) {
182-
tableResultSetEqualTest(
183-
String.format(sql, measurement, measurement, measurement, measurement),
184-
expectedHeader,
185-
retArray,
186-
DATABASE_NAME);
187-
}
181+
tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME);
188182

189183
// Test case: having s not in (subquery)
190184
sql =
@@ -194,26 +188,14 @@ public void testInPredicateSubqueryInHavingClause() {
194188
new String[] {
195189
"d01,5,", "d03,5,", "d05,5,", "d07,5,", "d09,5,", "d11,5,", "d13,5,", "d15,5,"
196190
};
197-
for (String measurement : NUMERIC_MEASUREMENTS) {
198-
tableResultSetEqualTest(
199-
String.format(sql, measurement, measurement, measurement, measurement),
200-
expectedHeader,
201-
retArray,
202-
DATABASE_NAME);
203-
}
191+
tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME);
204192

205193
// Test case: having s in (subquery), subquery returns empty set
206194
sql =
207195
"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')";
208196
expectedHeader = new String[] {"device_id", "_col1"};
209197
retArray = new String[] {};
210-
for (String measurement : NUMERIC_MEASUREMENTS) {
211-
tableResultSetEqualTest(
212-
String.format(sql, measurement, measurement, measurement, measurement),
213-
expectedHeader,
214-
retArray,
215-
DATABASE_NAME);
216-
}
198+
tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME);
217199

218200
// Test case: having s not in (subquery), subquery returns empty set, should return all rows
219201
sql =
@@ -223,13 +205,7 @@ public void testInPredicateSubqueryInHavingClause() {
223205
new String[] {
224206
"d01,5,", "d03,5,", "d05,5,", "d07,5,", "d09,5,", "d11,5,", "d13,5,", "d15,5,"
225207
};
226-
for (String measurement : NUMERIC_MEASUREMENTS) {
227-
tableResultSetEqualTest(
228-
String.format(sql, measurement, measurement, measurement, measurement),
229-
expectedHeader,
230-
retArray,
231-
DATABASE_NAME);
232-
}
208+
tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME);
233209
}
234210

235211
@Test

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ public void free(String queryId, String fragmentInstanceId, String planNodeId, l
338338
return reservedMemory - bytes;
339339
});
340340
} catch (NullPointerException e) {
341-
throw new IllegalArgumentException("RelatedMemoryReserved can't be null when freeing memory");
341+
throw new IllegalArgumentException(
342+
"RelatedMemoryReserved can't be null when freeing memory", e);
342343
}
343344

344345
memoryBlock.release(bytes);

0 commit comments

Comments
 (0)