Skip to content

Fix calculation error in deepInstanceSize of BlockBuilderStatus #11710

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
sopel39 merged 1 commit into from
Apr 5, 2022
Merged

Fix calculation error in deepInstanceSize of BlockBuilderStatus #11710

Show file tree
Hide file tree
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
33 changes: 1 addition & 32 deletions core/trino-spi/src/main/java/io/trino/spi/block/BlockBuilderStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,11 @@

import org.openjdk.jol.info.ClassLayout;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;

import static java.lang.String.format;
import static java.util.Objects.requireNonNull;

public class BlockBuilderStatus
{
public static final int INSTANCE_SIZE = deepInstanceSize(BlockBuilderStatus.class);
public static final int INSTANCE_SIZE = ClassLayout.parseClass(BlockBuilderStatus.class).instanceSize() + PageBuilderStatus.INSTANCE_SIZE;

private final PageBuilderStatus pageBuilderStatus;

Expand Down Expand Up @@ -53,31 +49,4 @@ public String toString()
buffer.append('}');
return buffer.toString();
}

/**
* Computes the size of an instance of this class assuming that all reference fields are non-null
*/
private static int deepInstanceSize(Class<?> clazz)
{
if (clazz.isArray()) {
throw new IllegalArgumentException(format("Cannot determine size of %s because it contains an array", clazz.getSimpleName()));
}
if (clazz.isInterface()) {
throw new IllegalArgumentException(format("%s is an interface", clazz.getSimpleName()));
}
if (Modifier.isAbstract(clazz.getModifiers())) {
throw new IllegalArgumentException(format("%s is abstract", clazz.getSimpleName()));
}
if (!clazz.getSuperclass().equals(Object.class)) {
throw new IllegalArgumentException(format("Cannot determine size of a subclass. %s extends from %s", clazz.getSimpleName(), clazz.getSuperclass().getSimpleName()));
}

int size = ClassLayout.parseClass(clazz).instanceSize();
for (Field field : clazz.getDeclaredFields()) {
if (!field.getType().isPrimitive()) {
size += deepInstanceSize(field.getType());
}
}
return size;
}
}
4 changes: 4 additions & 0 deletions core/trino-spi/src/main/java/io/trino/spi/block/PageBuilderStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@
*/
package io.trino.spi.block;

import org.openjdk.jol.info.ClassLayout;

public class PageBuilderStatus
{
public static final int INSTANCE_SIZE = ClassLayout.parseClass(PageBuilderStatus.class).instanceSize();

public static final int DEFAULT_MAX_PAGE_SIZE_IN_BYTES = 1024 * 1024;

private final int maxPageSizeInBytes;
Expand Down