Skip to content

Use RamUsageEstimator instead of ClassLayout in ColumnBuilderStatus #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisdutz merged 1 commit into from
Jan 4, 2024
Merged

Use RamUsageEstimator instead of ClassLayout in ColumnBuilderStatus #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...i/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnBuilderStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.apache.iotdb.tsfile.read.common.block.column;

import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus;
import org.apache.iotdb.tsfile.utils.RamUsageEstimator;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
Expand All @@ -29,7 +30,7 @@

public class ColumnBuilderStatus {

public static final int INSTANCE_SIZE = deepInstanceSize(ColumnBuilderStatus.class);
public static final long INSTANCE_SIZE = deepInstanceSize(ColumnBuilderStatus.class);

private final TsBlockBuilderStatus tsBlockBuilderStatus;

Expand Down Expand Up @@ -57,7 +58,7 @@ public String toString() {
/**
* Computes the size of an instance of this class assuming that all reference fields are non-null
*/
private static int deepInstanceSize(Class<?> clazz) {
private static long deepInstanceSize(Class<?> clazz) {
if (clazz.isArray()) {
throw new IllegalArgumentException(
format(
Expand All @@ -76,7 +77,7 @@ private static int deepInstanceSize(Class<?> clazz) {
clazz.getSimpleName(), clazz.getSuperclass().getSimpleName()));
}

int size = ClassLayout.parseClass(clazz).instanceSize();
long size = RamUsageEstimator.shallowSizeOf(clazz);
for (Field field : clazz.getDeclaredFields()) {
// if the field is not static and is a reference field and it's not synthetic
if (!Modifier.isStatic(field.getModifiers())
Expand Down