This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new bc2063f8882 fix: PR16943 type error (#16948)
bc2063f8882 is described below
commit bc2063f8882c09a6674f55a83c7c3f776892cdf5
Author: shizy <[email protected]>
AuthorDate: Wed Dec 24 14:10:16 2025 +0800
fix: PR16943 type error (#16948)
---
.../db/queryengine/execution/fragment/FragmentInstanceContext.java | 4 ++--
.../execution/fragment/FragmentInstanceExecutionTest.java | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
index 1a9a80300f8..62f82a1f5b4 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
@@ -874,8 +874,8 @@ public class FragmentInstanceContext extends QueryContext {
try {
queryContextSet.remove(this);
if (tvList.getOwnerQuery() == this) {
- if (LOGGER.isDebugEnabled()) {
- if (queryContextSet.isEmpty()) {
+ if (queryContextSet.isEmpty()) {
+ if (LOGGER.isDebugEnabled()) {
LOGGER.debug(
"TVList {} is released by the query, FragmentInstance Id is
{}",
tvList,
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java
index fb659c6914a..e0655edc55a 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java
@@ -49,7 +49,6 @@ import java.util.concurrent.ExecutorService;
import static org.apache.iotdb.db.queryengine.common.QueryId.MOCK_QUERY_ID;
import static
org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -149,14 +148,12 @@ public class FragmentInstanceExecutionTest {
}
} finally {
// Restore original System.out
- System.setErr(systemOut);
+ System.setOut(systemOut);
// should not contain warn message: "The memory cost to be released is
larger than the memory
// cost of memory block"
String capturedOutput = logPrint.toString();
- assertFalse(
- "Should not contain error message",
- capturedOutput.contains("is more than allocated memory"));
+ assertTrue(capturedOutput.isEmpty());
}
}