Skip to content

Commit 8208689

Browse files
committed
fix: Refines memory computation of CountDevice
1 parent c4904c7 commit 8208689

File tree

1 file changed

+1
-20
lines changed
  • iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast

1 file changed

+1
-20
lines changed

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountDevice.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.apache.iotdb.commons.schema.column.ColumnHeader;
2323
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
2424
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
25-
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.impl.ShowDevicesResult;
2625

2726
import org.apache.tsfile.enums.TSDataType;
2827
import org.apache.tsfile.read.common.block.TsBlock;
@@ -72,24 +71,6 @@ public String toString() {
7271

7372
@Override
7473
public long ramBytesUsed() {
75-
long size = INSTANCE_SIZE;
76-
size += AstMemoryEstimationHelper.getEstimatedSizeOfNodeLocation(getLocationInternal());
77-
size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(table);
78-
size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(where);
79-
size += RamUsageEstimator.sizeOf(database);
80-
size += RamUsageEstimator.sizeOf(tableName);
81-
size += RamUsageEstimator.shallowSizeOf(tagDeterminedFilterList);
82-
size += AstMemoryEstimationHelper.getEstimatedSizeOfAccountableObject(tagFuzzyPredicate);
83-
size += RamUsageEstimator.shallowSizeOf(columnHeaderList);
84-
size += AstMemoryEstimationHelper.getEstimatedSizeOfStringList(getAttributeColumns());
85-
if (results != null) {
86-
size += RamUsageEstimator.shallowSizeOf(results);
87-
for (ShowDevicesResult result : results) {
88-
if (result != null) {
89-
size += result.ramBytesUsed();
90-
}
91-
}
92-
}
93-
return size;
74+
return INSTANCE_SIZE + ramBytesUsedForCommonFields();
9475
}
9576
}

0 commit comments

Comments
 (0)