This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch FastFail in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 218b3767b3fe1a0adbf9320a2e38a35c3edb9bbd Author: JackieTien97 <[email protected]> AuthorDate: Tue Aug 19 19:24:09 2025 +0800 Add more log and remove useless synchronize --- .../db/queryengine/execution/fragment/FragmentInstanceContext.java | 6 +----- .../storageengine/dataregion/memtable/AbstractWritableMemChunk.java | 5 +++++ 2 files changed, 6 insertions(+), 5 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 50c9afd7ff0..88393665fe3 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 @@ -456,10 +456,6 @@ public class FragmentInstanceContext extends QueryContext { return dataNodeQueryContext; } - public void setDataNodeQueryContext(DataNodeQueryContext dataNodeQueryContext) { - this.dataNodeQueryContext = dataNodeQueryContext; - } - public FragmentInstanceInfo getInstanceInfo() { FragmentInstanceState state = stateMachine.getState(); long endTime = getEndTime(); @@ -949,7 +945,7 @@ public class FragmentInstanceContext extends QueryContext { .updatePageReaderMemoryUsage(getQueryStatistics().getPageReaderMaxUsedMemorySize().get()); } - private synchronized void releaseDataNodeQueryContext() { + private void releaseDataNodeQueryContext() { if (dataNodeQueryContextMap == null) { // this process is in fetch schema, nothing need to release return; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java index ac71e3da6bb..72e39f3cbbb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java @@ -33,12 +33,16 @@ import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.BitMap; import org.apache.tsfile.write.chunk.IChunkWriter; import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Iterator; import java.util.List; import java.util.concurrent.BlockingQueue; public abstract class AbstractWritableMemChunk implements IWritableMemChunk { + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractWritableMemChunk.class); + protected static long RETRY_INTERVAL_MS = 100L; protected static long MAX_WAIT_QUERY_MS = 60 * 1000L; @@ -59,6 +63,7 @@ public abstract class AbstractWritableMemChunk implements IWritableMemChunk { tryReleaseTvList(tvList); succeed = true; } catch (MemoryNotEnoughException ex) { + LOGGER.warn("Failed to transfer tvlist memory owner to query engine, {}", ex.getMessage()); long waitQueryInMs = System.currentTimeMillis() - startTimeInMs; if (waitQueryInMs > MAX_WAIT_QUERY_MS) { // Abort first query in the list. When all queries in the list have been aborted,
