Fix

apache · Jan 8, 2025 · 3276a6a · 3276a6a
1 parent 41532e6
commit 3276a6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...pache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java b/...pache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java
@@ -334,10 +334,6 @@ private boolean tryGetDeviceInCache(
       if (Objects.nonNull(fetchPaths)) {
         fetchPaths.add(deviceID);
       }
-      if (isDirectDeviceQuery && Objects.nonNull(deviceEntryList)) {
-        queryContext.releaseMemoryReservedForFrontEnd(
-            deviceEntryList.stream().map(DeviceEntry::ramBytesUsed).reduce(0L, Long::sum));
-      }
       return false;
     }
 
@@ -348,12 +344,13 @@ private boolean tryGetDeviceInCache(
     // TODO table metadata: process cases that selected attr columns different from those used for
     // predicate
     if (check.test(deviceEntry)) {
-      queryContext.reserveMemoryForFrontEnd(deviceEntry.ramBytesUsed());
       deviceEntryList.add(deviceEntry);
       // If we partially hit cache in direct device query, we must fetch for all the predicates
       // because now we do not support combining memory source and other sources
       if (isDirectDeviceQuery) {
         fetchPaths.add(deviceID);
+      } else {
+        queryContext.reserveMemoryForFrontEnd(deviceEntry.ramBytesUsed());
       }
     }
     return true;

diff --git a/...org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java b/...org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java
@@ -63,6 +63,8 @@ public boolean parseRawExpression(
     final boolean needFetch =
         super.parseRawExpression(entries, tableInstance, attributeColumns, context);
     if (!needFetch) {
+      context.reserveMemoryForFrontEnd(
+          entries.stream().map(DeviceEntry::ramBytesUsed).reduce(0L, Long::sum));
       results =
           entries.stream()
               .map(