This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch dev/1.1
in repository https://gitbox.apache.org/repos/asf/tsfile.git
The following commit(s) were added to refs/heads/dev/1.1 by this push:
new 2fb68291 [to dev/1.1] Avoid calculating shallow size of map
2fb68291 is described below
commit 2fb682913a12602c652996ca298d231eb6df2e64
Author: shuwenwei <[email protected]>
AuthorDate: Fri Aug 1 16:51:07 2025 +0800
[to dev/1.1] Avoid calculating shallow size of map
---
.../org/apache/tsfile/utils/RamUsageEstimator.java | 34 ++++++++++++++++++++++
.../tsfile/write/schema/MeasurementSchema.java | 5 +++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git
a/java/common/src/main/java/org/apache/tsfile/utils/RamUsageEstimator.java
b/java/common/src/main/java/org/apache/tsfile/utils/RamUsageEstimator.java
index 2f1cf3db..4c4217fd 100644
--- a/java/common/src/main/java/org/apache/tsfile/utils/RamUsageEstimator.java
+++ b/java/common/src/main/java/org/apache/tsfile/utils/RamUsageEstimator.java
@@ -29,9 +29,11 @@ import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* This class is copied from apache lucene, version 8.4.0. Estimates the
size(memory representation)
@@ -302,6 +304,23 @@ public final class RamUsageEstimator {
/** Recurse only into immediate descendants. */
public static final int MAX_DEPTH = 1;
+ public static final long SHALLOW_SIZE_OF_HASHMAP =
+ RamUsageEstimator.shallowSizeOfInstance(HashMap.class);
+ public static long SHALLOW_SIZE_OF_HASHMAP_ENTRY;
+ public static final long SHALLOW_SIZE_OF_CONCURRENT_HASHMAP =
+ RamUsageEstimator.shallowSizeOfInstance(ConcurrentHashMap.class);
+ public static long SHALLOW_SIZE_OF_CONCURRENT_HASHMAP_ENTRY;
+
+ static {
+ Map<Integer, Integer> map = new HashMap<>(1);
+ map.put(1, 1);
+ Map.Entry<Integer, Integer> next = map.entrySet().iterator().next();
+ SHALLOW_SIZE_OF_HASHMAP_ENTRY = RamUsageEstimator.shallowSizeOf(next);
+ map = new ConcurrentHashMap<>(map);
+ SHALLOW_SIZE_OF_CONCURRENT_HASHMAP_ENTRY =
+ RamUsageEstimator.shallowSizeOf(map.entrySet().iterator().next());
+ }
+
/**
* Returns the size in bytes of a Map object, including sizes of its keys
and values, supplying
* {@link #UNKNOWN_DEFAULT_RAM_BYTES_USED} when object type is not well
known. This method
@@ -340,6 +359,21 @@ public final class RamUsageEstimator {
return alignObjectSize(size);
}
+ public static long sizeOfMapWithKnownShallowSize(
+ Map<?, ?> map, long shallowSizeOfMap, long shallowSizeOfMapEntry) {
+ if (map == null) {
+ return 0;
+ }
+ int depth = 0;
+ long defSize = UNKNOWN_DEFAULT_RAM_BYTES_USED;
+ long size = shallowSizeOfMap + map.size() * shallowSizeOfMapEntry;
+ for (Map.Entry<?, ?> entry : map.entrySet()) {
+ size += sizeOfObject(entry.getKey(), depth, defSize);
+ size += sizeOfObject(entry.getValue(), depth, defSize);
+ }
+ return alignObjectSize(size);
+ }
+
/**
* Returns the size in bytes of a Collection object, including sizes of its
values, supplying
* {@link #UNKNOWN_DEFAULT_RAM_BYTES_USED} when object type is not well
known. This method
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchema.java
b/java/tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchema.java
index b3f20ac4..c2f5bd4a 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchema.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchema.java
@@ -455,6 +455,9 @@ public class MeasurementSchema
public long ramBytesUsed() {
return INSTANCE_SIZE
+ RamUsageEstimator.sizeOf(measurementId)
- + RamUsageEstimator.sizeOfMap(props);
+ + RamUsageEstimator.sizeOfMapWithKnownShallowSize(
+ props,
+ RamUsageEstimator.SHALLOW_SIZE_OF_HASHMAP,
+ RamUsageEstimator.SHALLOW_SIZE_OF_HASHMAP_ENTRY);
}
}
