fix: Fix the memory calculation for Optional and other fields

Young-Leo · Young-Leo · commit a6554c963dc4 · 2025-12-19T22:18:14.000+08:00
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java
@@ -168,9 +168,7 @@ public List<Node> getNodes() {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += ramBytesUsedExcludingInstanceSize();
-    if (asofExpression != null) {
-      size += asofExpression.ramBytesUsed();
-    }
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(asofExpression);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java
@@ -91,6 +91,19 @@ public static long getEstimatedSizeOfIntegerList(@Nullable final List<Integer> i
     return size;
   }
 
+  public static long getEstimatedSizeOfLongList(@Nullable final List<Long> longs) {
+    if (longs == null || longs.isEmpty()) {
+      return 0L;
+    }
+    long size = RamUsageEstimator.shallowSizeOf(longs);
+    for (Long longValue : longs) {
+      if (longValue != null) {
+        size += Long.BYTES;
+      }
+    }
+    return size;
+  }
+
   public static long getEstimatedSizeOfObjectArrayList(
       @Nullable final List<Object[]> objectArrayList) {
     if (objectArrayList == null || objectArrayList.isEmpty()) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java
@@ -29,7 +29,6 @@
 import java.util.Set;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
-import static java.util.stream.Collectors.toList;
 
 public class ClearCache extends Statement {
   private static final long INSTANCE_SIZE =
@@ -89,10 +88,7 @@ public String toString() {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    if (options != null) {
-      size +=
-          RamUsageEstimator.shallowSizeOf(options.stream().map(Enum::ordinal).collect(toList()));
-    }
+    size += RamUsageEstimator.sizeOfCollection(options);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java
@@ -92,10 +92,8 @@ public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
     size += RamUsageEstimator.sizeOf(tableName);
-    if (where.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += where.get() == null ? 0L : where.get().ramBytesUsed();
-    }
+    size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(where.orElse(null));
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java
@@ -117,10 +117,7 @@ public long ramBytesUsed() {
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
     size += tableName == null ? 0L : tableName.ramBytesUsed();
     size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(indexName);
-    size += RamUsageEstimator.shallowSizeOf(columnList);
-    for (Identifier column : columnList) {
-      size += column == null ? 0L : column.ramBytesUsed();
-    }
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(columnList);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java
@@ -84,7 +84,7 @@ public boolean shallowEquals(Node other) {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    size += pattern == null ? 0L : pattern.ramBytesUsed();
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(pattern);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java
@@ -82,7 +82,7 @@ public int getDataNodeId() {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    size += RamUsageEstimator.shallowSizeOf(regionIds);
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfIntegerList(regionIds);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java
@@ -22,10 +22,7 @@
 import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
 import org.apache.iotdb.db.queryengine.plan.statement.Statement;
 
-import org.apache.tsfile.utils.RamUsageEstimator;
-
 public class Flush extends WrappedStatement {
-  private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(Flush.class);
 
   public Flush(final Statement innerTreeStatement, final MPPQueryContext context) {
     super(innerTreeStatement, context);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java
@@ -145,10 +145,8 @@ public FrameBound(ByteBuffer byteBuffer) {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    if (value.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(value.get());
-    }
+    size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(value.orElse(null));
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java
@@ -344,20 +344,15 @@ public long ramBytesUsed() {
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
     size += name == null ? 0L : name.ramBytesUsed();
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(arguments);
+    size += 3 * AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
     if (window.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
       Window windowValue = window.get();
       if (windowValue instanceof Node) {
         size += ((Node) windowValue).ramBytesUsed();
       }
     }
-    if (processingMode.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += processingMode.get().ramBytesUsed();
-    }
-    if (nullTreatment.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-    }
+    size +=
+        AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(processingMode.orElse(null));
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java
@@ -74,16 +74,11 @@ public List<Node> getNodes() {
   @Override
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
-    if (expression != null) {
-      size += expression.ramBytesUsed();
-    }
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(expression);
     return size;
   }
 
   protected long ramBytesUsedExcludingInstanceSize() {
-    if (expression != null) {
-      return expression.ramBytesUsed();
-    }
-    return 0L;
+    return AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(expression);
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java
@@ -22,12 +22,7 @@
 import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
 import org.apache.iotdb.db.queryengine.plan.statement.Statement;
 
-import org.apache.tsfile.utils.RamUsageEstimator;
-
 public class LoadConfiguration extends WrappedStatement {
-  private static final long INSTANCE_SIZE =
-      RamUsageEstimator.shallowSizeOfInstance(LoadConfiguration.class);
-
   public LoadConfiguration(Statement innerTreeStatement, MPPQueryContext context) {
     super(innerTreeStatement, context);
   }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java
@@ -356,17 +356,8 @@ public long ramBytesUsed() {
         }
       }
     }
-    if (writePointCountList != null) {
-      size += RamUsageEstimator.shallowSizeOf(writePointCountList);
-      for (Long count : writePointCountList) {
-        if (count != null) {
-          size += Long.BYTES;
-        }
-      }
-    }
-    if (isTableModel != null) {
-      size += RamUsageEstimator.shallowSizeOf(isTableModel);
-    }
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfLongList(writePointCountList);
+    size += RamUsageEstimator.shallowSizeOf(isTableModel);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java
@@ -88,7 +88,6 @@ public boolean shallowEquals(Node other) {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    // int (4 bytes, but typically aligned to 8 bytes)
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java
@@ -213,15 +213,12 @@ public long ramBytesUsed() {
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
     size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(input);
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(partitionBy);
-    if (orderBy.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(orderBy.get());
-    }
+    size += 3 * AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(orderBy.orElse(null));
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(measures);
-    if (afterMatchSkipTo.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(afterMatchSkipTo.get());
-    }
+    size +=
+        AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(
+            afterMatchSkipTo.orElse(null));
     size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(pattern);
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(subsets);
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(variableDefinitions);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java
@@ -78,7 +78,7 @@ public Statement getInnerStatement() {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    size += innerStatement == null ? 0L : innerStatement.ramBytesUsed();
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(innerStatement);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java
@@ -235,23 +235,10 @@ public static QualifiedName deserialize(ByteBuffer byteBuffer) {
   @Override
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
-    if (originalParts != null) {
-      size += RamUsageEstimator.shallowSizeOf(originalParts);
-      for (Identifier identifier : originalParts) {
-        if (identifier != null) {
-          size += identifier.ramBytesUsed();
-        }
-      }
-    }
-    if (parts != null) {
-      size += RamUsageEstimator.shallowSizeOf(parts);
-      for (String part : parts) {
-        size += RamUsageEstimator.sizeOf(part);
-      }
-    }
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(originalParts);
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfStringList(parts);
     size += RamUsageEstimator.sizeOf(name);
     if (prefix != null) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
       size += prefix.ramBytesUsed();
     }
     size += RamUsageEstimator.sizeOf(suffix);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java
@@ -95,8 +95,8 @@ public boolean shallowEquals(Node other) {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    size += pattern == null ? 0L : pattern.ramBytesUsed();
-    size += patternQuantifier == null ? 0L : patternQuantifier.ramBytesUsed();
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(pattern);
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(patternQuantifier);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java
@@ -164,26 +164,12 @@ public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
     size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(queryBody);
-    if (with.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += with.get().ramBytesUsed();
-    }
-    if (fill.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += fill.get().ramBytesUsed();
-    }
-    if (orderBy.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += orderBy.get().ramBytesUsed();
-    }
-    if (offset.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += offset.get().ramBytesUsed();
-    }
-    if (limit.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += limit.get().ramBytesUsed();
-    }
+    size += 5 * AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(with.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(fill.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(orderBy.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(offset.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(limit.orElse(null));
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java
@@ -195,39 +195,16 @@ public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
     size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(select);
-    if (from.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += from.get().ramBytesUsed();
-    }
-    if (where.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += where.get().ramBytesUsed();
-    }
-    if (groupBy.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += groupBy.get().ramBytesUsed();
-    }
-    if (having.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += having.get().ramBytesUsed();
-    }
-    if (fill.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += fill.get().ramBytesUsed();
-    }
+    size += 8 * AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(from.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(where.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(groupBy.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(having.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(fill.orElse(null));
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(windows);
-    if (orderBy.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += orderBy.get().ramBytesUsed();
-    }
-    if (offset.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += offset.get().ramBytesUsed();
-    }
-    if (limit.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += limit.get().ramBytesUsed();
-    }
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(orderBy.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(offset.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(limit.orElse(null));
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java
@@ -99,14 +99,9 @@ public String toString() {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    if (atLeast.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += atLeast.get() == null ? 0L : atLeast.get().ramBytesUsed();
-    }
-    if (atMost.isPresent()) {
-      size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
-      size += atMost.get() == null ? 0L : atMost.get().ramBytesUsed();
-    }
+    size += 2 * AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(atLeast.orElse(null));
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(atMost.orElse(null));
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java
@@ -473,11 +473,7 @@ public long ramBytesUsed() {
     size += RamUsageEstimator.sizeOf(oldPassword);
     size += RamUsageEstimator.sizeOf(newUsername);
     size += RamUsageEstimator.sizeOf(loginAddr);
-    if (privilegeType != null) {
-      size +=
-          RamUsageEstimator.shallowSizeOf(
-              privilegeType.stream().map(Enum::ordinal).collect(Collectors.toList()));
-    }
+    size += RamUsageEstimator.sizeOfCollection(privilegeType);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java
@@ -77,7 +77,7 @@ public String toString() {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    size += RamUsageEstimator.shallowSizeOf(nodeIds);
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfIntegerList(nodeIds);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java
@@ -82,7 +82,7 @@ public int getDataNodeId() {
   public long ramBytesUsed() {
     long size = INSTANCE_SIZE;
     size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
-    size += RamUsageEstimator.shallowSizeOf(regionIds);
+    size += AstMemoryEstimationHelper.getEstimatedSizeOfIntegerList(regionIds);
     return size;
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDevice.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowStatement.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,7 @@ public List<Node> getNodes() {`
`168`	`168`	`public long ramBytesUsed() {`
`169`	`169`	`long size = INSTANCE_SIZE;`
`170`	`170`	`size += ramBytesUsedExcludingInstanceSize();`
`171`		`- if (asofExpression != null) {`
`172`		`- size += asofExpression.ramBytesUsed();`
`173`		`- }`
	`171`	`+ size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(asofExpression);`
`174`	`172`	`return size;`
`175`	`173`	`}`
`176`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,8 @@ public long ramBytesUsed() {`
`92`	`92`	`long size = INSTANCE_SIZE;`
`93`	`93`	`size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());`
`94`	`94`	`size += RamUsageEstimator.sizeOf(tableName);`
`95`		`- if (where.isPresent()) {`
`96`		`- size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;`
`97`		`- size += where.get() == null ? 0L : where.get().ramBytesUsed();`
`98`		`- }`
	`95`	`+ size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;`
	`96`	`+ size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(where.orElse(null));`
`99`	`97`	`return size;`
`100`	`98`	`}`
`101`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,10 +117,7 @@ public long ramBytesUsed() {`
`117`	`117`	`size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());`
`118`	`118`	`size += tableName == null ? 0L : tableName.ramBytesUsed();`
`119`	`119`	`size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(indexName);`
`120`		`- size += RamUsageEstimator.shallowSizeOf(columnList);`
`121`		`- for (Identifier column : columnList) {`
`122`		`- size += column == null ? 0L : column.ramBytesUsed();`
`123`		`- }`
	`120`	`+ size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(columnList);`
`124`	`121`	`return size;`
`125`	`122`	`}`
`126`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public boolean shallowEquals(Node other) {`
`84`	`84`	`public long ramBytesUsed() {`
`85`	`85`	`long size = INSTANCE_SIZE;`
`86`	`86`	`size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());`
`87`		`- size += pattern == null ? 0L : pattern.ramBytesUsed();`
	`87`	`+ size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(pattern);`
`88`	`88`	`return size;`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public int getDataNodeId() {`
`82`	`82`	`public long ramBytesUsed() {`
`83`	`83`	`long size = INSTANCE_SIZE;`
`84`	`84`	`size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());`
`85`		`- size += RamUsageEstimator.shallowSizeOf(regionIds);`
	`85`	`+ size += AstMemoryEstimationHelper.getEstimatedSizeOfIntegerList(regionIds);`
`86`	`86`	`return size;`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,10 +145,8 @@ public FrameBound(ByteBuffer byteBuffer) {`
`145`	`145`	`public long ramBytesUsed() {`
`146`	`146`	`long size = INSTANCE_SIZE;`
`147`	`147`	`size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());`
`148`		`- if (value.isPresent()) {`
`149`		`- size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;`
`150`		`- size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(value.get());`
`151`		`- }`
	`148`	`+ size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;`
	`149`	`+ size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(value.orElse(null));`
`152`	`150`	`return size;`
`153`	`151`	`}`
`154`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -344,20 +344,15 @@ public long ramBytesUsed() {`
`344`	`344`	`size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());`
`345`	`345`	`size += name == null ? 0L : name.ramBytesUsed();`
`346`	`346`	`size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeList(arguments);`
	`347`	`+ size += 3 * AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;`
`347`	`348`	`if (window.isPresent()) {`
`348`		`- size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;`
`349`	`349`	`Window windowValue = window.get();`
`350`	`350`	`if (windowValue instanceof Node) {`
`351`	`351`	`size += ((Node) windowValue).ramBytesUsed();`
`352`	`352`	`}`
`353`	`353`	`}`
`354`		`- if (processingMode.isPresent()) {`
`355`		`- size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;`
`356`		`- size += processingMode.get().ramBytesUsed();`
`357`		`- }`
`358`		`- if (nullTreatment.isPresent()) {`
`359`		`- size += AstMemoryEstimationHelper.OPTIONAL_INSTANCE_SIZE;`
`360`		`- }`
	`354`	`+ size +=`
	`355`	`+ AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(processingMode.orElse(null));`
`361`	`356`	`return size;`
`362`	`357`	`}`
`363`	`358`	`}`