This is an automated email from the ASF dual-hosted git repository.
shuwenwei pushed a commit to branch addMemoryControlForModEntriesInQuery
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to
refs/heads/addMemoryControlForModEntriesInQuery by this push:
new b83e44c5866 move some methods to tsfile
b83e44c5866 is described below
commit b83e44c58667b2c46bf01dc9d903490cea7e553d
Author: shuwenwei <[email protected]>
AuthorDate: Mon Aug 11 17:01:05 2025 +0800
move some methods to tsfile
---
.../execution/MemoryEstimationHelper.java | 44 ----------------------
.../dataregion/modification/DeletionPredicate.java | 3 +-
.../dataregion/modification/IDPredicate.java | 4 +-
.../apache/iotdb/commons/path/PathPatternNode.java | 4 +-
4 files changed, 4 insertions(+), 51 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java
index 42fd6731974..7c548877a78 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java
@@ -32,7 +32,6 @@ import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Set;
public class MemoryEstimationHelper {
@@ -123,47 +122,4 @@ public class MemoryEstimationHelper {
size += INTEGER_INSTANCE_SIZE * integerArrayList.size();
return RamUsageEstimator.alignObjectSize(size);
}
-
- public static long getEstimatedSizeOfStringArrayList(List<String>
stringArrayList) {
- if (stringArrayList == null) {
- return 0L;
- }
- long size = ARRAY_LIST_INSTANCE_SIZE;
- size +=
- (long) RamUsageEstimator.NUM_BYTES_ARRAY_HEADER
- + (long) stringArrayList.size() * (long)
RamUsageEstimator.NUM_BYTES_OBJECT_REF;
- for (String str : stringArrayList) {
- size += RamUsageEstimator.sizeOf(str);
- }
- return RamUsageEstimator.alignObjectSize(size);
- }
-
- public static long getEstimatedSizeOfAccountableArrayList(
- List<? extends Accountable> stringArrayList) {
- if (stringArrayList == null) {
- return 0L;
- }
- long size = ARRAY_LIST_INSTANCE_SIZE;
- size +=
- (long) RamUsageEstimator.NUM_BYTES_ARRAY_HEADER
- + (long) stringArrayList.size() * (long)
RamUsageEstimator.NUM_BYTES_OBJECT_REF;
- for (Accountable obj : stringArrayList) {
- size += RamUsageEstimator.sizeOfObject(obj);
- }
- return RamUsageEstimator.alignObjectSize(size);
- }
-
- public static long getEstimatedSizeOfHashSet(Set<?> set) {
- if (set == null) {
- return 0L;
- } else {
- long size =
- RamUsageEstimator.SHALLOW_SIZE_OF_HASHMAP
- + (long) set.size() *
RamUsageEstimator.SHALLOW_SIZE_OF_HASHMAP_ENTRY;
- for (Object obj : set) {
- size += RamUsageEstimator.sizeOfObject(obj);
- }
- return RamUsageEstimator.alignObjectSize(size);
- }
- }
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/DeletionPredicate.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/DeletionPredicate.java
index 5f0272e8da9..7e79e8f580d 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/DeletionPredicate.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/DeletionPredicate.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.db.storageengine.dataregion.modification;
-import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import
org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.NOP;
import org.apache.iotdb.db.utils.io.BufferSerializable;
import org.apache.iotdb.db.utils.io.StreamSerializable;
@@ -191,6 +190,6 @@ public class DeletionPredicate implements
StreamSerializable, BufferSerializable
return SHALLOW_SIZE
+ RamUsageEstimator.sizeOf(tableName)
+ RamUsageEstimator.sizeOfObject(idPredicate)
- +
MemoryEstimationHelper.getEstimatedSizeOfStringArrayList(measurementNames);
+ + RamUsageEstimator.sizeOfArrayList(measurementNames);
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/IDPredicate.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/IDPredicate.java
index 9c6a464350f..44741f9e679 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/IDPredicate.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/IDPredicate.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.db.storageengine.dataregion.modification;
-import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.utils.io.BufferSerializable;
import org.apache.iotdb.db.utils.io.StreamSerializable;
@@ -432,8 +431,7 @@ public abstract class IDPredicate implements
StreamSerializable, BufferSerializa
@Override
public long ramBytesUsed() {
- return SHALLOW_SIZE
- +
MemoryEstimationHelper.getEstimatedSizeOfAccountableArrayList(predicates);
+ return SHALLOW_SIZE + RamUsageEstimator.sizeOfArrayList(predicates);
}
}
}
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternNode.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternNode.java
index 3ff41f251a1..67616c5070b 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternNode.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternNode.java
@@ -281,8 +281,8 @@ public class PathPatternNode<V, S extends
PathPatternNode.Serializer<V>> impleme
public long ramBytesUsed() {
return SHALLOW_SIZE
+ RamUsageEstimator.sizeOf(name)
- + RamUsageEstimator.sizeOfCollection(valueSet)
- +
RamUsageEstimator.sizeOfCollection(childrenNamesWithNonTrivialWildcard)
+ + RamUsageEstimator.sizeOfHashSet(valueSet)
+ + RamUsageEstimator.sizeOfHashSet(childrenNamesWithNonTrivialWildcard)
+ RamUsageEstimator.sizeOfMapWithKnownShallowSize(
children,
RamUsageEstimator.SHALLOW_SIZE_OF_HASHMAP,
