diff --git a/pom.xml b/pom.xml index ea19425f3a7ec..5a9947bc09d28 100644 --- a/pom.xml +++ b/pom.xml @@ -44,9 +44,9 @@ 3.3.9 4.13.2 - 0.227 + 0.228 ${dep.airlift.version} - 0.38 + 0.45 0.6 1.12.782 4.12.0 @@ -1511,7 +1511,7 @@ org.openjdk.jol jol-core - 0.2 + 0.17 diff --git a/presto-common/src/main/java/com/facebook/presto/common/Page.java b/presto-common/src/main/java/com/facebook/presto/common/Page.java index 8eb4fe7550cc5..fbd1f315f7b76 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/Page.java +++ b/presto-common/src/main/java/com/facebook/presto/common/Page.java @@ -44,7 +44,7 @@ */ public final class Page { - public static final int INSTANCE_SIZE = ClassLayout.parseClass(Page.class).instanceSize(); + public static final long INSTANCE_SIZE = ClassLayout.parseClass(Page.class).instanceSize(); private static final Block[] EMPTY_BLOCKS = new Block[0]; /** diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/AdaptiveLongBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/AdaptiveLongBigArray.java index 3e0f711471345..b878720020b38 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/AdaptiveLongBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/AdaptiveLongBigArray.java @@ -28,7 +28,7 @@ public class AdaptiveLongBigArray { // visible for testing - static final int INSTANCE_SIZE = ClassLayout.parseClass(AdaptiveLongBigArray.class).instanceSize(); + static final long INSTANCE_SIZE = ClassLayout.parseClass(AdaptiveLongBigArray.class).instanceSize(); // settings are constants due to efficiency considerations static final int INITIAL_SEGMENT_LENGTH = 16 * 1024; // 128KB diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/BlockBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/BlockBigArray.java index afb101c2a70d6..f99d3908584c3 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/BlockBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/BlockBigArray.java @@ -18,7 +18,7 @@ public final class BlockBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BlockBigArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BlockBigArray.class).instanceSize(); private final ObjectBigArray array; private final ReferenceCountMap trackedObjects = new ReferenceCountMap(); private long sizeOfBlocks; diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/BooleanBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/BooleanBigArray.java index 12c447097d022..e5155c8b4879d 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/BooleanBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/BooleanBigArray.java @@ -28,7 +28,7 @@ // Copyright (C) 2010-2013 Sebastiano Vigna public final class BooleanBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanBigArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanBigArray.class).instanceSize(); private static final long SIZE_OF_SEGMENT = sizeOfBooleanArray(SEGMENT_SIZE); private final boolean initialValue; diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/ByteBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/ByteBigArray.java index 8de6a0db97b47..356b3882d4098 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/ByteBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/ByteBigArray.java @@ -28,7 +28,7 @@ // Copyright (C) 2010-2013 Sebastiano Vigna public final class ByteBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ByteBigArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ByteBigArray.class).instanceSize(); private static final long SIZE_OF_SEGMENT = sizeOfByteArray(SEGMENT_SIZE); private final byte initialValue; diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/DoubleBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/DoubleBigArray.java index ef564a18a0e3e..96f737d465a6c 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/DoubleBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/DoubleBigArray.java @@ -28,7 +28,7 @@ // Copyright (C) 2010-2013 Sebastiano Vigna public final class DoubleBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DoubleBigArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DoubleBigArray.class).instanceSize(); private static final long SIZE_OF_SEGMENT = sizeOfDoubleArray(SEGMENT_SIZE); private final double initialValue; diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/IntBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/IntBigArray.java index 6d88720ea5c99..3198ce780381f 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/IntBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/IntBigArray.java @@ -28,7 +28,7 @@ // Copyright (C) 2010-2013 Sebastiano Vigna public final class IntBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(IntBigArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(IntBigArray.class).instanceSize(); private static final long SIZE_OF_SEGMENT = sizeOfIntArray(SEGMENT_SIZE); private final int initialValue; diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/LongBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/LongBigArray.java index 7f2689f71bdf8..bb37133b38699 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/LongBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/LongBigArray.java @@ -28,7 +28,7 @@ // Copyright (C) 2010-2013 Sebastiano Vigna public final class LongBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongBigArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongBigArray.class).instanceSize(); private static final long SIZE_OF_SEGMENT = sizeOfLongArray(SEGMENT_SIZE); private final long initialValue; diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/ObjectBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/ObjectBigArray.java index 2896461190564..8f4942154b7c1 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/ObjectBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/ObjectBigArray.java @@ -28,7 +28,7 @@ // Copyright (C) 2010-2013 Sebastiano Vigna public final class ObjectBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ObjectBigArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ObjectBigArray.class).instanceSize(); private static final long SIZE_OF_SEGMENT = sizeOfObjectArray(SEGMENT_SIZE); private final Object initialValue; diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/ReferenceCountMap.java b/presto-common/src/main/java/com/facebook/presto/common/array/ReferenceCountMap.java index f58e403b35d2a..17ef5625d6ac5 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/ReferenceCountMap.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/ReferenceCountMap.java @@ -35,7 +35,7 @@ public final class ReferenceCountMap extends Long2IntOpenHashMap { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ReferenceCountMap.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ReferenceCountMap.class).instanceSize(); /** * Increments the reference count of an object by 1 and returns the updated reference count diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/ShortBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/ShortBigArray.java index 6ee0443cde305..ef88f2d49a98b 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/ShortBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/ShortBigArray.java @@ -28,7 +28,7 @@ // Copyright (C) 2010-2013 Sebastiano Vigna public final class ShortBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ShortBigArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ShortBigArray.class).instanceSize(); private static final long SIZE_OF_SEGMENT = sizeOfShortArray(SEGMENT_SIZE); private final short initialValue; diff --git a/presto-common/src/main/java/com/facebook/presto/common/array/SliceBigArray.java b/presto-common/src/main/java/com/facebook/presto/common/array/SliceBigArray.java index 43166c260fa16..1dc7721f355fc 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/array/SliceBigArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/array/SliceBigArray.java @@ -18,8 +18,8 @@ public final class SliceBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SliceBigArray.class).instanceSize(); - private static final int SLICE_INSTANCE_SIZE = ClassLayout.parseClass(Slice.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SliceBigArray.class).instanceSize(); + private static final long SLICE_INSTANCE_SIZE = ClassLayout.parseClass(Slice.class).instanceSize(); private final ObjectBigArray array; private final ReferenceCountMap trackedSlices = new ReferenceCountMap(); private long sizeOfSlices; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/AbstractMapBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/AbstractMapBlock.java index d1342501e9a15..67e07026bca73 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/AbstractMapBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/AbstractMapBlock.java @@ -427,7 +427,7 @@ private void checkReadablePosition(int position) public static class HashTables { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(HashTables.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(HashTables.class).instanceSize(); // Hash to location in map. Writes to the field by MapBlock is protected by "HashTables" monitor in MapBlock. // MapBlockBuilder instances have their dedicated hashTables instances, so the write accesses to the hashTables diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlock.java index 8f5c2a60eaa17..a6551bd40a308 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlock.java @@ -28,7 +28,7 @@ public class ArrayBlock extends AbstractArrayBlock { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ArrayBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ArrayBlock.class).instanceSize(); private final int arrayOffset; private final int positionCount; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlockBuilder.java index 866022de09a97..90bb690623bb5 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlockBuilder.java @@ -32,7 +32,7 @@ public class ArrayBlockBuilder extends AbstractArrayBlock implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ArrayBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ArrayBlockBuilder.class).instanceSize(); private int positionCount; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/BlockBuilderStatus.java b/presto-common/src/main/java/com/facebook/presto/common/block/BlockBuilderStatus.java index 41a9efe70dff3..2d184ca9685ea 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/BlockBuilderStatus.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/BlockBuilderStatus.java @@ -19,7 +19,7 @@ public class BlockBuilderStatus { - public static final int INSTANCE_SIZE = ClassLayout.parseClass(BlockBuilderStatus.class).instanceSize() + PageBuilderStatus.INSTANCE_SIZE; + public static final long INSTANCE_SIZE = ClassLayout.parseClass(BlockBuilderStatus.class).instanceSize() + PageBuilderStatus.INSTANCE_SIZE; private final PageBuilderStatus pageBuilderStatus; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlock.java index 3f025870df11e..5e7699da1d84d 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlock.java @@ -44,7 +44,7 @@ public class ByteArrayBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ByteArrayBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ByteArrayBlock.class).instanceSize(); public static final int SIZE_IN_BYTES_PER_POSITION = Byte.BYTES + Byte.BYTES; private final int arrayOffset; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlockBuilder.java index ba38e0017bc3d..a3054e9129ce5 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlockBuilder.java @@ -33,7 +33,7 @@ public class ByteArrayBlockBuilder implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ByteArrayBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ByteArrayBlockBuilder.class).instanceSize(); private static final Block NULL_VALUE_BLOCK = new ByteArrayBlock(0, 1, new boolean[] {true}, new byte[1]); @Nullable diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarArray.java b/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarArray.java index 506ea084fcd21..0d9b1df1102c6 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarArray.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarArray.java @@ -20,7 +20,7 @@ public class ColumnarArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ColumnarArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ColumnarArray.class).instanceSize(); private final Block nullCheckBlock; private final int offsetsOffset; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarMap.java b/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarMap.java index c6d0c7ad9cbb2..7bac295486647 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarMap.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarMap.java @@ -21,7 +21,7 @@ public class ColumnarMap { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ColumnarMap.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ColumnarMap.class).instanceSize(); private final Block nullCheckBlock; private final int offsetsOffset; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarRow.java b/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarRow.java index e5c0276ed71ed..db7f24adce638 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarRow.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarRow.java @@ -20,7 +20,7 @@ public final class ColumnarRow { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ColumnarRow.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ColumnarRow.class).instanceSize(); private final Block nullCheckBlock; private final Block[] fields; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/DictionaryBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/DictionaryBlock.java index 29f28815f2994..60b4fb047d92b 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/DictionaryBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/DictionaryBlock.java @@ -53,7 +53,7 @@ public class DictionaryBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DictionaryBlock.class).instanceSize() + ClassLayout.parseClass(DictionaryId.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DictionaryBlock.class).instanceSize() + ClassLayout.parseClass(DictionaryId.class).instanceSize(); private static final int NULL_NOT_FOUND = -1; private final int positionCount; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlock.java index d3b4c6a81abe2..8560e6aaee382 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlock.java @@ -42,7 +42,7 @@ public class Int128ArrayBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int128ArrayBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int128ArrayBlock.class).instanceSize(); public static final int INT128_BYTES = Long.BYTES + Long.BYTES; public static final int SIZE_IN_BYTES_PER_POSITION = INT128_BYTES + Byte.BYTES; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlockBuilder.java index 9daf19e7f1f90..a03b2162f3709 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlockBuilder.java @@ -40,7 +40,7 @@ public class Int128ArrayBlockBuilder implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int128ArrayBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int128ArrayBlockBuilder.class).instanceSize(); private static final Block NULL_VALUE_BLOCK = new Int128ArrayBlock(0, 1, new boolean[] {true}, new long[2]); @Nullable diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlock.java index 11a4139425ddb..e50da2532c3a3 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlock.java @@ -37,7 +37,7 @@ public class IntArrayBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(IntArrayBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(IntArrayBlock.class).instanceSize(); public static final int SIZE_IN_BYTES_PER_POSITION = Integer.BYTES + Byte.BYTES; private final int arrayOffset; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlockBuilder.java index 1c3c2d5c10d3b..fab6c4c3af90c 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlockBuilder.java @@ -33,7 +33,7 @@ public class IntArrayBlockBuilder implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(IntArrayBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(IntArrayBlockBuilder.class).instanceSize(); private static final Block NULL_VALUE_BLOCK = new IntArrayBlock(0, 1, new boolean[] {true}, new int[1]); @Nullable diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/LazyBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/LazyBlock.java index 079b29c19ac5f..db4b3aa9c51dd 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/LazyBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/LazyBlock.java @@ -25,7 +25,7 @@ public class LazyBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LazyBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LazyBlock.class).instanceSize(); private final int positionCount; private LazyBlockLoader loader; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlock.java index 43e3cae5eda64..17ee1dfad4714 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlock.java @@ -38,7 +38,7 @@ public class LongArrayBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongArrayBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongArrayBlock.class).instanceSize(); public static final int SIZE_IN_BYTES_PER_POSITION = Long.BYTES + Byte.BYTES; private final int arrayOffset; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlockBuilder.java index e3dd877a72f83..5172ababaf959 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlockBuilder.java @@ -34,7 +34,7 @@ public class LongArrayBlockBuilder implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongArrayBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongArrayBlockBuilder.class).instanceSize(); private static final Block NULL_VALUE_BLOCK = new LongArrayBlock(0, 1, new boolean[] {true}, new long[1]); @Nullable diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/MapBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/MapBlock.java index fbe0520ab7b7e..2bb9b5d0c0517 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/MapBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/MapBlock.java @@ -31,7 +31,7 @@ public class MapBlock extends AbstractMapBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapBlock.class).instanceSize(); private final int startOffset; private final int positionCount; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/MapBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/MapBlockBuilder.java index 28630e5a78000..b00fbf5d66dc3 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/MapBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/MapBlockBuilder.java @@ -36,7 +36,7 @@ public class MapBlockBuilder extends AbstractMapBlock implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapBlockBuilder.class).instanceSize(); private final MethodHandle keyBlockEquals; private final MethodHandle keyBlockHashCode; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/PageBuilderStatus.java b/presto-common/src/main/java/com/facebook/presto/common/block/PageBuilderStatus.java index 8b48bd151ffcc..42d7b4d30f3bb 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/PageBuilderStatus.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/PageBuilderStatus.java @@ -17,7 +17,7 @@ public class PageBuilderStatus { - public static final int INSTANCE_SIZE = ClassLayout.parseClass(PageBuilderStatus.class).instanceSize(); + public static final long INSTANCE_SIZE = ClassLayout.parseClass(PageBuilderStatus.class).instanceSize(); public static final int DEFAULT_MAX_PAGE_SIZE_IN_BYTES = 1024 * 1024; private final int maxPageSizeInBytes; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/RowBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/RowBlock.java index 42ce04160cb20..0911949fefccf 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/RowBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/RowBlock.java @@ -32,7 +32,7 @@ public class RowBlock extends AbstractRowBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(RowBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(RowBlock.class).instanceSize(); private final int startOffset; private final int positionCount; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/RowBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/RowBlockBuilder.java index 905446bee6890..dd2a0738f36ea 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/RowBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/RowBlockBuilder.java @@ -34,7 +34,7 @@ public class RowBlockBuilder extends AbstractRowBlock implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(RowBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(RowBlockBuilder.class).instanceSize(); @Nullable private final BlockBuilderStatus blockBuilderStatus; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/RunLengthEncodedBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/RunLengthEncodedBlock.java index 28a553ca9184b..c5d28254c09e4 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/RunLengthEncodedBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/RunLengthEncodedBlock.java @@ -34,7 +34,7 @@ public class RunLengthEncodedBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(RunLengthEncodedBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(RunLengthEncodedBlock.class).instanceSize(); public static Block create(Type type, Object value, int positionCount) { diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlock.java index d2bc76964e1e6..8577e3afd9159 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlock.java @@ -35,7 +35,7 @@ public class ShortArrayBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ShortArrayBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ShortArrayBlock.class).instanceSize(); public static final int SIZE_IN_BYTES_PER_POSITION = Short.BYTES + Byte.BYTES; private final int arrayOffset; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlockBuilder.java index a60b736677dbd..a3df3bb730174 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlockBuilder.java @@ -33,7 +33,7 @@ public class ShortArrayBlockBuilder implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ShortArrayBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ShortArrayBlockBuilder.class).instanceSize(); private static final Block NULL_VALUE_BLOCK = new ShortArrayBlock(0, 1, new boolean[] {true}, new short[1]); @Nullable diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/SingleArrayBlockWriter.java b/presto-common/src/main/java/com/facebook/presto/common/block/SingleArrayBlockWriter.java index a4d4df25e93f7..ad32dd69957f0 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/SingleArrayBlockWriter.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/SingleArrayBlockWriter.java @@ -26,7 +26,7 @@ public class SingleArrayBlockWriter extends AbstractSingleArrayBlock implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleArrayBlockWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleArrayBlockWriter.class).instanceSize(); private final BlockBuilder blockBuilder; private int positionsWritten; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlock.java index b3dae6395630e..aa173066d48f6 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlock.java @@ -33,7 +33,7 @@ public class SingleMapBlock extends AbstractSingleMapBlock { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleMapBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleMapBlock.class).instanceSize(); private final int positionInMap; private final int offset; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlockWriter.java b/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlockWriter.java index 93e914edba9e5..babde268398f7 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlockWriter.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlockWriter.java @@ -26,7 +26,7 @@ public class SingleMapBlockWriter extends AbstractSingleMapBlock implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleMapBlockWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleMapBlockWriter.class).instanceSize(); private final int offset; private final BlockBuilder keyBlockBuilder; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/SingleRowBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/SingleRowBlock.java index 3119ee9259019..212fdff18147e 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/SingleRowBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/SingleRowBlock.java @@ -26,7 +26,7 @@ public class SingleRowBlock extends AbstractSingleRowBlock { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleRowBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleRowBlock.class).instanceSize(); private final Block[] fieldBlocks; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/SingleRowBlockWriter.java b/presto-common/src/main/java/com/facebook/presto/common/block/SingleRowBlockWriter.java index b3621019573a1..b0d5a2b01875c 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/SingleRowBlockWriter.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/SingleRowBlockWriter.java @@ -26,7 +26,7 @@ public class SingleRowBlockWriter extends AbstractSingleRowBlock implements BlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleRowBlockWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleRowBlockWriter.class).instanceSize(); private final BlockBuilder[] fieldBlockBuilders; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlock.java index 51d339f72bae4..1e3f1868d6339 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlock.java @@ -48,7 +48,7 @@ public class VariableWidthBlock extends AbstractVariableWidthBlock { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(VariableWidthBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(VariableWidthBlock.class).instanceSize(); private final int arrayOffset; private final int positionCount; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlockBuilder.java index 6f14f596892b6..b99af187e5838 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlockBuilder.java @@ -51,7 +51,7 @@ public class VariableWidthBlockBuilder extends AbstractVariableWidthBlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(VariableWidthBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(VariableWidthBlockBuilder.class).instanceSize(); private BlockBuilderStatus blockBuilderStatus; diff --git a/presto-common/src/main/java/com/facebook/presto/common/io/OutputStreamDataSink.java b/presto-common/src/main/java/com/facebook/presto/common/io/OutputStreamDataSink.java index c368f9c562199..9515468343d5a 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/io/OutputStreamDataSink.java +++ b/presto-common/src/main/java/com/facebook/presto/common/io/OutputStreamDataSink.java @@ -25,7 +25,7 @@ public class OutputStreamDataSink implements DataSink { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(OutputStreamDataSink.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(OutputStreamDataSink.class).instanceSize(); private final OutputStreamSliceOutput output; diff --git a/presto-common/src/test/java/com/facebook/presto/common/block/TestVariableWidthBlockBuilder.java b/presto-common/src/test/java/com/facebook/presto/common/block/TestVariableWidthBlockBuilder.java index 664b18896ab3e..a48eeb304052f 100644 --- a/presto-common/src/test/java/com/facebook/presto/common/block/TestVariableWidthBlockBuilder.java +++ b/presto-common/src/test/java/com/facebook/presto/common/block/TestVariableWidthBlockBuilder.java @@ -34,8 +34,8 @@ public class TestVariableWidthBlockBuilder { - private static final int BLOCK_BUILDER_INSTANCE_SIZE = parseClass(VariableWidthBlockBuilder.class).instanceSize(); - private static final int SLICE_INSTANCE_SIZE = parseClass(DynamicSliceOutput.class).instanceSize() + parseClass(Slice.class).instanceSize(); + private static final long BLOCK_BUILDER_INSTANCE_SIZE = parseClass(VariableWidthBlockBuilder.class).instanceSize(); + private static final long SLICE_INSTANCE_SIZE = parseClass(DynamicSliceOutput.class).instanceSize() + parseClass(Slice.class).instanceSize(); private static final int VARCHAR_VALUE_SIZE = 7; private static final int VARCHAR_ENTRY_SIZE = SIZE_OF_INT + VARCHAR_VALUE_SIZE; private static final int EXPECTED_ENTRY_COUNT = 3; diff --git a/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/Rectangle.java b/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/Rectangle.java index 1432d210c3a42..58c11f3f0892e 100644 --- a/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/Rectangle.java +++ b/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/Rectangle.java @@ -29,7 +29,7 @@ public final class Rectangle implements HasExtent { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Rectangle.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Rectangle.class).instanceSize(); private static final Rectangle UNIVERSE_RECTANGLE = new Rectangle( Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, diff --git a/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/rtree/Flatbush.java b/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/rtree/Flatbush.java index f31c00b2c804f..548caa446a53d 100644 --- a/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/rtree/Flatbush.java +++ b/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/rtree/Flatbush.java @@ -72,7 +72,7 @@ public class Flatbush // Number of coordinates to define an envelope @VisibleForTesting static final int ENVELOPE_SIZE = 4; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Flatbush.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Flatbush.class).instanceSize(); private static final int DEFAULT_DEGREE = 16; // Number of children per node private final int degree; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveType.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveType.java index b1a8bbb47d13a..d763eb08a2285 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveType.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveType.java @@ -77,7 +77,7 @@ public final class HiveType { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(HiveType.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(HiveType.class).instanceSize(); public static final HiveType HIVE_BOOLEAN = new HiveType(booleanTypeInfo); public static final HiveType HIVE_BYTE = new HiveType(byteTypeInfo); @@ -349,7 +349,7 @@ public static Type getPrimitiveType(PrimitiveTypeInfo typeInfo) } } - public int getEstimatedRetainedSizeInBytes() + public long getEstimatedRetainedSizeInBytes() { // Size of TypeInfo is not accounted as TypeInfo's are cached and retained by the TypeInfoFactory return INSTANCE_SIZE + hiveTypeName.getEstimatedSizeInBytes(); diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveTypeName.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveTypeName.java index 8ce4a32781f32..972f92a28f87e 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveTypeName.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveTypeName.java @@ -21,7 +21,7 @@ public final class HiveTypeName { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(String.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(String.class).instanceSize(); private final String value; @@ -41,7 +41,7 @@ public HiveType toHiveType() return HiveType.valueOf(value); } - public int getEstimatedSizeInBytes() + public long getEstimatedSizeInBytes() { return INSTANCE_SIZE + value.length() * Character.BYTES; } diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Column.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Column.java index bb1e7dc0c512b..2f426731e43d5 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Column.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Column.java @@ -28,7 +28,7 @@ @Immutable public class Column { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Column.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Column.class).instanceSize(); private final String name; private final HiveType type; @@ -103,10 +103,10 @@ public int hashCode() return Objects.hash(name, type, comment); } - public int getEstimatedSizeInBytes() + public long getEstimatedSizeInBytes() { - int result = INSTANCE_SIZE; - result += name.length() * Character.BYTES; + long result = INSTANCE_SIZE; + result += (long) name.length() * Character.BYTES; result += type.getEstimatedRetainedSizeInBytes(); result += comment.map(String::length).orElse(0); return result; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionKey.java b/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionKey.java index fd8564919d30e..7c567d0123916 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionKey.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionKey.java @@ -26,7 +26,7 @@ public final class HivePartitionKey { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(HivePartitionKey.class).instanceSize() + + private static final long INSTANCE_SIZE = ClassLayout.parseClass(HivePartitionKey.class).instanceSize() + ClassLayout.parseClass(String.class).instanceSize() * 2; private final String name; @@ -54,9 +54,9 @@ public Optional getValue() return Optional.ofNullable(value); } - public int getEstimatedSizeInBytes() + public long getEstimatedSizeInBytes() { - return INSTANCE_SIZE + name.length() * Character.BYTES + (value == null ? 0 : value.length() * Character.BYTES); + return INSTANCE_SIZE + (long) name.length() * Character.BYTES + (value == null ? 0 : (long) value.length() * Character.BYTES); } @Override diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitPartitionInfo.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitPartitionInfo.java index b2d00458aaa82..b0baadf15204a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitPartitionInfo.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitPartitionInfo.java @@ -32,7 +32,7 @@ */ public class HiveSplitPartitionInfo { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(HiveSplitPartitionInfo.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(HiveSplitPartitionInfo.class).instanceSize(); private final Storage storage; private final String path; @@ -118,15 +118,15 @@ public Set getRedundantColumnDomains() return redundantColumnDomains; } - public int getEstimatedSizeInBytes() + public long getEstimatedSizeInBytes() { - int result = INSTANCE_SIZE; + long result = INSTANCE_SIZE; result += sizeOfObjectArray(partitionKeys.size()); for (HivePartitionKey partitionKey : partitionKeys) { result += partitionKey.getEstimatedSizeInBytes(); } - result += partitionName.length() * Character.BYTES; + result += (long) partitionName.length() * Character.BYTES; result += tableToPartitionMapping.getEstimatedSizeInBytes(); return result; } diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/InternalHiveSplit.java b/presto-hive/src/main/java/com/facebook/presto/hive/InternalHiveSplit.java index 2ecf44843cb17..63067bf468347 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/InternalHiveSplit.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/InternalHiveSplit.java @@ -38,9 +38,9 @@ public class InternalHiveSplit { // Overhead of ImmutableList and ImmutableMap is not accounted for because of its complexity. - private static final int INSTANCE_SIZE = ClassLayout.parseClass(InternalHiveSplit.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(InternalHiveSplit.class).instanceSize(); - private static final int HOST_ADDRESS_INSTANCE_SIZE = ClassLayout.parseClass(HostAddress.class).instanceSize() + + private static final long HOST_ADDRESS_INSTANCE_SIZE = ClassLayout.parseClass(HostAddress.class).instanceSize() + ClassLayout.parseClass(String.class).instanceSize(); private final String path; @@ -251,9 +251,9 @@ public void reset() * PartitionInfo is a shared object, so its memory usage is * tracked separately in HiveSplitSource. */ - public int getEstimatedSizeInBytes() + public long getEstimatedSizeInBytes() { - int result = INSTANCE_SIZE; + long result = INSTANCE_SIZE; result += sizeOfCharArray(path.length()); result += sizeOf(blockEndOffsets); if (!blockAddresses.isEmpty()) { @@ -261,7 +261,7 @@ public int getEstimatedSizeInBytes() for (List addresses : blockAddresses) { result += sizeOfObjectArray(addresses.size()); for (HostAddress address : addresses) { - result += HOST_ADDRESS_INSTANCE_SIZE + address.getHostText().length() * Character.BYTES; + result += HOST_ADDRESS_INSTANCE_SIZE + (long) address.getHostText().length() * Character.BYTES; } } } diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriter.java index 3ee916a504c31..a8a17388999b1 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriter.java @@ -59,7 +59,7 @@ public class OrcFileWriter implements HiveFileWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(OrcFileWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(OrcFileWriter.class).instanceSize(); private static final ThreadMXBean THREAD_MX_BEAN = ManagementFactory.getThreadMXBean(); protected final OrcWriter orcWriter; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/RcFileFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/RcFileFileWriter.java index ee94e170eff84..145074d9b37c4 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/RcFileFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/RcFileFileWriter.java @@ -49,7 +49,7 @@ public class RcFileFileWriter implements HiveFileWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(RcFileFileWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(RcFileFileWriter.class).instanceSize(); private static final ThreadMXBean THREAD_MX_BEAN = ManagementFactory.getThreadMXBean(); private final CountingOutputStream outputStream; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/RecordFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/RecordFileWriter.java index 04edc2c71ffa1..ff8595d0c5370 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/RecordFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/RecordFileWriter.java @@ -60,7 +60,7 @@ public class RecordFileWriter implements HiveFileWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(RecordFileWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(RecordFileWriter.class).instanceSize(); private final Path path; private final JobConf conf; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java index 4c74193f71b43..77dcf98be0abe 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java @@ -62,7 +62,7 @@ public class SortingFileWriter { private static final Logger log = Logger.get(SortingFileWriter.class); - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SortingFileWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SortingFileWriter.class).instanceSize(); private final FileSystem fileSystem; private final Path tempFilePrefix; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/TableToPartitionMapping.java b/presto-hive/src/main/java/com/facebook/presto/hive/TableToPartitionMapping.java index 806aec0262d57..e9dda62be52ff 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/TableToPartitionMapping.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/TableToPartitionMapping.java @@ -41,9 +41,9 @@ public static TableToPartitionMapping mapColumnsByIndex(Map par } // Overhead of ImmutableMap is not accounted because of its complexity. - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TableToPartitionMapping.class).instanceSize(); - private static final int INTEGER_INSTANCE_SIZE = ClassLayout.parseClass(Integer.class).instanceSize(); - private static final int OPTIONAL_INSTANCE_SIZE = ClassLayout.parseClass(Optional.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TableToPartitionMapping.class).instanceSize(); + private static final long INTEGER_INSTANCE_SIZE = ClassLayout.parseClass(Integer.class).instanceSize(); + private static final long OPTIONAL_INSTANCE_SIZE = ClassLayout.parseClass(Optional.class).instanceSize(); private final Optional> tableToPartitionColumns; private final Map partitionSchemaDifference; @@ -100,9 +100,9 @@ private Optional getPartitionColumnIndex(int tableColumnIndex) return Optional.ofNullable(tableToPartitionColumns.get().get(tableColumnIndex)); } - public int getEstimatedSizeInBytes() + public long getEstimatedSizeInBytes() { - int result = INSTANCE_SIZE; + long result = INSTANCE_SIZE; result += sizeOfObjectArray(partitionSchemaDifference.size()); for (Column column : partitionSchemaDifference.values()) { result += INTEGER_INSTANCE_SIZE + column.getEstimatedSizeInBytes(); diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java index 76f676d1f1770..261943f267947 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java @@ -35,7 +35,7 @@ public class PageFileWriter implements HiveFileWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PageFileWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PageFileWriter.class).instanceSize(); private final PageWriter pageWriter; private final PagesSerde pagesSerde; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java index 807685aac053b..382f7b7114a4a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java @@ -33,7 +33,7 @@ public class PageWriter implements Closeable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PageWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PageWriter.class).instanceSize(); private final DataSink dataSink; private final HiveCompressionCodec compressionCodec; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetFileWriter.java index 2a662355d7024..791098773d62a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetFileWriter.java @@ -42,7 +42,7 @@ public class ParquetFileWriter implements HiveFileWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ParquetFileWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ParquetFileWriter.class).instanceSize(); private final ParquetWriter parquetWriter; private final Callable rollbackAction; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/util/SortBuffer.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/SortBuffer.java index 2cf344f57b219..41cb63fe10357 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/util/SortBuffer.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/util/SortBuffer.java @@ -36,7 +36,7 @@ public class SortBuffer { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SortBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SortBuffer.class).instanceSize(); private final long maxMemoryBytes; private final List types; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplitSource.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplitSource.java index 8d1340d489180..cd79e398ac664 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplitSource.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplitSource.java @@ -359,9 +359,9 @@ public void testOutstandingSplitSize() 1); TestSplit testSplit = new TestSplit(0); - int testSplitSizeInBytes = testSplit.getEstimatedSizeInBytes() + testSplit.getPartitionInfo().getEstimatedSizeInBytes(); + long testSplitSizeInBytes = testSplit.getEstimatedSizeInBytes() + testSplit.getPartitionInfo().getEstimatedSizeInBytes(); - int maxSplitCount = toIntExact(maxOutstandingSplitsSize.toBytes()) / testSplitSizeInBytes; + int maxSplitCount = toIntExact(maxOutstandingSplitsSize.toBytes()) / toIntExact(testSplitSizeInBytes); for (int i = 0; i < maxSplitCount; i++) { hiveSplitSource.addToQueue(new TestSplit(i)); assertEquals(hiveSplitSource.getBufferedInternalSplitCount(), i + 1); diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/function/changelog/ChangelogRecord.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/function/changelog/ChangelogRecord.java index 2c28406ff9566..f8674be126021 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/function/changelog/ChangelogRecord.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/function/changelog/ChangelogRecord.java @@ -36,7 +36,7 @@ public class ChangelogRecord { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ChangelogRecord.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ChangelogRecord.class).instanceSize(); private Block lastRow; private Slice lastOperation; private int lastOrdinal; diff --git a/presto-main-base/src/main/java/com/facebook/presto/geospatial/SpatialPartitioningStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/geospatial/SpatialPartitioningStateFactory.java index e0c81a273fef5..dcd89846c505e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/geospatial/SpatialPartitioningStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/geospatial/SpatialPartitioningStateFactory.java @@ -58,7 +58,7 @@ public Class getGroupedStateClass() public static final class GroupedSpatialPartitioningState implements GroupedAccumulatorState, SpatialPartitioningState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedSpatialPartitioningState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedSpatialPartitioningState.class).instanceSize(); private long groupId; private final IntBigArray partitionCounts = new IntBigArray(); @@ -131,7 +131,7 @@ public void ensureCapacity(long size) public static final class SingleSpatialPartitioningState implements SpatialPartitioningState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleSpatialPartitioningState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleSpatialPartitioningState.class).instanceSize(); private int partitionCount; private long count; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ArrayPositionLinks.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ArrayPositionLinks.java index d9732959c8503..b827a916c3455 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ArrayPositionLinks.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ArrayPositionLinks.java @@ -27,7 +27,7 @@ public final class ArrayPositionLinks implements PositionLinks { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ArrayPositionLinks.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ArrayPositionLinks.class).instanceSize(); public static class FactoryBuilder implements PositionLinks.FactoryBuilder diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/BigintGroupByHash.java b/presto-main-base/src/main/java/com/facebook/presto/operator/BigintGroupByHash.java index f807fd5e9e6dc..04e64f76b2d4d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/BigintGroupByHash.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/BigintGroupByHash.java @@ -44,7 +44,7 @@ public class BigintGroupByHash implements GroupByHash { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BigintGroupByHash.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BigintGroupByHash.class).instanceSize(); private static final float FILL_RATIO = 0.75f; private static final List TYPES = ImmutableList.of(BIGINT); diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/JoinHash.java b/presto-main-base/src/main/java/com/facebook/presto/operator/JoinHash.java index d2eca91d09d88..42d07ae051baa 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/JoinHash.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/JoinHash.java @@ -27,7 +27,7 @@ public final class JoinHash implements LookupSource { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(JoinHash.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(JoinHash.class).instanceSize(); private final PagesHash pagesHash; // we unwrap Optional to actual verifier or null in constructor for performance reasons diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/MultiChannelGroupByHash.java b/presto-main-base/src/main/java/com/facebook/presto/operator/MultiChannelGroupByHash.java index 58ced1c14f3f0..2f8ab2992c239 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/MultiChannelGroupByHash.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/MultiChannelGroupByHash.java @@ -55,7 +55,7 @@ public class MultiChannelGroupByHash implements GroupByHash { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MultiChannelGroupByHash.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MultiChannelGroupByHash.class).instanceSize(); private static final float FILL_RATIO = 0.75f; private final List types; private final List hashTypes; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/NoChannelGroupByHash.java b/presto-main-base/src/main/java/com/facebook/presto/operator/NoChannelGroupByHash.java index 542d3460498d8..bc2d612bf886c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/NoChannelGroupByHash.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/NoChannelGroupByHash.java @@ -28,7 +28,7 @@ public class NoChannelGroupByHash implements GroupByHash { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(NoChannelGroupByHash.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(NoChannelGroupByHash.class).instanceSize(); private int groupCount; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesHash.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesHash.java index c301db4fecb23..e07f062fb2770 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesHash.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesHash.java @@ -33,7 +33,7 @@ // This implementation assumes arrays used in the hash are always a power of 2 public final class PagesHash { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PagesHash.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PagesHash.class).instanceSize(); private static final DataSize CACHE_SIZE = new DataSize(128, KILOBYTE); private final AdaptiveLongBigArray addresses; private final int positionCount; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java index b0b82f340b5b3..baecffa41b58d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java @@ -75,7 +75,7 @@ public class PagesIndex implements Swapper { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PagesIndex.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PagesIndex.class).instanceSize(); private static final Logger log = Logger.get(PagesIndex.class); private final OrderingCompiler orderingCompiler; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesRTreeIndex.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesRTreeIndex.java index 580974241e3ff..e03f52cf74e62 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesRTreeIndex.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesRTreeIndex.java @@ -64,7 +64,7 @@ public class PagesRTreeIndex public static final class GeometryWithPosition implements HasExtent { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GeometryWithPosition.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GeometryWithPosition.class).instanceSize(); private final OGCGeometry ogcGeometry; private final int partition; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexSupplier.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexSupplier.java index c57c79705a216..382abec0481bf 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexSupplier.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexSupplier.java @@ -51,7 +51,7 @@ public class PagesSpatialIndexSupplier implements Supplier { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PagesSpatialIndexSupplier.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PagesSpatialIndexSupplier.class).instanceSize(); private static final int MEMORY_USAGE_UPDATE_INCREMENT_BYTES = 100 * 1024 * 1024; // 100 MB private final Session session; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/SimplePagesHashStrategy.java b/presto-main-base/src/main/java/com/facebook/presto/operator/SimplePagesHashStrategy.java index 8005ba436e667..70af3e7cfb997 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/SimplePagesHashStrategy.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/SimplePagesHashStrategy.java @@ -40,7 +40,7 @@ public class SimplePagesHashStrategy implements PagesHashStrategy { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SimplePagesHashStrategy.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SimplePagesHashStrategy.class).instanceSize(); private final List types; private final List outputChannels; private final List> channels; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/SortedPositionLinks.java b/presto-main-base/src/main/java/com/facebook/presto/operator/SortedPositionLinks.java index cef80eeeb400c..03057982075fd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/SortedPositionLinks.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/SortedPositionLinks.java @@ -42,7 +42,7 @@ public final class SortedPositionLinks implements PositionLinks { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SortedPositionLinks.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SortedPositionLinks.class).instanceSize(); public static class FactoryBuilder implements PositionLinks.FactoryBuilder diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AbstractGroupCollectionAggregationState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AbstractGroupCollectionAggregationState.java index 55a8eca7cb711..443e124bfc9e7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AbstractGroupCollectionAggregationState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AbstractGroupCollectionAggregationState.java @@ -33,7 +33,7 @@ public abstract class AbstractGroupCollectionAggregationState extends AbstractGroupedAccumulatorState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(AbstractGroupCollectionAggregationState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(AbstractGroupCollectionAggregationState.class).instanceSize(); private static final int MAX_NUM_BLOCKS = 30000; private static final short NULL = -1; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java index 4f3ac2e2e15cb..d5cb49e8573fe 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java @@ -798,7 +798,7 @@ public void prepareFinal() private static class SpillableFinalOnlyGroupedAccumulator implements GroupedAccumulator { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SpillableFinalOnlyGroupedAccumulator.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SpillableFinalOnlyGroupedAccumulator.class).instanceSize(); private final FinalOnlyGroupedAccumulator delegate; private final List sourceTypes; @@ -1243,7 +1243,7 @@ private void addRawInputs(List inputPages) private static class GroupIdPage { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupIdPage.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupIdPage.class).instanceSize(); private final GroupByIdBlock groupByIdBlock; private final Page page; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/KeyValuePairs.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/KeyValuePairs.java index eb00c71e7d546..1491839a61e13 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/KeyValuePairs.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/KeyValuePairs.java @@ -32,7 +32,7 @@ public class KeyValuePairs { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(KeyValuePairs.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(KeyValuePairs.class).instanceSize(); private static final int EXPECTED_ENTRIES = 10; private static final int EXPECTED_ENTRY_SIZE = 16; private static final float FILL_RATIO = 0.75f; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/MapUnionSumResult.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/MapUnionSumResult.java index d4b09cd3d9124..9ac51615d336c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/MapUnionSumResult.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/MapUnionSumResult.java @@ -27,7 +27,7 @@ public abstract class MapUnionSumResult { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapUnionSumResult.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapUnionSumResult.class).instanceSize(); private static final int EXPECTED_ENTRIES = 10; private static final int EXPECTED_ENTRY_SIZE = 16; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/NumericHistogram.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/NumericHistogram.java index b89d9c4cbe918..7857e6d92a18a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/NumericHistogram.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/NumericHistogram.java @@ -36,7 +36,7 @@ public class NumericHistogram { private static final byte FORMAT_TAG = 0; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(NumericHistogram.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(NumericHistogram.class).instanceSize(); private final int maxBuckets; private final double[] values; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/OptimizedTypedSet.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/OptimizedTypedSet.java index 907d49d9a603b..9e1460673c6df 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/OptimizedTypedSet.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/OptimizedTypedSet.java @@ -43,8 +43,8 @@ public class OptimizedTypedSet { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TypedSet.class).instanceSize(); - private static final int ARRAY_LIST_INSTANCE_SIZE = ClassLayout.parseClass(ArrayList.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TypedSet.class).instanceSize(); + private static final long ARRAY_LIST_INSTANCE_SIZE = ClassLayout.parseClass(ArrayList.class).instanceSize(); private static final float FILL_RATIO = 0.75f; private static final int EMPTY_SLOT = -1; private static final int INVALID_POSITION = -1; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/SetOfValues.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/SetOfValues.java index 6164d244215d5..54d30fce42c4c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/SetOfValues.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/SetOfValues.java @@ -35,7 +35,7 @@ public final class SetOfValues { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SetOfValues.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SetOfValues.class).instanceSize(); private static final int EXPECTED_ENTRIES = 10; private static final int EXPECTED_ENTRY_SIZE = 16; private static final float FILL_RATIO = 0.75f; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedHeap.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedHeap.java index 3dd157391ed16..be03201006ad2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedHeap.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedHeap.java @@ -23,7 +23,7 @@ public class TypedHeap { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TypedHeap.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TypedHeap.class).instanceSize(); private static final int COMPACT_THRESHOLD_BYTES = 32768; private static final int COMPACT_THRESHOLD_RATIO = 3; // when 2/3 of elements in heapBlockBuilder is unreferenced, do compact diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedKeyValueHeap.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedKeyValueHeap.java index bcbd29d78dc91..b7f76b517419a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedKeyValueHeap.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedKeyValueHeap.java @@ -28,7 +28,7 @@ public class TypedKeyValueHeap { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TypedKeyValueHeap.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TypedKeyValueHeap.class).instanceSize(); private static final int COMPACT_THRESHOLD_BYTES = 32768; private static final int COMPACT_THRESHOLD_RATIO = 3; // when 2/3 of elements in keyBlockBuilder is unreferenced, do compact diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedSet.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedSet.java index 0dca29f836107..8de41c77957ba 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedSet.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedSet.java @@ -43,8 +43,8 @@ public class TypedSet @VisibleForTesting public static final DataSize MAX_FUNCTION_MEMORY = new DataSize(4, MEGABYTE); - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TypedSet.class).instanceSize(); - private static final int INT_ARRAY_LIST_INSTANCE_SIZE = ClassLayout.parseClass(IntArrayList.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TypedSet.class).instanceSize(); + private static final long INT_ARRAY_LIST_INSTANCE_SIZE = ClassLayout.parseClass(IntArrayList.class).instanceSize(); private static final float FILL_RATIO = 0.75f; private final Type elementType; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/approxmostfrequent/stream/IndexedPriorityQueue.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/approxmostfrequent/stream/IndexedPriorityQueue.java index 714f1e1520306..e3b0abcae8b14 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/approxmostfrequent/stream/IndexedPriorityQueue.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/approxmostfrequent/stream/IndexedPriorityQueue.java @@ -24,7 +24,7 @@ public class IndexedPriorityQueue { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(IndexedPriorityQueue.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(IndexedPriorityQueue.class).instanceSize(); public static final int MIN_POSITION = 0; private final StreamDataEntity[] minHeap; private final int heapCapacity; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/approxmostfrequent/stream/StreamSummary.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/approxmostfrequent/stream/StreamSummary.java index 5efca9e4e1fb5..60e0b4926e406 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/approxmostfrequent/stream/StreamSummary.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/approxmostfrequent/stream/StreamSummary.java @@ -36,7 +36,7 @@ public class StreamSummary implements PriorityQueueDataChangeListener { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(StreamSummary.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(StreamSummary.class).instanceSize(); private static final int COMPACT_THRESHOLD_BYTES = 32768; private static final float FILL_RATIO = 0.75f; private static final int COMPACT_THRESHOLD_RATIO = 3; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/arrayagg/LegacyArrayAggregationGroupState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/arrayagg/LegacyArrayAggregationGroupState.java index c6f1c38718eaa..18ab1d1e77af0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/arrayagg/LegacyArrayAggregationGroupState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/arrayagg/LegacyArrayAggregationGroupState.java @@ -28,7 +28,7 @@ public class LegacyArrayAggregationGroupState extends AbstractGroupedAccumulatorState implements ArrayAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LegacyArrayAggregationGroupState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LegacyArrayAggregationGroupState.class).instanceSize(); private final ObjectBigArray blockBuilders; private final Type type; private long size; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/arrayagg/SingleArrayAggregationState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/arrayagg/SingleArrayAggregationState.java index bafc8f6c5e42b..23b2bdc2b18ae 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/arrayagg/SingleArrayAggregationState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/arrayagg/SingleArrayAggregationState.java @@ -24,7 +24,7 @@ public class SingleArrayAggregationState implements ArrayAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleArrayAggregationState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleArrayAggregationState.class).instanceSize(); private BlockBuilder blockBuilder; private final Type type; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/differentialentropy/UnweightedDoubleReservoirSample.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/differentialentropy/UnweightedDoubleReservoirSample.java index f8bd4c0837982..09cd8b1761b3c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/differentialentropy/UnweightedDoubleReservoirSample.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/differentialentropy/UnweightedDoubleReservoirSample.java @@ -30,7 +30,7 @@ public class UnweightedDoubleReservoirSample implements Cloneable { public static final int MAX_SAMPLES_LIMIT = 1_000_000; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(UnweightedDoubleReservoirSample.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(UnweightedDoubleReservoirSample.class).instanceSize(); private int seenCount; private double[] samples; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/differentialentropy/WeightedDoubleReservoirSample.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/differentialentropy/WeightedDoubleReservoirSample.java index aeda454494084..53e0b021fd545 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/differentialentropy/WeightedDoubleReservoirSample.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/differentialentropy/WeightedDoubleReservoirSample.java @@ -30,7 +30,7 @@ public class WeightedDoubleReservoirSample implements Cloneable { public static final int MAX_SAMPLES_LIMIT = 1_000_000; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(WeightedDoubleReservoirSample.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(WeightedDoubleReservoirSample.class).instanceSize(); private int count; private double[] samples; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/fixedhistogram/FixedDoubleBreakdownHistogram.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/fixedhistogram/FixedDoubleBreakdownHistogram.java index e1960929badce..0403b7b838175 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/fixedhistogram/FixedDoubleBreakdownHistogram.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/fixedhistogram/FixedDoubleBreakdownHistogram.java @@ -43,7 +43,7 @@ public class FixedDoubleBreakdownHistogram implements Iterable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FixedDoubleBreakdownHistogram.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FixedDoubleBreakdownHistogram.class).instanceSize(); private final int bucketCount; private final double min; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/fixedhistogram/FixedDoubleHistogram.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/fixedhistogram/FixedDoubleHistogram.java index 504a07ac55973..6afb836b03598 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/fixedhistogram/FixedDoubleHistogram.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/fixedhistogram/FixedDoubleHistogram.java @@ -64,7 +64,7 @@ public Bucket(double left, double right, double weight) } } - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FixedDoubleHistogram.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FixedDoubleHistogram.class).instanceSize(); private final double[] weights; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/GroupedHistogramState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/GroupedHistogramState.java index 19f91dfd248d3..604c536052444 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/GroupedHistogramState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/GroupedHistogramState.java @@ -26,7 +26,7 @@ public class GroupedHistogramState extends AbstractGroupedAccumulatorState implements HistogramState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedHistogramState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedHistogramState.class).instanceSize(); private TypedHistogram typedHistogram; private long size; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/GroupedTypedHistogram.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/GroupedTypedHistogram.java index 044c2f79a40ff..6f035a6c690ae 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/GroupedTypedHistogram.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/GroupedTypedHistogram.java @@ -58,7 +58,7 @@ public class GroupedTypedHistogram { private static final float MAX_FILL_RATIO = 0.5f; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedTypedHistogram.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedTypedHistogram.class).instanceSize(); private static final int EMPTY_BUCKET = -1; private static final int NULL = -1; private final int bucketId; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/LegacyHistogramGroupState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/LegacyHistogramGroupState.java index 5d06a4c2fc419..c4f37c6194c08 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/LegacyHistogramGroupState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/LegacyHistogramGroupState.java @@ -28,7 +28,7 @@ public class LegacyHistogramGroupState extends AbstractGroupedAccumulatorState implements HistogramState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LegacyHistogramGroupState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LegacyHistogramGroupState.class).instanceSize(); private final ObjectBigArray typedHistograms = new ObjectBigArray<>(); private final Type keyType; private final int expectedEntriesCount; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/SingleHistogramState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/SingleHistogramState.java index aa4e2272ec939..358a2b7750d50 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/SingleHistogramState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/SingleHistogramState.java @@ -21,7 +21,7 @@ public class SingleHistogramState implements HistogramState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleHistogramState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleHistogramState.class).instanceSize(); private SingleTypedHistogram typedHistogram; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/SingleTypedHistogram.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/SingleTypedHistogram.java index aa1d310cc5229..fe6e75a41ca5a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/SingleTypedHistogram.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/SingleTypedHistogram.java @@ -34,7 +34,7 @@ public class SingleTypedHistogram implements TypedHistogram { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleTypedHistogram.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleTypedHistogram.class).instanceSize(); private static final float FILL_RATIO = 0.75f; private final int expectedSize; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/ValueStore.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/ValueStore.java index 339179e510111..5d234584f719e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/ValueStore.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/histogram/ValueStore.java @@ -41,7 +41,7 @@ */ public class ValueStore { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedTypedHistogram.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedTypedHistogram.class).instanceSize(); private static final float MAX_FILL_RATIO = 0.5f; private static final int EMPTY_BUCKET = -1; private final BlockBuilder values; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/minmaxby/MinMaxByNStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/minmaxby/MinMaxByNStateFactory.java index fb749fa513257..da61ca83f616a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/minmaxby/MinMaxByNStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/minmaxby/MinMaxByNStateFactory.java @@ -50,7 +50,7 @@ public static class GroupedMinMaxByNState extends AbstractGroupedAccumulatorState implements MinMaxByNState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedMinMaxByNState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedMinMaxByNState.class).instanceSize(); private final ObjectBigArray heaps = new ObjectBigArray<>(); private long size; @@ -93,7 +93,7 @@ public void addMemoryUsage(long memory) public static class SingleMinMaxByNState implements MinMaxByNState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleMinMaxByNState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleMinMaxByNState.class).instanceSize(); private TypedKeyValueHeap typedKeyValueHeap; @Override diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/multimapagg/LegacyGroupedMultimapAggregationState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/multimapagg/LegacyGroupedMultimapAggregationState.java index ae6a1592f35e7..8bcd10a291794 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/multimapagg/LegacyGroupedMultimapAggregationState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/multimapagg/LegacyGroupedMultimapAggregationState.java @@ -27,7 +27,7 @@ public class LegacyGroupedMultimapAggregationState extends AbstractGroupedAccumulatorState implements MultimapAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LegacyGroupedMultimapAggregationState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LegacyGroupedMultimapAggregationState.class).instanceSize(); private static final int EXPECTED_ENTRIES = 10; private static final int EXPECTED_ENTRY_SIZE = 16; private final Type keyType; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/multimapagg/SingleMultimapAggregationState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/multimapagg/SingleMultimapAggregationState.java index 38893703afde7..195a84bc47d8b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/multimapagg/SingleMultimapAggregationState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/multimapagg/SingleMultimapAggregationState.java @@ -24,7 +24,7 @@ public class SingleMultimapAggregationState implements MultimapAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleMultimapAggregationState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleMultimapAggregationState.class).instanceSize(); private static final int EXPECTED_ENTRIES = 10; private static final int EXPECTED_ENTRY_SIZE = 16; private final Type keyType; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/SfmSketchStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/SfmSketchStateFactory.java index cb55646fe56a3..764560146f5ef 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/SfmSketchStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/SfmSketchStateFactory.java @@ -51,7 +51,7 @@ public Class getGroupedStateClass() public static class GroupedSfmSketchState implements SfmSketchState, GroupedAccumulatorState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedSfmSketchState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedSfmSketchState.class).instanceSize(); private final ObjectBigArray sketches = new ObjectBigArray<>(); private final ObjectBigArray epsilons = new ObjectBigArray<>(); @@ -125,7 +125,7 @@ public double getEpsilon() public static class SingleSfmSketchState implements SfmSketchState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleSfmSketchState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleSfmSketchState.class).instanceSize(); private SfmSketch sketch; private double epsilon; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/Bitmap.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/Bitmap.java index 4ac12600bf453..d12d160467b4d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/Bitmap.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/Bitmap.java @@ -34,8 +34,8 @@ */ public class Bitmap { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Bitmap.class).instanceSize(); - private static final int BITSET_INSTANCE_SIZE = ClassLayout.parseClass(BitSet.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Bitmap.class).instanceSize(); + private static final long BITSET_INSTANCE_SIZE = ClassLayout.parseClass(BitSet.class).instanceSize(); private final BitSet bitSet; private final int length; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/SfmSketch.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/SfmSketch.java index 2a82520a9a19a..028b50120e562 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/SfmSketch.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/SfmSketch.java @@ -54,7 +54,7 @@ public class SfmSketch private static final byte FORMAT_TAG = 7; private static final int MAX_ESTIMATION_ITERATIONS = 1000; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SfmSketch.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SfmSketch.class).instanceSize(); private final int indexBitLength; private final int precision; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/GroupedReservoirSampleState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/GroupedReservoirSampleState.java index 2dec0c09d0782..77ca6face8bdc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/GroupedReservoirSampleState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/GroupedReservoirSampleState.java @@ -23,7 +23,7 @@ public class GroupedReservoirSampleState extends AbstractGroupedAccumulatorState implements ReservoirSampleState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedReservoirSampleState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedReservoirSampleState.class).instanceSize(); private final ObjectBigArray samples = new ObjectBigArray<>(); private long size; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/ReservoirSample.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/ReservoirSample.java index d2c7c63088f80..5ca932e0ecbe2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/ReservoirSample.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/ReservoirSample.java @@ -38,7 +38,7 @@ public class ReservoirSample { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleReservoirSampleState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleReservoirSampleState.class).instanceSize(); private final Type type; public Type getArrayType() diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchAggregationState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchAggregationState.java index dc1b0d2b3f3dc..10cc39fd6442c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchAggregationState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchAggregationState.java @@ -189,7 +189,7 @@ class Grouped extends AbstractGroupedAccumulatorState implements KllSketchAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ThetaSketchStateFactory.GroupedThetaSketchState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ThetaSketchStateFactory.GroupedThetaSketchState.class).instanceSize(); private final ObjectBigArray sketches = new ObjectBigArray<>(); private long accumulatedSizeInBytes; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/theta/ThetaSketchStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/theta/ThetaSketchStateFactory.java index 643817999fca6..26c1e93c9458e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/theta/ThetaSketchStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/theta/ThetaSketchStateFactory.java @@ -98,7 +98,7 @@ public static final class GroupedThetaSketchState extends AbstractGroupedAccumulatorState implements ThetaSketchAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedThetaSketchState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedThetaSketchState.class).instanceSize(); private final ObjectBigArray sketches = new ObjectBigArray<>(); private long sizeBytes; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/DigestAndPercentileArrayStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/DigestAndPercentileArrayStateFactory.java index bc6ce02aa1fc0..726ac19c0cdc5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/DigestAndPercentileArrayStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/DigestAndPercentileArrayStateFactory.java @@ -54,7 +54,7 @@ public static class GroupedDigestAndPercentileArrayState extends AbstractGroupedAccumulatorState implements DigestAndPercentileArrayState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedDigestAndPercentileArrayState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedDigestAndPercentileArrayState.class).instanceSize(); private final ObjectBigArray digests = new ObjectBigArray<>(); private final ObjectBigArray> percentilesArray = new ObjectBigArray<>(); private long size; @@ -106,7 +106,7 @@ public long getEstimatedSize() public static class SingleDigestAndPercentileArrayState implements DigestAndPercentileArrayState { - public static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleDigestAndPercentileArrayState.class).instanceSize(); + public static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleDigestAndPercentileArrayState.class).instanceSize(); private QuantileDigest digest; private List percentiles; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/DigestAndPercentileStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/DigestAndPercentileStateFactory.java index 5a724c260962d..b55db8bcc1c47 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/DigestAndPercentileStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/DigestAndPercentileStateFactory.java @@ -52,7 +52,7 @@ public static class GroupedDigestAndPercentileState extends AbstractGroupedAccumulatorState implements DigestAndPercentileState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedDigestAndPercentileState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedDigestAndPercentileState.class).instanceSize(); private final ObjectBigArray digests = new ObjectBigArray<>(); private final DoubleBigArray percentiles = new DoubleBigArray(); private long size; @@ -105,7 +105,7 @@ public long getEstimatedSize() public static class SingleDigestAndPercentileState implements DigestAndPercentileState { - public static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleDigestAndPercentileState.class).instanceSize(); + public static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleDigestAndPercentileState.class).instanceSize(); private QuantileDigest digest; private double percentile; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/HyperLogLogState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/HyperLogLogState.java index 6f9e8363d7dd6..1efc85bb6c125 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/HyperLogLogState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/HyperLogLogState.java @@ -27,5 +27,5 @@ public interface HyperLogLogState void setHyperLogLog(HyperLogLog value); - void addMemoryUsage(int value); + void addMemoryUsage(long value); } diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/HyperLogLogStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/HyperLogLogStateFactory.java index 457b9d6c98c32..413c25de94a95 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/HyperLogLogStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/HyperLogLogStateFactory.java @@ -51,7 +51,7 @@ public static class GroupedHyperLogLogState extends AbstractGroupedAccumulatorState implements HyperLogLogState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedHyperLogLogState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedHyperLogLogState.class).instanceSize(); private final ObjectBigArray hlls = new ObjectBigArray<>(); private long size; @@ -75,7 +75,7 @@ public void setHyperLogLog(HyperLogLog value) } @Override - public void addMemoryUsage(int value) + public void addMemoryUsage(long value) { size += value; } @@ -90,7 +90,7 @@ public long getEstimatedSize() public static class SingleHyperLogLogState implements HyperLogLogState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleHyperLogLogState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleHyperLogLogState.class).instanceSize(); private HyperLogLog hll; @Override @@ -106,7 +106,7 @@ public void setHyperLogLog(HyperLogLog value) } @Override - public void addMemoryUsage(int value) + public void addMemoryUsage(long value) { // noop } diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/KeyValuePairsStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/KeyValuePairsStateFactory.java index 2e015b8f0447f..ffb724853ce30 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/KeyValuePairsStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/KeyValuePairsStateFactory.java @@ -61,7 +61,7 @@ public static class GroupedState extends AbstractGroupedAccumulatorState implements KeyValuePairsState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); private final Type keyType; private final Type valueType; private final ObjectBigArray pairs = new ObjectBigArray<>(); @@ -127,7 +127,7 @@ public long getEstimatedSize() public static class SingleState implements KeyValuePairsState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleState.class).instanceSize(); private final Type keyType; private final Type valueType; private KeyValuePairs pair; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowAndLongStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowAndLongStateFactory.java index abaec60faf56c..0295864988071 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowAndLongStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowAndLongStateFactory.java @@ -52,7 +52,7 @@ public static class GroupedLongDecimalWithOverflowAndLongState extends LongDecimalWithOverflowStateFactory.GroupedLongDecimalWithOverflowState implements LongDecimalWithOverflowAndLongState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedLongDecimalWithOverflowAndLongState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedLongDecimalWithOverflowAndLongState.class).instanceSize(); private final LongBigArray longs = new LongBigArray(); @Override @@ -97,7 +97,7 @@ public static class SingleLongDecimalWithOverflowAndLongState extends LongDecimalWithOverflowStateFactory.SingleLongDecimalWithOverflowState implements LongDecimalWithOverflowAndLongState { - public static final int SIZE = ClassLayout.parseClass(Slice.class).instanceSize() + UNSCALED_DECIMAL_128_SLICE_LENGTH + SIZE_OF_LONG * 2; + public static final long SIZE = ClassLayout.parseClass(Slice.class).instanceSize() + UNSCALED_DECIMAL_128_SLICE_LENGTH + SIZE_OF_LONG * 2; protected long longValue; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java index 1d73576e4bffd..208799481cf9b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java @@ -54,7 +54,7 @@ public static class GroupedLongDecimalWithOverflowState extends AbstractGroupedAccumulatorState implements LongDecimalWithOverflowState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedLongDecimalWithOverflowState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedLongDecimalWithOverflowState.class).instanceSize(); protected final ObjectBigArray unscaledDecimals = new ObjectBigArray<>(); @Nullable protected LongBigArray overflows; @@ -132,8 +132,8 @@ public long getEstimatedSize() public static class SingleLongDecimalWithOverflowState implements LongDecimalWithOverflowState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleLongDecimalWithOverflowState.class).instanceSize(); - public static final int SIZE = ClassLayout.parseClass(Slice.class).instanceSize() + UNSCALED_DECIMAL_128_SLICE_LENGTH; + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleLongDecimalWithOverflowState.class).instanceSize(); + public static final long SIZE = ClassLayout.parseClass(Slice.class).instanceSize() + UNSCALED_DECIMAL_128_SLICE_LENGTH; protected Slice unscaledDecimal; protected long overflow; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/MapUnionSumStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/MapUnionSumStateFactory.java index 45f819a02a898..e484116712752 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/MapUnionSumStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/MapUnionSumStateFactory.java @@ -73,7 +73,7 @@ public static class GroupedState extends AbstractGroupedAccumulatorState implements MapUnionSumState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); private final Type keyType; private final Type valueType; private final Adder adder; @@ -147,7 +147,7 @@ public Adder getAdder() public static class SingleState implements MapUnionSumState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleState.class).instanceSize(); private final Type keyType; private final Type valueType; private final Adder adder; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/MinMaxNStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/MinMaxNStateFactory.java index 14e63f690e827..3fd1b65233456 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/MinMaxNStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/MinMaxNStateFactory.java @@ -49,7 +49,7 @@ public static class GroupedMinMaxNState extends AbstractGroupedAccumulatorState implements MinMaxNState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedMinMaxNState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedMinMaxNState.class).instanceSize(); private final ObjectBigArray heaps = new ObjectBigArray<>(); private long size; @@ -92,7 +92,7 @@ public void addMemoryUsage(long memory) public static class SingleMinMaxNState implements MinMaxNState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleMinMaxNState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleMinMaxNState.class).instanceSize(); private TypedHeap typedHeap; @Override diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/ReduceAggregationStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/ReduceAggregationStateFactory.java index c9489dd3a26df..8be02f3bcfac8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/ReduceAggregationStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/ReduceAggregationStateFactory.java @@ -63,7 +63,7 @@ public static class GroupedState extends AbstractGroupedAccumulatorState implements ReduceAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); private final ObjectBigArray values = new ObjectBigArray<>(); private long size = INSTANCE_SIZE; @@ -97,7 +97,7 @@ public void ensureCapacity(long size) public static class SingleState implements ReduceAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); private Object value; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/SetAggregationStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/SetAggregationStateFactory.java index a8da0501aafb7..e8de1d162144b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/SetAggregationStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/SetAggregationStateFactory.java @@ -60,7 +60,7 @@ public static class GroupedState extends AbstractGroupedAccumulatorState implements SetAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedState.class).instanceSize(); private final Type elementType; private long size; private final ObjectBigArray set = new ObjectBigArray<>(); @@ -118,7 +118,7 @@ public long getEstimatedSize() public static class SingleState implements SetAggregationState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleState.class).instanceSize(); private final Type elementType; private SetOfValues set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/StateCompiler.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/StateCompiler.java index cd0fb9088cce8..8b7b49a6ce2e7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/StateCompiler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/StateCompiler.java @@ -477,8 +477,7 @@ private static FieldDefinition generateInstanceSize(ClassDefinition definition) .comment("INSTANCE_SIZE = ClassLayout.parseClass(%s.class).instanceSize()", definition.getName()) .push(definition.getType()) .invokeStatic(ClassLayout.class, "parseClass", ClassLayout.class, Class.class) - .invokeVirtual(ClassLayout.class, "instanceSize", int.class) - .intToLong() + .invokeVirtual(ClassLayout.class, "instanceSize", long.class) .putStaticField(instanceSize); return instanceSize; } diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/StatisticalDigestStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/StatisticalDigestStateFactory.java index a3986029fa05e..db02776354a05 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/StatisticalDigestStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/StatisticalDigestStateFactory.java @@ -77,7 +77,7 @@ public static class GroupedStatisticalDigestState extends AbstractGroupedAccumulatorState implements StatisticalDigestState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupedStatisticalDigestState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupedStatisticalDigestState.class).instanceSize(); private final ObjectBigArray> digests = new ObjectBigArray<>(); private long size; private final Function> deserializer; @@ -128,7 +128,7 @@ public long getEstimatedSize() public static class SingleStatisticalDigestState implements StatisticalDigestState { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SingleStatisticalDigestState.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SingleStatisticalDigestState.class).instanceSize(); private final Function> deserializer; private StatisticalDigest digest; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/project/MergingPageOutput.java b/presto-main-base/src/main/java/com/facebook/presto/operator/project/MergingPageOutput.java index 17f3a6758c42f..6721ffac7df6d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/project/MergingPageOutput.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/project/MergingPageOutput.java @@ -60,7 +60,7 @@ public class MergingPageOutput { @VisibleForTesting - static final int INSTANCE_SIZE = ClassLayout.parseClass(MergingPageOutput.class).instanceSize(); + static final long INSTANCE_SIZE = ClassLayout.parseClass(MergingPageOutput.class).instanceSize(); private static final int MAX_MIN_PAGE_SIZE = 1024 * 1024; private final List types; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ArrayBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ArrayBlockEncodingBuffer.java index c0f179b6aa70c..800f036a9bf55 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ArrayBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ArrayBlockEncodingBuffer.java @@ -52,7 +52,7 @@ public class ArrayBlockEncodingBuffer static final int POSITION_SIZE = SIZE_OF_INT + SIZE_OF_BYTE; private static final String NAME = "ARRAY"; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ArrayBlockEncodingBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ArrayBlockEncodingBuffer.class).instanceSize(); // The buffer for the offsets for all incoming blocks so far private byte[] offsetsBuffer; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ByteArrayBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ByteArrayBlockEncodingBuffer.java index 3a3f5269dd0bb..23ee0470ae12b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ByteArrayBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ByteArrayBlockEncodingBuffer.java @@ -48,7 +48,7 @@ public class ByteArrayBlockEncodingBuffer static final int POSITION_SIZE = Byte.BYTES + Byte.BYTES; private static final String NAME = "BYTE_ARRAY"; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ByteArrayBlockEncodingBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ByteArrayBlockEncodingBuffer.class).instanceSize(); private byte[] valuesBuffer; private int valuesBufferIndex; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/DecodedBlockNode.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/DecodedBlockNode.java index 0bd475525d9c7..bf3290c806d59 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/DecodedBlockNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/DecodedBlockNode.java @@ -32,7 +32,7 @@ */ class DecodedBlockNode { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DecodedBlockNode.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DecodedBlockNode.class).instanceSize(); // The decodedBlock could be primitive block, Dictionary/RLE block, or ColumnarArray/Map/Row object private final Object decodedBlock; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/Int128ArrayBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/Int128ArrayBlockEncodingBuffer.java index 2f487de73905b..d3e6b8caa25f0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/Int128ArrayBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/Int128ArrayBlockEncodingBuffer.java @@ -49,7 +49,7 @@ public class Int128ArrayBlockEncodingBuffer static final int POSITION_SIZE = Long.BYTES * 2 + Byte.BYTES; private static final String NAME = "INT128_ARRAY"; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int128ArrayBlockEncodingBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int128ArrayBlockEncodingBuffer.class).instanceSize(); private byte[] valuesBuffer; private int valuesBufferIndex; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/IntArrayBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/IntArrayBlockEncodingBuffer.java index b1be78a4cfc3e..9a85a7df6a98c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/IntArrayBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/IntArrayBlockEncodingBuffer.java @@ -49,7 +49,7 @@ public class IntArrayBlockEncodingBuffer static final int POSITION_SIZE = Integer.BYTES + Byte.BYTES; private static final String NAME = "INT_ARRAY"; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(IntArrayBlockEncodingBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(IntArrayBlockEncodingBuffer.class).instanceSize(); private byte[] valuesBuffer; private int valuesBufferIndex; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/LongArrayBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/LongArrayBlockEncodingBuffer.java index 8a5c21da3f0b5..a34882bdddd5e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/LongArrayBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/LongArrayBlockEncodingBuffer.java @@ -35,7 +35,7 @@ public class LongArrayBlockEncodingBuffer static final int POSITION_SIZE = Long.BYTES + Byte.BYTES; private static final String NAME = "LONG_ARRAY"; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongArrayBlockEncodingBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongArrayBlockEncodingBuffer.class).instanceSize(); private byte[] valuesBuffer; private int valuesBufferIndex; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/MapBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/MapBlockEncodingBuffer.java index 8c4a48afb27bd..dc2d1ec71fd94 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/MapBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/MapBlockEncodingBuffer.java @@ -57,7 +57,7 @@ public class MapBlockEncodingBuffer private static final int POSITION_SIZE_WITH_HASHTABLE = SIZE_OF_INT + SIZE_OF_BYTE + SIZE_OF_INT * HASH_MULTIPLIER; private static final String NAME = "MAP"; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapBlockEncodingBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapBlockEncodingBuffer.class).instanceSize(); // The buffer for the hashtables for all incoming blocks so far private byte[] hashTablesBuffer; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java index b125f573bfc96..afebdd19d5dd0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java @@ -617,7 +617,7 @@ private static int getFixedWidthTypeSize(Type type) private static class PartitionBuffer { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PartitionBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PartitionBuffer.class).instanceSize(); private final int partition; private final AtomicLong rowsAdded; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/RowBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/RowBlockEncodingBuffer.java index 12a8bd61b8b9f..9d947edfcc61c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/RowBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/RowBlockEncodingBuffer.java @@ -55,7 +55,7 @@ public class RowBlockEncodingBuffer static final int POSITION_SIZE = SIZE_OF_INT + SIZE_OF_BYTE; private static final String NAME = "ROW"; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(RowBlockEncodingBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(RowBlockEncodingBuffer.class).instanceSize(); // The buffer for the offsets for all incoming blocks so far private byte[] offsetsBuffer; @@ -200,7 +200,7 @@ public void noMoreBatches() @Override public long getRetainedSizeInBytes() { - int size = INSTANCE_SIZE; + long size = INSTANCE_SIZE; for (int i = 0; i < fieldBuffers.length; i++) { size += fieldBuffers[i].getRetainedSizeInBytes(); } diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ShortArrayBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ShortArrayBlockEncodingBuffer.java index 9863039fac1e7..a0fbebb2ff215 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ShortArrayBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/ShortArrayBlockEncodingBuffer.java @@ -49,7 +49,7 @@ public class ShortArrayBlockEncodingBuffer static final int POSITION_SIZE = Short.BYTES + Byte.BYTES; private static final String NAME = "SHORT_ARRAY"; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ShortArrayBlockEncodingBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ShortArrayBlockEncodingBuffer.class).instanceSize(); private byte[] valuesBuffer; private int valuesBufferIndex; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/VariableWidthBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/VariableWidthBlockEncodingBuffer.java index 00d3e56f207fd..be5473dbc1634 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/VariableWidthBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/VariableWidthBlockEncodingBuffer.java @@ -56,7 +56,7 @@ public class VariableWidthBlockEncodingBuffer static final int POSITION_SIZE = Integer.BYTES + Byte.BYTES; private static final String NAME = "VARIABLE_WIDTH"; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(VariableWidthBlockEncodingBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(VariableWidthBlockEncodingBuffer.class).instanceSize(); // The buffer for the slice for all incoming blocks so far private byte[] sliceBuffer; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/ArrayOfRowsUnnester.java b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/ArrayOfRowsUnnester.java index 392ef252d9df0..214037b34d879 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/ArrayOfRowsUnnester.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/ArrayOfRowsUnnester.java @@ -36,7 +36,7 @@ class ArrayOfRowsUnnester implements Unnester { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ArrayOfRowsUnnester.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ArrayOfRowsUnnester.class).instanceSize(); private final int fieldCount; private final UnnestBlockBuilder[] unnestBlockBuilders; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/ArrayUnnester.java b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/ArrayUnnester.java index ddb31956cac61..41146e5452579 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/ArrayUnnester.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/ArrayUnnester.java @@ -31,7 +31,7 @@ class ArrayUnnester implements Unnester { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ArrayUnnester.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ArrayUnnester.class).instanceSize(); private final UnnestBlockBuilder unnestBlockBuilder = new UnnestBlockBuilder(); diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/MapUnnester.java b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/MapUnnester.java index 41c23a3161e19..c17fa090cc1db 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/MapUnnester.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/MapUnnester.java @@ -31,7 +31,7 @@ class MapUnnester implements Unnester { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapUnnester.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapUnnester.class).instanceSize(); private final UnnestBlockBuilder keyUnnestBlockBuilder; private final UnnestBlockBuilder valueUnnestBlockBuilder; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/UnnestOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/UnnestOperator.java index 9ab5952531a9e..2a33801adae63 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/UnnestOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/UnnestOperator.java @@ -106,7 +106,7 @@ public OperatorFactory duplicate() } } - private static final int INSTANCE_SIZE = ClassLayout.parseClass(UnnestOperator.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(UnnestOperator.class).instanceSize(); private static final int MAX_ROWS_PER_BLOCK = 1000; private final OperatorContext operatorContext; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinCompiler.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinCompiler.java index b75aafcfe2401..ff612fcac65be 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinCompiler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinCompiler.java @@ -186,8 +186,7 @@ private static FieldDefinition generateInstanceSize(ClassDefinition definition) .comment("INSTANCE_SIZE = ClassLayout.parseClass(%s.class).instanceSize()", definition.getName()) .push(definition.getType()) .invokeStatic(ClassLayout.class, "parseClass", ClassLayout.class, Class.class) - .invokeVirtual(ClassLayout.class, "instanceSize", int.class) - .intToLong() + .invokeVirtual(ClassLayout.class, "instanceSize", long.class) .putStaticField(instanceSize); return instanceSize; } diff --git a/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigest.java b/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigest.java index 0a7977cd6fa67..9316e58dfa0b1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigest.java +++ b/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigest.java @@ -91,7 +91,7 @@ @NotThreadSafe public class TDigest { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TDigest.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TDigest.class).instanceSize(); static final double MAX_COMPRESSION_FACTOR = 1_000; private static final double sizeFudge = 30; private static final double EPSILON = 0.001; diff --git a/presto-main-base/src/main/java/com/facebook/presto/type/khyperloglog/KHyperLogLog.java b/presto-main-base/src/main/java/com/facebook/presto/type/khyperloglog/KHyperLogLog.java index 420ec515f6f86..f1f978bac4651 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/type/khyperloglog/KHyperLogLog.java +++ b/presto-main-base/src/main/java/com/facebook/presto/type/khyperloglog/KHyperLogLog.java @@ -59,8 +59,8 @@ public class KHyperLogLog public static final long DEFAULT_HISTOGRAM_SIZE = 256; private static final byte VERSION_BYTE = 1; private static final long HASH_OUTPUT_HALF_RANGE = Long.MAX_VALUE; - private static final int SIZE_OF_KHYPERLOGLOG = ClassLayout.parseClass(KHyperLogLog.class).instanceSize(); - private static final int SIZE_OF_RBTREEMAP = ClassLayout.parseClass(Long2ObjectRBTreeMap.class).instanceSize(); + private static final long SIZE_OF_KHYPERLOGLOG = ClassLayout.parseClass(KHyperLogLog.class).instanceSize(); + private static final long SIZE_OF_RBTREEMAP = ClassLayout.parseClass(Long2ObjectRBTreeMap.class).instanceSize(); private final Long2ObjectSortedMap minhash; private final int maxSize; @@ -207,7 +207,7 @@ public long getMinhashSize() return minhash.size(); } - public int estimatedInMemorySize() + public long estimatedInMemorySize() { return SIZE_OF_KHYPERLOGLOG + SIZE_OF_RBTREEMAP + diff --git a/presto-main-base/src/main/java/com/facebook/presto/type/khyperloglog/KHyperLogLogStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/type/khyperloglog/KHyperLogLogStateFactory.java index 626676e86be36..7db7dd8b4de9d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/type/khyperloglog/KHyperLogLogStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/type/khyperloglog/KHyperLogLogStateFactory.java @@ -26,8 +26,8 @@ public class KHyperLogLogStateFactory implements AccumulatorStateFactory { - private static final int SIZE_OF_SINGLE = ClassLayout.parseClass(SingleKHyperLogLogState.class).instanceSize(); - private static final int SIZE_OF_GROUPED = ClassLayout.parseClass(GroupedKHyperLogLogState.class).instanceSize(); + private static final long SIZE_OF_SINGLE = ClassLayout.parseClass(SingleKHyperLogLogState.class).instanceSize(); + private static final long SIZE_OF_GROUPED = ClassLayout.parseClass(GroupedKHyperLogLogState.class).instanceSize(); private final long groupLimit; diff --git a/presto-main-base/src/main/java/com/facebook/presto/type/setdigest/SetDigest.java b/presto-main-base/src/main/java/com/facebook/presto/type/setdigest/SetDigest.java index 72e13b5c509a2..f8e5816e18bd1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/type/setdigest/SetDigest.java +++ b/presto-main-base/src/main/java/com/facebook/presto/type/setdigest/SetDigest.java @@ -53,8 +53,8 @@ public class SetDigest public static final int NUMBER_OF_BUCKETS = 2048; public static final int DEFAULT_MAX_HASHES = 8192; private static final int SIZE_OF_ENTRY = SIZE_OF_LONG + SIZE_OF_SHORT; - private static final int SIZE_OF_SETDIGEST = ClassLayout.parseClass(SetDigest.class).instanceSize(); - private static final int SIZE_OF_RBTREEMAP = ClassLayout.parseClass(Long2ShortRBTreeMap.class).instanceSize(); + private static final long SIZE_OF_SETDIGEST = ClassLayout.parseClass(SetDigest.class).instanceSize(); + private static final long SIZE_OF_RBTREEMAP = ClassLayout.parseClass(Long2ShortRBTreeMap.class).instanceSize(); private final HyperLogLog hll; private final Long2ShortSortedMap minhash; @@ -129,7 +129,7 @@ public HyperLogLog getHll() return hll; } - public int estimatedInMemorySize() + public long estimatedInMemorySize() { return hll.estimatedInMemorySize() + minhash.size() * SIZE_OF_ENTRY + SIZE_OF_SETDIGEST + SIZE_OF_RBTREEMAP; } diff --git a/presto-main-base/src/main/java/com/facebook/presto/type/setdigest/SetDigestStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/type/setdigest/SetDigestStateFactory.java index 01fbc5fc133e4..4b33515dabd5f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/type/setdigest/SetDigestStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/type/setdigest/SetDigestStateFactory.java @@ -22,8 +22,8 @@ public class SetDigestStateFactory implements AccumulatorStateFactory { - private static final int SIZE_OF_SINGLE = ClassLayout.parseClass(SingleSetDigestState.class).instanceSize(); - private static final int SIZE_OF_GROUPED = ClassLayout.parseClass(GroupedSetDigestState.class).instanceSize(); + private static final long SIZE_OF_SINGLE = ClassLayout.parseClass(SingleSetDigestState.class).instanceSize(); + private static final long SIZE_OF_GROUPED = ClassLayout.parseClass(GroupedSetDigestState.class).instanceSize(); @Override public SetDigestState createSingleState() diff --git a/presto-main-base/src/test/java/com/facebook/presto/connector/tvf/TestingTableFunctions.java b/presto-main-base/src/test/java/com/facebook/presto/connector/tvf/TestingTableFunctions.java index 21e739cb21feb..8a576c933e48b 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/connector/tvf/TestingTableFunctions.java +++ b/presto-main-base/src/test/java/com/facebook/presto/connector/tvf/TestingTableFunctions.java @@ -1391,7 +1391,7 @@ public static ConnectorSplitSource getConstantFunctionSplitSource(ConstantFuncti public static final class ConstantFunctionSplit implements ConnectorSplit { - private static final int INSTANCE_SIZE = toIntExact(ClassLayout.parseClass(ConstantFunctionSplit.class).instanceSize()); + private static final long INSTANCE_SIZE = toIntExact(ClassLayout.parseClass(ConstantFunctionSplit.class).instanceSize()); public static final int DEFAULT_SPLIT_SIZE = 5500; private final long count; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/TestBitmap.java b/presto-main-base/src/test/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/TestBitmap.java index 8559c362cf857..6beccb6db4f86 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/TestBitmap.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/TestBitmap.java @@ -235,7 +235,7 @@ public static void testXor() @Test public static void testRetainedSize() { - int instanceSizes = ClassLayout.parseClass(Bitmap.class).instanceSize() + ClassLayout.parseClass(BitSet.class).instanceSize(); + long instanceSizes = ClassLayout.parseClass(Bitmap.class).instanceSize() + ClassLayout.parseClass(BitSet.class).instanceSize(); // The underlying BitSet stores a long[] array of size length / 64, // even though toBytes() returns a truncated array of bytes. diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/gen/TestJoinCompiler.java b/presto-main-base/src/test/java/com/facebook/presto/sql/gen/TestJoinCompiler.java index df8ec5c3ee531..5d8eeb7e47233 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/sql/gen/TestJoinCompiler.java +++ b/presto-main-base/src/test/java/com/facebook/presto/sql/gen/TestJoinCompiler.java @@ -196,7 +196,7 @@ public void testMultiChannel(boolean hashEnabled) // verify channel count assertEquals(hashStrategy.getChannelCount(), outputChannels.size()); // verify size - int instanceSize = ClassLayout.parseClass(hashStrategy.getClass()).instanceSize(); + long instanceSize = ClassLayout.parseClass(hashStrategy.getClass()).instanceSize(); long sizeInBytes = instanceSize + channels.stream() .flatMap(List::stream) .mapToLong(Block::getRetainedSizeInBytes) diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcRecordReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcRecordReader.java index 048f9465424fc..f6ab9f3fce205 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcRecordReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcRecordReader.java @@ -76,7 +76,7 @@ abstract class AbstractOrcRecordReader { protected final OrcAggregatedMemoryContext systemMemoryUsage; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(AbstractOrcRecordReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(AbstractOrcRecordReader.class).instanceSize(); private final OrcDataSource orcDataSource; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/ChunkedSliceOutput.java b/presto-orc/src/main/java/com/facebook/presto/orc/ChunkedSliceOutput.java index 7f36b2ee7ecb1..e701b3df7ccd3 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/ChunkedSliceOutput.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/ChunkedSliceOutput.java @@ -38,7 +38,7 @@ public final class ChunkedSliceOutput extends SliceOutput implements OrcChunkedOutputBuffer { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ChunkedSliceOutput.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ChunkedSliceOutput.class).instanceSize(); private static final int MINIMUM_CHUNK_SIZE = 256; private static final int MAXIMUM_CHUNK_SIZE = 16 * 1024 * 1024; // This must not be larger than MINIMUM_CHUNK_SIZE/2 diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/LazySliceInput.java b/presto-orc/src/main/java/com/facebook/presto/orc/LazySliceInput.java index 3e709d4a080d0..6ce303f9cab03 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/LazySliceInput.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/LazySliceInput.java @@ -31,7 +31,7 @@ final class LazySliceInput extends FixedLengthSliceInput { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LazySliceInput.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LazySliceInput.class).instanceSize(); private final int globalLength; private final Supplier loader; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcBatchRecordReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcBatchRecordReader.java index cbe13b7527d99..31b47785e524f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcBatchRecordReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcBatchRecordReader.java @@ -40,7 +40,7 @@ public class OrcBatchRecordReader extends AbstractOrcRecordReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(OrcBatchRecordReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(OrcBatchRecordReader.class).instanceSize(); public OrcBatchRecordReader( Map includedColumns, diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcLazyChunkedOutputBuffer.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcLazyChunkedOutputBuffer.java index 09cda2285799a..6fd48a66bbb52 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcLazyChunkedOutputBuffer.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcLazyChunkedOutputBuffer.java @@ -25,7 +25,7 @@ public class OrcLazyChunkedOutputBuffer implements OrcChunkedOutputBuffer { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ChunkedSliceOutput.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ChunkedSliceOutput.class).instanceSize(); private byte[] buffer; private final List closedBuffers = new ArrayList<>(); private final List closedBufferLengths = new ArrayList<>(); diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcOutputBuffer.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcOutputBuffer.java index 0935e2fb2661f..961df867f2b83 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcOutputBuffer.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcOutputBuffer.java @@ -49,7 +49,7 @@ public class OrcOutputBuffer extends SliceOutput { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(OrcOutputBuffer.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(OrcOutputBuffer.class).instanceSize(); private static final int PAGE_HEADER_SIZE = 3; // ORC spec 3 byte header private static final int INITIAL_BUFFER_SIZE = 256; private final int maxBufferSize; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java index 364d5f8f9933f..d25f24be666ff 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java @@ -94,7 +94,7 @@ public class OrcSelectiveRecordReader // Marks a SQL null when occurring in constantValues. public static final byte[] NULL_MARKER = new byte[0]; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(OrcSelectiveRecordReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(OrcSelectiveRecordReader.class).instanceSize(); private static final Page EMPTY_PAGE = new Page(0); diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriteValidation.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriteValidation.java index d11edb867132f..af225da616a3f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriteValidation.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriteValidation.java @@ -896,7 +896,7 @@ private void build(ImmutableList.Builder output) private static class RowGroupStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(RowGroupStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(RowGroupStatistics.class).instanceSize(); private final OrcWriteValidationMode validationMode; private final SortedMap columnStatistics; @@ -954,7 +954,7 @@ public long getHash() public static class OrcWriteValidationBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(OrcWriteValidationBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(OrcWriteValidationBuilder.class).instanceSize(); private final OrcWriteValidationMode validationMode; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java index 94e28d55b46df..2d50188392594 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java @@ -105,7 +105,7 @@ public class OrcWriter implements Closeable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(OrcWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(OrcWriter.class).instanceSize(); static final String PRESTO_ORC_WRITER_VERSION_METADATA_KEY = "presto.writer.version"; static final String PRESTO_ORC_WRITER_VERSION; @@ -932,7 +932,7 @@ private static List toFileStats(List> s private static class ClosedStripe { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ClosedStripe.class).instanceSize() + ClassLayout.parseClass(StripeInformation.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ClosedStripe.class).instanceSize() + ClassLayout.parseClass(StripeInformation.class).instanceSize(); private final StripeInformation stripeInformation; private final StripeStatistics statistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/array/IntBigArray.java b/presto-orc/src/main/java/com/facebook/presto/orc/array/IntBigArray.java index 6d124b3866793..f768bdd157817 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/array/IntBigArray.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/array/IntBigArray.java @@ -30,7 +30,7 @@ */ public final class IntBigArray { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(com.facebook.presto.orc.array.IntBigArray.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(com.facebook.presto.orc.array.IntBigArray.class).instanceSize(); private static final long SIZE_OF_SEGMENT = sizeOfIntArray(SEGMENT_SIZE); private final int initialValue; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/RowGroupIndex.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/RowGroupIndex.java index 474604d11ec82..42643259e8f3c 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/RowGroupIndex.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/RowGroupIndex.java @@ -21,7 +21,7 @@ public class RowGroupIndex { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(RowGroupIndex.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(RowGroupIndex.class).instanceSize(); private final int[] positions; private final ColumnStatistics statistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BinaryColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BinaryColumnStatistics.java index f4bee3ad1824a..39db3af5d383d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BinaryColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BinaryColumnStatistics.java @@ -24,7 +24,7 @@ public class BinaryColumnStatistics extends ColumnStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryColumnStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryColumnStatistics.class).instanceSize(); private final BinaryStatistics binaryStatistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BinaryStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BinaryStatistics.java index 50790320706ee..69a38c87ad707 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BinaryStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BinaryStatistics.java @@ -26,7 +26,7 @@ public class BinaryStatistics // 1 byte to denote if null + 4 bytes to denote offset public static final long BINARY_VALUE_BYTES_OVERHEAD = Byte.BYTES + Integer.BYTES; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryStatistics.class).instanceSize(); private final long sum; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BooleanColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BooleanColumnStatistics.java index f8317ec4b73ec..db2bf9fba3281 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BooleanColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BooleanColumnStatistics.java @@ -24,7 +24,7 @@ public class BooleanColumnStatistics extends ColumnStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanColumnStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanColumnStatistics.class).instanceSize(); private final BooleanStatistics booleanStatistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BooleanStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BooleanStatistics.java index 4e991c3c4baca..248d7fc8c7746 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BooleanStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/BooleanStatistics.java @@ -26,7 +26,7 @@ public class BooleanStatistics // 1 byte to denote if null + 1 byte for the value public static final long BOOLEAN_VALUE_BYTES = Byte.BYTES + Byte.BYTES; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanStatistics.class).instanceSize(); private final long trueValueCount; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/ColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/ColumnStatistics.java index 400cc677656e2..097979b1d9b5a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/ColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/ColumnStatistics.java @@ -35,7 +35,7 @@ public class ColumnStatistics implements Hashable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ColumnStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ColumnStatistics.class).instanceSize(); private final boolean hasNumberOfValues; private final long numberOfValues; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DateColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DateColumnStatistics.java index 13847b224df66..b0ec0dd4f868e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DateColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DateColumnStatistics.java @@ -24,7 +24,7 @@ public class DateColumnStatistics extends ColumnStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DateColumnStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DateColumnStatistics.class).instanceSize(); private final DateStatistics dateStatistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DateStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DateStatistics.java index 55fb83fb63939..12942e8f03a7a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DateStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DateStatistics.java @@ -27,7 +27,7 @@ public class DateStatistics // 1 byte to denote if null + 4 bytes for the value (date is of integer type) public static final long DATE_VALUE_BYTES = Byte.BYTES + Integer.BYTES; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DateStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DateStatistics.class).instanceSize(); private final boolean hasMinimum; private final boolean hasMaximum; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DecimalColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DecimalColumnStatistics.java index 2c9836006ad01..dcaed28b096f0 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DecimalColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DecimalColumnStatistics.java @@ -23,7 +23,7 @@ public class DecimalColumnStatistics extends ColumnStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DecimalColumnStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DecimalColumnStatistics.class).instanceSize(); private final DecimalStatistics decimalStatistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DecimalStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DecimalStatistics.java index 73fbd28cbcca2..90dbbec662ba0 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DecimalStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DecimalStatistics.java @@ -30,7 +30,7 @@ public class DecimalStatistics // 1 byte to denote if null public static final long DECIMAL_VALUE_BYTES_OVERHEAD = Byte.BYTES; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DecimalStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DecimalStatistics.class).instanceSize(); // BigDecimal contains BigInteger and BigInteger contains an integer array. // The size of the integer array is not accessible from outside; thus rely on callers to tell how large the size is. private static final long BIG_DECIMAL_INSTANCE_SIZE = ClassLayout.parseClass(BigDecimal.class).instanceSize() + ClassLayout.parseClass(BigInteger.class).instanceSize() + sizeOf(new int[0]); diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DoubleColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DoubleColumnStatistics.java index 23d78d96a32e9..4b96297136eef 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DoubleColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DoubleColumnStatistics.java @@ -24,7 +24,7 @@ public class DoubleColumnStatistics extends ColumnStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DoubleColumnStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DoubleColumnStatistics.class).instanceSize(); private final DoubleStatistics doubleStatistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DoubleStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DoubleStatistics.java index 5a5b32301960f..7eaa1b80c5011 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DoubleStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/DoubleStatistics.java @@ -28,7 +28,7 @@ public class DoubleStatistics // 1 byte to denote if null + 8 bytes for the value public static final long DOUBLE_VALUE_BYTES = Byte.BYTES + Double.BYTES; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DoubleStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DoubleStatistics.class).instanceSize(); private final boolean hasMinimum; private final boolean hasMaximum; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/HiveBloomFilter.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/HiveBloomFilter.java index 6c02066c85963..1f5d26bed740d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/HiveBloomFilter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/HiveBloomFilter.java @@ -27,7 +27,7 @@ public class HiveBloomFilter extends BloomFilter implements Hashable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(HiveBloomFilter.class).instanceSize() + ClassLayout.parseClass(BitSet.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(HiveBloomFilter.class).instanceSize() + ClassLayout.parseClass(BitSet.class).instanceSize(); // constructor that allows deserialization of a long list into the actual hive bloom filter public HiveBloomFilter(List bits, int numBits, int numHashFunctions) diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/IntegerColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/IntegerColumnStatistics.java index 6d14a25ecec47..56063eea685a2 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/IntegerColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/IntegerColumnStatistics.java @@ -24,7 +24,7 @@ public class IntegerColumnStatistics extends ColumnStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(IntegerColumnStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(IntegerColumnStatistics.class).instanceSize(); private final IntegerStatistics integerStatistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/IntegerStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/IntegerStatistics.java index 586ec0dbad441..162b33e20e4c4 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/IntegerStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/IntegerStatistics.java @@ -28,7 +28,7 @@ public class IntegerStatistics // 1 byte to denote if null + 8 bytes for the value (integer is of long type) public static final long INTEGER_VALUE_BYTES = Byte.BYTES + Long.BYTES; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(IntegerStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(IntegerStatistics.class).instanceSize(); private final boolean hasMinimum; private final boolean hasMaximum; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapColumnStatistics.java index a07e93f12465c..273e3542d38e7 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapColumnStatistics.java @@ -23,7 +23,7 @@ public class MapColumnStatistics extends ColumnStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapColumnStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapColumnStatistics.class).instanceSize(); private final MapStatistics mapStatistics; public MapColumnStatistics( diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapStatistics.java index 354e2f9e12b3c..40cc0677e1ff3 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapStatistics.java @@ -25,7 +25,7 @@ public class MapStatistics implements Hashable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapStatistics.class).instanceSize(); private final List entries; public MapStatistics(List entries) diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapStatisticsEntry.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapStatisticsEntry.java index 381489f21bb7e..060bccf4a628d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapStatisticsEntry.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/MapStatisticsEntry.java @@ -25,8 +25,8 @@ public class MapStatisticsEntry implements Hashable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapStatisticsEntry.class).instanceSize(); - private static final int KEY_INSTANCE_SIZE = ClassLayout.parseClass(DwrfProto.KeyInfo.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapStatisticsEntry.class).instanceSize(); + private static final long KEY_INSTANCE_SIZE = ClassLayout.parseClass(DwrfProto.KeyInfo.class).instanceSize(); private final DwrfProto.KeyInfo key; private final ColumnStatistics columnStatistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringColumnStatistics.java index 41a13f96828d3..687ffa423426f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringColumnStatistics.java @@ -24,7 +24,7 @@ public class StringColumnStatistics extends ColumnStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(StringColumnStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(StringColumnStatistics.class).instanceSize(); private final StringStatistics stringStatistics; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringStatistics.java index 616a2579a9450..6cc20fa8d2b8f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringStatistics.java @@ -29,7 +29,7 @@ public class StringStatistics // 1 byte to denote if null + 4 bytes to denote offset public static final long STRING_VALUE_BYTES_OVERHEAD = Byte.BYTES + Integer.BYTES; - private static final int INSTANCE_SIZE = ClassLayout.parseClass(StringStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(StringStatistics.class).instanceSize(); @Nullable private final Slice minimum; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StripeStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StripeStatistics.java index 16fb260177692..0f0d64a90001e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StripeStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StripeStatistics.java @@ -23,7 +23,7 @@ public class StripeStatistics { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(StripeStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(StripeStatistics.class).instanceSize(); private final List columnStatistics; private final long retainedSizeInBytes; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractDecimalSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractDecimalSelectiveStreamReader.java index 1eb18cbfda5fb..af7ed648bcb87 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractDecimalSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractDecimalSelectiveStreamReader.java @@ -48,7 +48,7 @@ public abstract class AbstractDecimalSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(AbstractDecimalSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(AbstractDecimalSelectiveStreamReader.class).instanceSize(); protected final TupleDomainFilter filter; protected final boolean nullsAllowed; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractLongSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractLongSelectiveStreamReader.java index cdbd33496c8ee..b9122027f7f53 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractLongSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractLongSelectiveStreamReader.java @@ -38,7 +38,7 @@ abstract class AbstractLongSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(AbstractLongSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(AbstractLongSelectiveStreamReader.class).instanceSize(); protected final SelectiveReaderContext context; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanBatchStreamReader.java index 6b3e0f730b179..b72dbed49f6cf 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanBatchStreamReader.java @@ -46,7 +46,7 @@ public class BooleanBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanBatchStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanSelectiveStreamReader.java index 21688f5db2b09..872812b012141 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanSelectiveStreamReader.java @@ -46,7 +46,7 @@ public class BooleanSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanSelectiveStreamReader.class).instanceSize(); private static final Block NULL_BLOCK = BOOLEAN.createBlockBuilder(null, 1).appendNull().build(); private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteBatchStreamReader.java index db74427ea2a94..1b170ec6ca154 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteBatchStreamReader.java @@ -47,7 +47,7 @@ public class ByteBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ByteBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ByteBatchStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteSelectiveStreamReader.java index 47b8c8e621d2a..4f751f25d6de3 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteSelectiveStreamReader.java @@ -49,7 +49,7 @@ public class ByteSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ByteSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ByteSelectiveStreamReader.class).instanceSize(); private static final Block NULL_BLOCK = TINYINT.createBlockBuilder(null, 1).appendNull().build(); private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DecimalBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DecimalBatchStreamReader.java index a6a68e67cd227..1c1ac6deb8504 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DecimalBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DecimalBatchStreamReader.java @@ -49,7 +49,7 @@ public class DecimalBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DecimalBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DecimalBatchStreamReader.class).instanceSize(); private final DecimalType type; private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleBatchStreamReader.java index c9506616e212e..b7d503ffc160d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleBatchStreamReader.java @@ -42,7 +42,7 @@ public class DoubleBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DoubleBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DoubleBatchStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleSelectiveStreamReader.java index 96f8f6cfd8a10..7f89b3e7c144e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleSelectiveStreamReader.java @@ -49,7 +49,7 @@ public class DoubleSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DoubleSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DoubleSelectiveStreamReader.class).instanceSize(); private static final Block NULL_BLOCK = DOUBLE.createBlockBuilder(null, 1).appendNull().build(); diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatBatchStreamReader.java index 85bfc7849a593..9e49381a01b9a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatBatchStreamReader.java @@ -43,7 +43,7 @@ public class FloatBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FloatBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FloatBatchStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatSelectiveStreamReader.java index fb2db102e61d0..a7d94a95c679c 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatSelectiveStreamReader.java @@ -48,7 +48,7 @@ public class FloatSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FloatSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FloatSelectiveStreamReader.class).instanceSize(); private static final Block NULL_BLOCK = REAL.createBlockBuilder(null, 1).appendNull().build(); private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListBatchStreamReader.java index 6b0ed8beaf477..500488755eaae 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListBatchStreamReader.java @@ -50,7 +50,7 @@ public class ListBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ListBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ListBatchStreamReader.class).instanceSize(); private final Type elementType; private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListFilter.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListFilter.java index e2bac1a7f0a8d..f25be6dba6c3d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListFilter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListFilter.java @@ -37,7 +37,7 @@ public class ListFilter implements HierarchicalFilter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ListFilter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ListFilter.class).instanceSize(); @Nullable private final HierarchicalFilter parent; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListSelectiveStreamReader.java index fc88391d5d1b5..4554ff2846087 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListSelectiveStreamReader.java @@ -65,7 +65,7 @@ public class ListSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ListSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ListSelectiveStreamReader.class).instanceSize(); private static final int ELEMENT_LENGTH_UNBOUNDED = -1; private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongBatchStreamReader.java index f6bce66652780..0b746824a3700 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongBatchStreamReader.java @@ -37,7 +37,7 @@ public class LongBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongBatchStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; private final LongDirectBatchStreamReader directReader; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryBatchStreamReader.java index 4405c095d129d..a839a782977c5 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryBatchStreamReader.java @@ -48,7 +48,7 @@ public class LongDictionaryBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongDictionaryBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongDictionaryBatchStreamReader.class).instanceSize(); private final Type type; private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java index 0427659cdb7a7..28a4518c9577d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java @@ -44,7 +44,7 @@ public class LongDictionarySelectiveStreamReader extends AbstractLongSelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongDictionarySelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongDictionarySelectiveStreamReader.class).instanceSize(); // filter evaluation status for dictionary entries; using byte instead of enum for memory efficiency private static final byte FILTER_NOT_EVALUATED = 0; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectBatchStreamReader.java index a5194b7049264..54ed47e335a7b 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectBatchStreamReader.java @@ -56,7 +56,7 @@ public class LongDirectBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongDirectBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongDirectBatchStreamReader.class).instanceSize(); private final Type type; private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectSelectiveStreamReader.java index 316536b488206..d2795a8ad6063 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectSelectiveStreamReader.java @@ -40,7 +40,7 @@ public class LongDirectSelectiveStreamReader extends AbstractLongSelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongDirectSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongDirectSelectiveStreamReader.class).instanceSize(); private final OrcLocalMemoryContext systemMemoryContext; private InputStreamSource presentStreamSource = getBooleanMissingStreamSource(); diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongSelectiveStreamReader.java index 2d7953ef4ac0c..c2e433df0e1bf 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongSelectiveStreamReader.java @@ -35,7 +35,7 @@ public class LongSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongSelectiveStreamReader.class).instanceSize(); private final SelectiveReaderContext context; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapBatchStreamReader.java index 96c6e204c6be4..dcd655e2a016a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapBatchStreamReader.java @@ -39,7 +39,7 @@ public class MapBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapBatchStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; private final MapDirectBatchStreamReader directReader; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectBatchStreamReader.java index 196e5013f2176..6f7bb614cb547 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectBatchStreamReader.java @@ -50,7 +50,7 @@ public class MapDirectBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapDirectBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapDirectBatchStreamReader.class).instanceSize(); private final MapType type; private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectSelectiveStreamReader.java index 101a3aeb7eabe..f18cd4aaa7a7c 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectSelectiveStreamReader.java @@ -67,7 +67,7 @@ public class MapDirectSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapDirectSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapDirectSelectiveStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; private final boolean nullsAllowed; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatBatchStreamReader.java index e467ec21fd568..0377992896ecb 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatBatchStreamReader.java @@ -71,7 +71,7 @@ public class MapFlatBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapFlatBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapFlatBatchStreamReader.class).instanceSize(); private final MapType type; private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java index ab2719e5ae555..9c20fdec7ad7c 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java @@ -79,7 +79,7 @@ public class MapFlatSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapFlatSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapFlatSelectiveStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapSelectiveStreamReader.java index e547b566782b7..4a611d67e790a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapSelectiveStreamReader.java @@ -45,7 +45,7 @@ public class MapSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapSelectiveStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; private final MapDirectSelectiveStreamReader directReader; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceBatchStreamReader.java index 7951adb307b9a..31d49f94f6974 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceBatchStreamReader.java @@ -48,7 +48,7 @@ public class SliceBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SliceBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SliceBatchStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; private final SliceDirectBatchStreamReader directReader; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryBatchStreamReader.java index 1587df1d08929..44bdefdfbe8f7 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryBatchStreamReader.java @@ -56,7 +56,7 @@ public class SliceDictionaryBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SliceDictionaryBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SliceDictionaryBatchStreamReader.class).instanceSize(); private static final byte[] EMPTY_DICTIONARY_DATA = new byte[0]; // add one extra entry for null after strip/rowGroup dictionary diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionarySelectiveReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionarySelectiveReader.java index ff96fe90f7d65..39baba56755bd 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionarySelectiveReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionarySelectiveReader.java @@ -69,7 +69,7 @@ public class SliceDictionarySelectiveReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SliceDictionarySelectiveReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SliceDictionarySelectiveReader.class).instanceSize(); // filter evaluation states, using byte constants instead of enum as its memory efficient private static final byte FILTER_NOT_EVALUATED = 0; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectBatchStreamReader.java index bce6275a0e17c..b9bb9835e08d0 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectBatchStreamReader.java @@ -54,7 +54,7 @@ public class SliceDirectBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SliceDirectBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SliceDirectBatchStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; private final int maxCodePointCount; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectSelectiveStreamReader.java index 00a3556d3e35a..c23594cdc4f29 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectSelectiveStreamReader.java @@ -61,7 +61,7 @@ public class SliceDirectSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SliceDirectSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SliceDirectSelectiveStreamReader.class).instanceSize(); private final SelectiveReaderContext context; private final boolean isCharType; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceSelectiveStreamReader.java index ed7076ad1b634..0f02edfadfd8e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceSelectiveStreamReader.java @@ -39,7 +39,7 @@ public class SliceSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SliceSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SliceSelectiveStreamReader.class).instanceSize(); private final SelectiveReaderContext context; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructBatchStreamReader.java index 555b24cac7ef0..8ea1329299792 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructBatchStreamReader.java @@ -54,7 +54,7 @@ public class StructBatchStreamReader implements BatchStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(StructBatchStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(StructBatchStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructSelectiveStreamReader.java index 43c536cf84410..58d2a3152b5d8 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructSelectiveStreamReader.java @@ -68,7 +68,7 @@ public class StructSelectiveStreamReader implements SelectiveStreamReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(StructSelectiveStreamReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(StructSelectiveStreamReader.class).instanceSize(); private final StreamDescriptor streamDescriptor; private final boolean nullsAllowed; @@ -707,7 +707,7 @@ private static Optional>> getRequiredFields(List { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanOutputStream.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanOutputStream.class).instanceSize(); private final ByteOutputStream byteOutputStream; private final List checkpointBitOffsets = new ArrayList<>(); diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayOutputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayOutputStream.java index e5315438fa48a..2d331e8a32a36 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayOutputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayOutputStream.java @@ -38,7 +38,7 @@ public class ByteArrayOutputStream implements ValueOutputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ByteArrayOutputStream.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ByteArrayOutputStream.class).instanceSize(); private final OrcOutputBuffer buffer; private final List checkpoints = new ArrayList<>(); private final StreamKind streamKind; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteOutputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteOutputStream.java index 7970f3bb7aa98..48eab671855bb 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteOutputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteOutputStream.java @@ -34,7 +34,7 @@ public class ByteOutputStream implements ValueOutputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ByteOutputStream.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ByteOutputStream.class).instanceSize(); private static final int MIN_REPEAT_SIZE = 3; // A value outside of the range of a signed byte diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/DecimalOutputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/DecimalOutputStream.java index e85c9e5f5e46f..738fa59a16678 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/DecimalOutputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/DecimalOutputStream.java @@ -38,7 +38,7 @@ public class DecimalOutputStream implements ValueOutputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DecimalOutputStream.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DecimalOutputStream.class).instanceSize(); private final OrcOutputBuffer buffer; private final List checkpoints = new ArrayList<>(); diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleOutputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleOutputStream.java index 4e8f7e9a04196..7e5193b1a8230 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleOutputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleOutputStream.java @@ -32,7 +32,7 @@ public class DoubleOutputStream implements ValueOutputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DoubleOutputStream.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DoubleOutputStream.class).instanceSize(); private final OrcOutputBuffer buffer; private final List checkpoints = new ArrayList<>(); diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatOutputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatOutputStream.java index ba5df684a226f..5c3e4cfbf7a93 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatOutputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatOutputStream.java @@ -32,7 +32,7 @@ public class FloatOutputStream implements ValueOutputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FloatOutputStream.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FloatOutputStream.class).instanceSize(); private final OrcOutputBuffer buffer; private final List checkpoints = new ArrayList<>(); diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/InMapOutputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/InMapOutputStream.java index 9822201fe9c4c..e23d99be29bcf 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/InMapOutputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/InMapOutputStream.java @@ -24,7 +24,7 @@ public class InMapOutputStream extends BooleanOutputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(InMapOutputStream.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(InMapOutputStream.class).instanceSize(); public InMapOutputStream(ColumnWriterOptions columnWriterOptions, Optional dwrfEncryptor) { diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamDwrf.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamDwrf.java index 0fcac68fd1939..cc7028bfbb550 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamDwrf.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamDwrf.java @@ -35,7 +35,7 @@ public class LongOutputStreamDwrf implements LongOutputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongOutputStreamDwrf.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongOutputStreamDwrf.class).instanceSize(); private final StreamKind streamKind; private final OrcOutputBuffer buffer; private final boolean signed; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamV1.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamV1.java index d89403ba36864..c0e45604f477e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamV1.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamV1.java @@ -37,7 +37,7 @@ public class LongOutputStreamV1 implements LongOutputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongOutputStreamV1.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongOutputStreamV1.class).instanceSize(); private static final int MIN_REPEAT_SIZE = 3; private static final long UNMATCHABLE_DELTA_VALUE = Long.MAX_VALUE; private static final int MAX_DELTA = 127; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamV2.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamV2.java index 5b4963c6f625d..8b9a1c329d292 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamV2.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongOutputStreamV2.java @@ -55,7 +55,7 @@ private int getOpCode() } } - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongOutputStreamV2.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongOutputStreamV2.class).instanceSize(); private static final int MAX_SCOPE = 512; private static final int MIN_REPEAT = 3; private static final int MAX_SHORT_REPEAT_LENGTH = 10; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcInputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcInputStream.java index e0a2cfa4e1bf6..a1a45c3e4c325 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcInputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcInputStream.java @@ -48,7 +48,7 @@ public final class OrcInputStream extends InputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(OrcInputStream.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(OrcInputStream.class).instanceSize(); private static final long VARINT_MASK = 0x8080_8080_8080_8080L; private static final int MAX_VARINT_LENGTH = 10; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/PresentOutputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/PresentOutputStream.java index e7a791f190031..c5530c3c5058e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/PresentOutputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/PresentOutputStream.java @@ -30,7 +30,7 @@ public class PresentOutputStream { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PresentOutputStream.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PresentOutputStream.class).instanceSize(); private final OrcOutputBuffer buffer; // boolean stream will only exist if null values being recorded diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/BooleanColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/BooleanColumnWriter.java index dde70a28b95dc..dc37129235874 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/BooleanColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/BooleanColumnWriter.java @@ -50,7 +50,7 @@ public class BooleanColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanColumnWriter.class).instanceSize(); private static final ColumnEncoding COLUMN_ENCODING = new ColumnEncoding(DIRECT, 0); private final int column; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/ByteColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/ByteColumnWriter.java index 1dce0c5fee550..5a6be0e5bccdd 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/ByteColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/ByteColumnWriter.java @@ -50,7 +50,7 @@ public class ByteColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ByteColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ByteColumnWriter.class).instanceSize(); private static final ColumnEncoding COLUMN_ENCODING = new ColumnEncoding(DIRECT, 0); private final int column; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/CompressionBufferPool.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/CompressionBufferPool.java index 01bbdf8cb3c07..a926cfd48a28a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/CompressionBufferPool.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/CompressionBufferPool.java @@ -31,7 +31,7 @@ public interface CompressionBufferPool class LastUsedCompressionBufferPool implements CompressionBufferPool { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LastUsedCompressionBufferPool.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LastUsedCompressionBufferPool.class).instanceSize(); private byte[] lastUsed; @Override diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DecimalColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DecimalColumnWriter.java index d4021ab4e92b7..d1d6e0e01df0f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DecimalColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DecimalColumnWriter.java @@ -59,7 +59,7 @@ public class DecimalColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DecimalColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DecimalColumnWriter.class).instanceSize(); private final int column; private final DecimalType type; private final ColumnEncoding columnEncoding; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroup.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroup.java index 6aa03419b354b..50dbf12495ae7 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroup.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroup.java @@ -22,7 +22,7 @@ class DictionaryRowGroup { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DictionaryRowGroup.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DictionaryRowGroup.class).instanceSize(); private final byte[][] byteSegments; private final short[][] shortSegments; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroupBuilder.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroupBuilder.java index 2d1cceda6aa2d..042e4eacf4de7 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroupBuilder.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroupBuilder.java @@ -50,7 +50,7 @@ */ class DictionaryRowGroupBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DictionaryRowGroupBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DictionaryRowGroupBuilder.class).instanceSize(); private byte[][] byteSegments; private int byteSegmentOffset; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DoubleColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DoubleColumnWriter.java index ac2997a1ea700..bf3e26232acd3 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DoubleColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DoubleColumnWriter.java @@ -50,7 +50,7 @@ public class DoubleColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DoubleColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DoubleColumnWriter.class).instanceSize(); private static final ColumnEncoding COLUMN_ENCODING = new ColumnEncoding(DIRECT, 0); private static final long TYPE_SIZE = Double.BYTES; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/FloatColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/FloatColumnWriter.java index 9293656d7ff7f..c2613ca8cb7a1 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/FloatColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/FloatColumnWriter.java @@ -51,7 +51,7 @@ public class FloatColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FloatColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FloatColumnWriter.class).instanceSize(); private static final ColumnEncoding COLUMN_ENCODING = new ColumnEncoding(DIRECT, 0); private static final long TYPE_SIZE = Float.BYTES; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/ListColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/ListColumnWriter.java index d59713d622b53..7fe4cb583d2bf 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/ListColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/ListColumnWriter.java @@ -54,7 +54,7 @@ public class ListColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ListColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ListColumnWriter.class).instanceSize(); private final int column; private final int sequence; private final boolean compressed; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/LongColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/LongColumnWriter.java index 298e62de4060d..05a36cf91562e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/LongColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/LongColumnWriter.java @@ -60,7 +60,7 @@ public class LongColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongColumnWriter.class).instanceSize(); private final int column; private final int sequence; private final Type type; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/LongDictionaryBuilder.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/LongDictionaryBuilder.java index f3e51f3cc103a..ab6641f23c86e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/LongDictionaryBuilder.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/LongDictionaryBuilder.java @@ -24,7 +24,7 @@ public class LongDictionaryBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongDictionaryBuilder.class).instanceSize() + ClassLayout.parseClass(LongArrayList.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongDictionaryBuilder.class).instanceSize() + ClassLayout.parseClass(LongArrayList.class).instanceSize(); private static final float FILL_RATIO = 0.75f; private static final int EMPTY_SLOT = -1; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/MapColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/MapColumnWriter.java index d4b403f4bea75..dc5c7794d237f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/MapColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/MapColumnWriter.java @@ -54,7 +54,7 @@ public class MapColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapColumnWriter.class).instanceSize(); private final int column; private final int sequence; private final boolean compressed; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/MapFlatColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/MapFlatColumnWriter.java index ee15892eca025..b0accde910cef 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/MapFlatColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/MapFlatColumnWriter.java @@ -83,7 +83,7 @@ public class MapFlatColumnWriter private static final int SEQUENCE_START_INDEX = 1; private static final ColumnEncoding FLAT_MAP_COLUMN_ENCODING = new ColumnEncoding(DWRF_MAP_FLAT, 0); private static final DwrfProto.KeyInfo EMPTY_SLICE_KEY = DwrfProto.KeyInfo.newBuilder().setBytesKey(ByteString.EMPTY).build(); - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapFlatColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapFlatColumnWriter.class).instanceSize(); private static final int MIN_CAPACITY = 16; private final int nodeIndex; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/SegmentedSliceBlockBuilder.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/SegmentedSliceBlockBuilder.java index 5ffffb0bac73f..5f9e47e7f3fd9 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/SegmentedSliceBlockBuilder.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/SegmentedSliceBlockBuilder.java @@ -69,7 +69,7 @@ public class SegmentedSliceBlockBuilder extends AbstractVariableWidthBlockBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SegmentedSliceBlockBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SegmentedSliceBlockBuilder.class).instanceSize(); private final int expectedBytes; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDictionaryBuilder.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDictionaryBuilder.java index 1576045626ea5..c4a13f01a233b 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDictionaryBuilder.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDictionaryBuilder.java @@ -27,7 +27,7 @@ public class SliceDictionaryBuilder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SliceDictionaryBuilder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SliceDictionaryBuilder.class).instanceSize(); private static final float FILL_RATIO = 0.75f; private static final int EMPTY_SLOT = -1; private static final int EXPECTED_BYTES_PER_ENTRY = 32; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDirectColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDirectColumnWriter.java index 7f39821247194..a9fafccbfbb5e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDirectColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDirectColumnWriter.java @@ -57,7 +57,7 @@ public class SliceDirectColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SliceDirectColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SliceDirectColumnWriter.class).instanceSize(); private final int column; private final int sequence; private final boolean compressed; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/StructColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/StructColumnWriter.java index e45b9d7a9d798..f53c4c788d0fb 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/StructColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/StructColumnWriter.java @@ -49,7 +49,7 @@ public class StructColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(StructColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(StructColumnWriter.class).instanceSize(); private static final ColumnEncoding COLUMN_ENCODING = new ColumnEncoding(DIRECT, 0); private final int column; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/TimestampColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/TimestampColumnWriter.java index d6c1d8761f49a..d7f5607f1f04f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/TimestampColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/TimestampColumnWriter.java @@ -60,7 +60,7 @@ public class TimestampColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TimestampColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TimestampColumnWriter.class).instanceSize(); private static final int MILLIS_PER_SECOND = 1000; private static final int MICROS_PER_SECOND = 1000_000; private static final int MILLIS_TO_NANOS_TRAILING_ZEROS = 5; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDateStatistics.java b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDateStatistics.java index 02ea0caec3f73..2b744d876525d 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDateStatistics.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDateStatistics.java @@ -22,7 +22,7 @@ public class TestDateStatistics extends AbstractRangeStatisticsTest { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DateStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DateStatistics.class).instanceSize(); @Override protected DateStatistics getCreateStatistics(Integer min, Integer max) diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDecimalStatistics.java b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDecimalStatistics.java index 43260f5ad15fc..68eac250ad38d 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDecimalStatistics.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDecimalStatistics.java @@ -26,7 +26,7 @@ public class TestDecimalStatistics extends AbstractRangeStatisticsTest { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DecimalStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DecimalStatistics.class).instanceSize(); private static final long BIG_DECIMAL_INSTANCE_SIZE = ClassLayout.parseClass(BigDecimal.class).instanceSize() + ClassLayout.parseClass(BigInteger.class).instanceSize() + sizeOf(new int[0]); private static final BigDecimal MEDIUM_VALUE = new BigDecimal("890.37492"); diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDoubleStatistics.java b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDoubleStatistics.java index 3fc6d0685ea9d..3e0b865b66fa8 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDoubleStatistics.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestDoubleStatistics.java @@ -24,7 +24,7 @@ public class TestDoubleStatistics extends AbstractRangeStatisticsTest { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DoubleStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DoubleStatistics.class).instanceSize(); @Override protected DoubleStatistics getCreateStatistics(Double min, Double max) diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestIntegerStatistics.java b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestIntegerStatistics.java index 8ac0c21d476c4..1b973e96b2c68 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestIntegerStatistics.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestIntegerStatistics.java @@ -22,7 +22,7 @@ public class TestIntegerStatistics extends AbstractRangeStatisticsTest { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(IntegerStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(IntegerStatistics.class).instanceSize(); @Override protected IntegerStatistics getCreateStatistics(Long min, Long max) diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestStringStatistics.java b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestStringStatistics.java index 117733c310d2f..b4160127d26e2 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestStringStatistics.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/statistics/TestStringStatistics.java @@ -23,7 +23,7 @@ public class TestStringStatistics extends AbstractRangeStatisticsTest { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(StringStatistics.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(StringStatistics.class).instanceSize(); // U+0000 to U+D7FF private static final Slice LOW_BOTTOM_VALUE = utf8Slice("foo \u0000"); diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/DataPageV1.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/DataPageV1.java index 9e7112e1fa3f8..2de84dbaafe62 100755 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/DataPageV1.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/DataPageV1.java @@ -23,7 +23,7 @@ public class DataPageV1 extends DataPage { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DataPageV1.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DataPageV1.class).instanceSize(); private final Slice slice; private final Statistics statistics; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/DataPageV2.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/DataPageV2.java index 89c66da8a5b1c..b3b4fbcea7bbf 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/DataPageV2.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/DataPageV2.java @@ -23,7 +23,7 @@ public class DataPageV2 extends DataPage { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DataPageV2.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DataPageV2.class).instanceSize(); private final int rowCount; private final int nullCount; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/DictionaryPage.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/DictionaryPage.java index 5a3f53393ac14..db1415a5021ef 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/DictionaryPage.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/DictionaryPage.java @@ -23,7 +23,7 @@ public class DictionaryPage extends Page { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DictionaryPage.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DictionaryPage.class).instanceSize(); private final Slice slice; private final int dictionarySize; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/AbstractNestedBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/AbstractNestedBatchReader.java index e253aac9fa93d..a0d9d6618d62f 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/AbstractNestedBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/AbstractNestedBatchReader.java @@ -43,7 +43,7 @@ public abstract class AbstractNestedBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(AbstractNestedBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(AbstractNestedBatchReader.class).instanceSize(); protected final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/BinaryFlatBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/BinaryFlatBatchReader.java index 6ec3ec822f7f6..132b45b24c1ef 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/BinaryFlatBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/BinaryFlatBatchReader.java @@ -50,7 +50,7 @@ public class BinaryFlatBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryFlatBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryFlatBatchReader.class).instanceSize(); private final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/BooleanFlatBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/BooleanFlatBatchReader.java index 73dedeeeba719..c12f1009dd0fd 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/BooleanFlatBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/BooleanFlatBatchReader.java @@ -45,7 +45,7 @@ public class BooleanFlatBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanFlatBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanFlatBatchReader.class).instanceSize(); private final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int32FlatBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int32FlatBatchReader.java index b1df05a50ab11..5b8a4d2c0b364 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int32FlatBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int32FlatBatchReader.java @@ -45,7 +45,7 @@ public class Int32FlatBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int32FlatBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int32FlatBatchReader.class).instanceSize(); private final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int64FlatBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int64FlatBatchReader.java index cba2bd2c1297a..c7b723600e0a5 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int64FlatBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int64FlatBatchReader.java @@ -45,7 +45,7 @@ public class Int64FlatBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int64FlatBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int64FlatBatchReader.class).instanceSize(); private final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int64TimeAndTimestampMicrosFlatBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int64TimeAndTimestampMicrosFlatBatchReader.java index ccedd8af82645..53c2eb7f64993 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int64TimeAndTimestampMicrosFlatBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/Int64TimeAndTimestampMicrosFlatBatchReader.java @@ -45,7 +45,7 @@ public class Int64TimeAndTimestampMicrosFlatBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int64TimeAndTimestampMicrosFlatBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int64TimeAndTimestampMicrosFlatBatchReader.class).instanceSize(); private final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/LongDecimalFlatBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/LongDecimalFlatBatchReader.java index 90a13544b3186..953216a519ece 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/LongDecimalFlatBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/LongDecimalFlatBatchReader.java @@ -45,7 +45,7 @@ public class LongDecimalFlatBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongDecimalFlatBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongDecimalFlatBatchReader.class).instanceSize(); private final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/ShortDecimalFlatBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/ShortDecimalFlatBatchReader.java index 235d7f79cc580..a31ca86d8b046 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/ShortDecimalFlatBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/ShortDecimalFlatBatchReader.java @@ -45,7 +45,7 @@ public class ShortDecimalFlatBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ShortDecimalFlatBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ShortDecimalFlatBatchReader.class).instanceSize(); private final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/TimestampFlatBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/TimestampFlatBatchReader.java index 0d52fa272e455..f9a378912b961 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/TimestampFlatBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/TimestampFlatBatchReader.java @@ -45,7 +45,7 @@ public class TimestampFlatBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TimestampFlatBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TimestampFlatBatchReader.class).instanceSize(); private final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/UuidFlatBatchReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/UuidFlatBatchReader.java index bf3cdf864bb54..0a6799b5c4e92 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/UuidFlatBatchReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/UuidFlatBatchReader.java @@ -46,7 +46,7 @@ public class UuidFlatBatchReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(UuidFlatBatchReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(UuidFlatBatchReader.class).instanceSize(); private final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/RepetitionLevelDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/RepetitionLevelDecoder.java index f8569b4448f1d..a19fe4e359b32 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/RepetitionLevelDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/RepetitionLevelDecoder.java @@ -27,7 +27,7 @@ public class RepetitionLevelDecoder extends BaseRLEBitPackedDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BaseRLEBitPackedDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BaseRLEBitPackedDecoder.class).instanceSize(); private int remaining; private int currentOffsetPackedBuffer; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/AbstractInt64AndInt32ShortDecimalDeltaValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/AbstractInt64AndInt32ShortDecimalDeltaValuesDecoder.java index 76ccdc2a8a847..ce622393c5427 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/AbstractInt64AndInt32ShortDecimalDeltaValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/AbstractInt64AndInt32ShortDecimalDeltaValuesDecoder.java @@ -23,7 +23,7 @@ public abstract class AbstractInt64AndInt32ShortDecimalDeltaValuesDecoder implements ShortDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(AbstractInt64AndInt32ShortDecimalDeltaValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(AbstractInt64AndInt32ShortDecimalDeltaValuesDecoder.class).instanceSize(); protected final ValuesReader delegate; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryDeltaValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryDeltaValuesDecoder.java index 2210c9250e131..a4bf081968ee9 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryDeltaValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryDeltaValuesDecoder.java @@ -36,7 +36,7 @@ public class BinaryDeltaValuesDecoder implements BinaryValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryDeltaValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryDeltaValuesDecoder.class).instanceSize(); private final ValuesReader innerReader; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryLongDecimalDeltaValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryLongDecimalDeltaValuesDecoder.java index fb08cd047e0cc..12484be846803 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryLongDecimalDeltaValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryLongDecimalDeltaValuesDecoder.java @@ -30,7 +30,7 @@ public class BinaryLongDecimalDeltaValuesDecoder implements LongDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryLongDecimalDeltaValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryLongDecimalDeltaValuesDecoder.class).instanceSize(); private final BinaryDeltaValuesDecoder delegate; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryShortDecimalDeltaValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryShortDecimalDeltaValuesDecoder.java index 4b0cd8892c5e8..c75775979777f 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryShortDecimalDeltaValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/BinaryShortDecimalDeltaValuesDecoder.java @@ -28,7 +28,7 @@ public class BinaryShortDecimalDeltaValuesDecoder implements ShortDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryShortDecimalDeltaValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryShortDecimalDeltaValuesDecoder.class).instanceSize(); private final BinaryDeltaValuesDecoder delegate; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayLongDecimalDeltaValueDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayLongDecimalDeltaValueDecoder.java index f0a4cdb931d09..9d3323d1e7838 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayLongDecimalDeltaValueDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayLongDecimalDeltaValueDecoder.java @@ -32,7 +32,7 @@ public class FixedLenByteArrayLongDecimalDeltaValueDecoder implements LongDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayLongDecimalDeltaValueDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayLongDecimalDeltaValueDecoder.class).instanceSize(); private final ValuesReader delegate; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayShortDecimalDeltaValueDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayShortDecimalDeltaValueDecoder.java index 86b73c43d8331..47d7250a387db 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayShortDecimalDeltaValueDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayShortDecimalDeltaValueDecoder.java @@ -34,7 +34,7 @@ public class FixedLenByteArrayShortDecimalDeltaValueDecoder implements ShortDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayShortDecimalDeltaValueDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayShortDecimalDeltaValueDecoder.class).instanceSize(); private final ValuesReader delegate; private final ColumnDescriptor descriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayUuidDeltaValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayUuidDeltaValuesDecoder.java index 84180bb455f22..619e47ace97aa 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayUuidDeltaValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/FixedLenByteArrayUuidDeltaValuesDecoder.java @@ -28,7 +28,7 @@ public class FixedLenByteArrayUuidDeltaValuesDecoder implements UuidValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayUuidDeltaValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayUuidDeltaValuesDecoder.class).instanceSize(); private final ValuesReader delegate; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int32DeltaBinaryPackedValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int32DeltaBinaryPackedValuesDecoder.java index ac133717605b6..8ab6fab535b3d 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int32DeltaBinaryPackedValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int32DeltaBinaryPackedValuesDecoder.java @@ -28,7 +28,7 @@ public class Int32DeltaBinaryPackedValuesDecoder implements Int32ValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int32DeltaBinaryPackedValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int32DeltaBinaryPackedValuesDecoder.class).instanceSize(); private final DeltaBinaryPackingValuesReader innerReader; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int64DeltaBinaryPackedValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int64DeltaBinaryPackedValuesDecoder.java index eb6f29df3f9d0..4ca4579de4c07 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int64DeltaBinaryPackedValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int64DeltaBinaryPackedValuesDecoder.java @@ -28,7 +28,7 @@ public class Int64DeltaBinaryPackedValuesDecoder implements Int64ValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int64DeltaBinaryPackedValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int64DeltaBinaryPackedValuesDecoder.class).instanceSize(); private final DeltaBinaryPackingValuesReader innerReader; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int64TimeAndTimestampMicrosDeltaBinaryPackedValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int64TimeAndTimestampMicrosDeltaBinaryPackedValuesDecoder.java index a8c7b8a6442d2..100219d4a9d12 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int64TimeAndTimestampMicrosDeltaBinaryPackedValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/delta/Int64TimeAndTimestampMicrosDeltaBinaryPackedValuesDecoder.java @@ -32,7 +32,7 @@ public class Int64TimeAndTimestampMicrosDeltaBinaryPackedValuesDecoder implements Int64TimeAndTimestampMicrosValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int64TimeAndTimestampMicrosDeltaBinaryPackedValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int64TimeAndTimestampMicrosDeltaBinaryPackedValuesDecoder.class).instanceSize(); private final DeltaBinaryPackingValuesReader innerReader; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryLongDecimalPlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryLongDecimalPlainValuesDecoder.java index 4af38a23018c5..a42574874e0c8 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryLongDecimalPlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryLongDecimalPlainValuesDecoder.java @@ -29,7 +29,7 @@ public class BinaryLongDecimalPlainValuesDecoder implements LongDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryLongDecimalPlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryLongDecimalPlainValuesDecoder.class).instanceSize(); private final BinaryPlainValuesDecoder delegate; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryPlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryPlainValuesDecoder.java index 3673707f85d11..3838a13e2352d 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryPlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryPlainValuesDecoder.java @@ -24,7 +24,7 @@ public class BinaryPlainValuesDecoder implements BinaryValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryPlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryPlainValuesDecoder.class).instanceSize(); private final byte[] buffer; private final int bufEnd; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryShortDecimalPlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryShortDecimalPlainValuesDecoder.java index 524be42eb2666..e56efa8f40a24 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryShortDecimalPlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BinaryShortDecimalPlainValuesDecoder.java @@ -25,7 +25,7 @@ public class BinaryShortDecimalPlainValuesDecoder implements ShortDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryShortDecimalPlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryShortDecimalPlainValuesDecoder.class).instanceSize(); private final BinaryPlainValuesDecoder delegate; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BooleanPlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BooleanPlainValuesDecoder.java index d1947bffed3ad..17ac576dd15ec 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BooleanPlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/BooleanPlainValuesDecoder.java @@ -23,7 +23,7 @@ public class BooleanPlainValuesDecoder implements BooleanValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanPlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanPlainValuesDecoder.class).instanceSize(); private final byte[] byteBuffer; private final int bufferEnd; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayLongDecimalPlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayLongDecimalPlainValuesDecoder.java index 08182cbeb2a1b..7da7de813eff0 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayLongDecimalPlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayLongDecimalPlainValuesDecoder.java @@ -28,7 +28,7 @@ public class FixedLenByteArrayLongDecimalPlainValuesDecoder implements LongDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryLongDecimalPlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryLongDecimalPlainValuesDecoder.class).instanceSize(); private final int typeLength; private final byte[] inputBytes; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayShortDecimalPlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayShortDecimalPlainValuesDecoder.java index 49d2b4fb7b10c..67428244ffc4c 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayShortDecimalPlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayShortDecimalPlainValuesDecoder.java @@ -28,7 +28,7 @@ public class FixedLenByteArrayShortDecimalPlainValuesDecoder implements ShortDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayShortDecimalPlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayShortDecimalPlainValuesDecoder.class).instanceSize(); private final ColumnDescriptor columnDescriptor; private final int typeLength; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayUuidPlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayUuidPlainValuesDecoder.java index 296021588e442..f303fc23127b6 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayUuidPlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/FixedLenByteArrayUuidPlainValuesDecoder.java @@ -25,7 +25,7 @@ public class FixedLenByteArrayUuidPlainValuesDecoder implements UuidValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayUuidPlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FixedLenByteArrayUuidPlainValuesDecoder.class).instanceSize(); private final int typeLength; private final int bufferEnd; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int32PlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int32PlainValuesDecoder.java index 19ac166f0f715..3dd4ec76e3e7f 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int32PlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int32PlainValuesDecoder.java @@ -23,7 +23,7 @@ public class Int32PlainValuesDecoder implements Int32ValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int32PlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int32PlainValuesDecoder.class).instanceSize(); private final byte[] byteBuffer; private final int bufferEnd; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int64PlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int64PlainValuesDecoder.java index 4be7dcf270a50..9cee4cad1e3c7 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int64PlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int64PlainValuesDecoder.java @@ -23,7 +23,7 @@ public class Int64PlainValuesDecoder implements Int64ValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int64PlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int64PlainValuesDecoder.class).instanceSize(); private final byte[] byteBuffer; private final int bufferEnd; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int64TimeAndTimestampMicrosPlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int64TimeAndTimestampMicrosPlainValuesDecoder.java index 96b76d5f20878..d9e52bbb546b8 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int64TimeAndTimestampMicrosPlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/Int64TimeAndTimestampMicrosPlainValuesDecoder.java @@ -26,7 +26,7 @@ public class Int64TimeAndTimestampMicrosPlainValuesDecoder implements Int64TimeAndTimestampMicrosValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int64TimeAndTimestampMicrosPlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int64TimeAndTimestampMicrosPlainValuesDecoder.class).instanceSize(); private final byte[] byteBuffer; private final int bufferEnd; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/TimestampPlainValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/TimestampPlainValuesDecoder.java index 12f23a72697ae..da70a1f8fdb3d 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/TimestampPlainValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/plain/TimestampPlainValuesDecoder.java @@ -23,7 +23,7 @@ public class TimestampPlainValuesDecoder implements TimestampValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TimestampPlainValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TimestampPlainValuesDecoder.class).instanceSize(); private final byte[] byteBuffer; private final int bufferEnd; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BaseRLEBitPackedDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BaseRLEBitPackedDecoder.java index d6c58c4a84ad4..a75541ba3d4f5 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BaseRLEBitPackedDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BaseRLEBitPackedDecoder.java @@ -32,7 +32,7 @@ public abstract class BaseRLEBitPackedDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BaseRLEBitPackedDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BaseRLEBitPackedDecoder.class).instanceSize(); private final boolean rleOnlyMode; private final int bitWidth; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BinaryRLEDictionaryValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BinaryRLEDictionaryValuesDecoder.java index e0cd6726e02ff..ca0039e1d2be1 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BinaryRLEDictionaryValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BinaryRLEDictionaryValuesDecoder.java @@ -29,7 +29,7 @@ public class BinaryRLEDictionaryValuesDecoder extends BaseRLEBitPackedDecoder implements BinaryValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryRLEDictionaryValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryRLEDictionaryValuesDecoder.class).instanceSize(); private final BinaryBatchDictionary dictionary; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BooleanRLEValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BooleanRLEValuesDecoder.java index df1b6d2d280af..8d3e8f4cbe903 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BooleanRLEValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/BooleanRLEValuesDecoder.java @@ -28,7 +28,7 @@ public class BooleanRLEValuesDecoder implements BooleanValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BooleanRLEValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BooleanRLEValuesDecoder.class).instanceSize(); private final ByteBuffer inputBuffer; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int32RLEDictionaryValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int32RLEDictionaryValuesDecoder.java index 6ea3a032d169e..8337feb418a4d 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int32RLEDictionaryValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int32RLEDictionaryValuesDecoder.java @@ -29,7 +29,7 @@ public class Int32RLEDictionaryValuesDecoder extends BaseRLEBitPackedDecoder implements Int32ValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int32RLEDictionaryValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int32RLEDictionaryValuesDecoder.class).instanceSize(); private final IntegerDictionary dictionary; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int64RLEDictionaryValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int64RLEDictionaryValuesDecoder.java index 51d6da3836278..46ae3e6dd3d9e 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int64RLEDictionaryValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int64RLEDictionaryValuesDecoder.java @@ -30,7 +30,7 @@ public class Int64RLEDictionaryValuesDecoder extends BaseRLEBitPackedDecoder implements Int64ValuesDecoder, ShortDecimalValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int64RLEDictionaryValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int64RLEDictionaryValuesDecoder.class).instanceSize(); private final LongDictionary dictionary; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int64TimeAndTimestampMicrosRLEDictionaryValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int64TimeAndTimestampMicrosRLEDictionaryValuesDecoder.java index c94d88f896805..b999e4f45ba50 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int64TimeAndTimestampMicrosRLEDictionaryValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/Int64TimeAndTimestampMicrosRLEDictionaryValuesDecoder.java @@ -32,7 +32,7 @@ public class Int64TimeAndTimestampMicrosRLEDictionaryValuesDecoder extends BaseRLEBitPackedDecoder implements Int64TimeAndTimestampMicrosValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(Int64TimeAndTimestampMicrosRLEDictionaryValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(Int64TimeAndTimestampMicrosRLEDictionaryValuesDecoder.class).instanceSize(); private final LongDictionary dictionary; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/TimestampRLEDictionaryValuesDecoder.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/TimestampRLEDictionaryValuesDecoder.java index 869e3139465ef..09a5ee29e6b5a 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/TimestampRLEDictionaryValuesDecoder.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/decoders/rle/TimestampRLEDictionaryValuesDecoder.java @@ -29,7 +29,7 @@ public class TimestampRLEDictionaryValuesDecoder extends BaseRLEBitPackedDecoder implements TimestampValuesDecoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TimestampRLEDictionaryValuesDecoder.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TimestampRLEDictionaryValuesDecoder.class).instanceSize(); private final TimestampDictionary dictionary; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/dictionary/BinaryBatchDictionary.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/dictionary/BinaryBatchDictionary.java index 9ddf8cdb7a506..8dabe347ca179 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/dictionary/BinaryBatchDictionary.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/dictionary/BinaryBatchDictionary.java @@ -28,7 +28,7 @@ public final class BinaryBatchDictionary extends Dictionary { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryBatchDictionary.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryBatchDictionary.class).instanceSize(); private final byte[] pageBuffer; private final int dictionarySize; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/dictionary/TimestampDictionary.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/dictionary/TimestampDictionary.java index faebdb2c82dbf..c49bf7f0a3af7 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/dictionary/TimestampDictionary.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/batchreader/dictionary/TimestampDictionary.java @@ -25,7 +25,7 @@ public class TimestampDictionary extends Dictionary { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(TimestampDictionary.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(TimestampDictionary.class).instanceSize(); private final long[] dictionary; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/BinaryDictionary.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/BinaryDictionary.java index bf08aeb33b0a6..3cff2e2d34bb8 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/BinaryDictionary.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/BinaryDictionary.java @@ -28,7 +28,7 @@ public class BinaryDictionary extends Dictionary { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BinaryDictionary.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BinaryDictionary.class).instanceSize(); private final Binary[] content; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/DoubleDictionary.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/DoubleDictionary.java index 3ebdc787932d2..2b98ac1dad52e 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/DoubleDictionary.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/DoubleDictionary.java @@ -27,7 +27,7 @@ public class DoubleDictionary extends Dictionary { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(DoubleDictionary.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(DoubleDictionary.class).instanceSize(); private final double[] content; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/FloatDictionary.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/FloatDictionary.java index ca49f18c84f7b..549cf448f8b19 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/FloatDictionary.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/FloatDictionary.java @@ -27,7 +27,7 @@ public class FloatDictionary extends Dictionary { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FloatDictionary.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FloatDictionary.class).instanceSize(); private final float[] content; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/IntegerDictionary.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/IntegerDictionary.java index 1576bc1abbc62..d157f1bb58bb1 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/IntegerDictionary.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/IntegerDictionary.java @@ -27,7 +27,7 @@ public class IntegerDictionary extends Dictionary { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(IntegerDictionary.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(IntegerDictionary.class).instanceSize(); private final int[] content; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/LongDictionary.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/LongDictionary.java index 26487b5c7e886..b609c09bb07dc 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/LongDictionary.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/dictionary/LongDictionary.java @@ -27,7 +27,7 @@ public class LongDictionary extends Dictionary { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(LongDictionary.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(LongDictionary.class).instanceSize(); private final long[] content; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/AbstractColumnReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/AbstractColumnReader.java index aa29bdd798331..d0eaf0e14d727 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/AbstractColumnReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/AbstractColumnReader.java @@ -51,7 +51,7 @@ public abstract class AbstractColumnReader implements ColumnReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(AbstractColumnReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(AbstractColumnReader.class).instanceSize(); private static final int EMPTY_LEVEL_VALUE = -1; protected final RichColumnDescriptor columnDescriptor; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ColumnIndexFilterUtils.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ColumnIndexFilterUtils.java index d8ecf59f1ec50..8dfd61b309c88 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ColumnIndexFilterUtils.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ColumnIndexFilterUtils.java @@ -88,7 +88,7 @@ public long endPos() private static class FilteredOffsetIndex implements OffsetIndex { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(FilteredOffsetIndex.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(FilteredOffsetIndex.class).instanceSize(); private final OffsetIndex offsetIndex; private final int[] indices; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/PageReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/PageReader.java index bf5241198019b..b79395c43c76a 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/PageReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/PageReader.java @@ -36,7 +36,7 @@ public class PageReader { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PageReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PageReader.class).instanceSize(); private final long valueCountInColumnChunk; private final Iterator dataPageIterator; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetColumnChunk.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetColumnChunk.java index d7b19acb9363f..b4dec1108c4cb 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetColumnChunk.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetColumnChunk.java @@ -54,7 +54,7 @@ public class ParquetColumnChunk implements Closeable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ParquetColumnChunk.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ParquetColumnChunk.class).instanceSize(); private final ColumnChunkDescriptor descriptor; private final ColumnChunkBufferedInputStream stream; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetReader.java index 133b069c68df4..97e1de6d93dd8 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetReader.java @@ -95,7 +95,7 @@ public class ParquetReader implements Closeable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ParquetReader.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ParquetReader.class).instanceSize(); private static final int MAX_VECTOR_LENGTH = 1024; private static final int INITIAL_BATCH_SIZE = 1; private static final int BATCH_SIZE_GROWTH_FACTOR = 2; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ArrayColumnWriter.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ArrayColumnWriter.java index b932fb2f566b3..6798021511ea0 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ArrayColumnWriter.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ArrayColumnWriter.java @@ -29,7 +29,7 @@ public class ArrayColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ArrayColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ArrayColumnWriter.class).instanceSize(); private final ColumnWriter elementWriter; private final int maxDefinitionLevel; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/MapColumnWriter.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/MapColumnWriter.java index 6c49ef55a91d4..1e363039d6721 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/MapColumnWriter.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/MapColumnWriter.java @@ -29,7 +29,7 @@ public class MapColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(MapColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(MapColumnWriter.class).instanceSize(); private final ColumnWriter keyWriter; private final ColumnWriter valueWriter; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriter.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriter.java index 9b3ed1b5add55..4dfddbb78ae9f 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriter.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriter.java @@ -65,7 +65,7 @@ public class ParquetWriter implements Closeable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ParquetWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ParquetWriter.class).instanceSize(); private static final ParquetMetadataConverter METADATA_CONVERTER = new ParquetMetadataConverter(); private static final int CHUNK_MAX_BYTES = toIntExact(DataSize.valueOf("128MB").toBytes()); diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/StructColumnWriter.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/StructColumnWriter.java index b630dd4068332..4f10d23459c63 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/StructColumnWriter.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/StructColumnWriter.java @@ -32,7 +32,7 @@ public class StructColumnWriter implements ColumnWriter { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(StructColumnWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(StructColumnWriter.class).instanceSize(); private final List columnWriters; private final int maxDefinitionLevel; diff --git a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/BufferedOutputStreamSliceOutput.java b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/BufferedOutputStreamSliceOutput.java index 83ac44c6b7114..1d6602bc9065c 100644 --- a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/BufferedOutputStreamSliceOutput.java +++ b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/BufferedOutputStreamSliceOutput.java @@ -35,7 +35,7 @@ public class BufferedOutputStreamSliceOutput extends SliceOutput { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(BufferedOutputStreamSliceOutput.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(BufferedOutputStreamSliceOutput.class).instanceSize(); private static final int CHUNK_SIZE = 4096; private final OutputStream outputStream; diff --git a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/ChunkedSliceOutput.java b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/ChunkedSliceOutput.java index 2d1578d051d59..7911cbf4f95a2 100644 --- a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/ChunkedSliceOutput.java +++ b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/ChunkedSliceOutput.java @@ -38,7 +38,7 @@ public final class ChunkedSliceOutput extends SliceOutput { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ChunkedSliceOutput.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ChunkedSliceOutput.class).instanceSize(); private static final int MINIMUM_CHUNK_SIZE = 4096; private static final int MAXIMUM_CHUNK_SIZE = 16 * 1024 * 1024; // This must not be larger than MINIMUM_CHUNK_SIZE/2 diff --git a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java index 2151b02a58542..e5cacc9a375d4 100644 --- a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java +++ b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java @@ -50,7 +50,7 @@ public class RcFileWriter implements Closeable { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(RcFileWriter.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(RcFileWriter.class).instanceSize(); private static final Slice RCFILE_MAGIC = utf8Slice("RCF"); private static final int CURRENT_VERSION = 1; private static final String COLUMN_COUNT_METADATA_KEY = "hive.io.rcfile.column.number"; @@ -329,7 +329,7 @@ private void writeRowGroup() private static class ColumnEncoder { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(ColumnEncoder.class).instanceSize() + ClassLayout.parseClass(ColumnEncodeOutput.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(ColumnEncoder.class).instanceSize() + ClassLayout.parseClass(ColumnEncodeOutput.class).instanceSize(); private final ColumnEncoding columnEncoding; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkBufferedSerializedPage.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkBufferedSerializedPage.java index 1940f9f30c484..1e8bafc98a938 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkBufferedSerializedPage.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkBufferedSerializedPage.java @@ -21,7 +21,7 @@ public class PrestoSparkBufferedSerializedPage implements PrestoSparkBufferedResult { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PrestoSparkBufferedSerializedPage.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PrestoSparkBufferedSerializedPage.class).instanceSize(); private final SerializedPage serializedPage; private final long deserializedRetainedSizeInBytes; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowBatch.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowBatch.java index 265be96ffe60d..06db8676c0afc 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowBatch.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowBatch.java @@ -39,7 +39,7 @@ public class PrestoSparkRowBatch implements PrestoSparkBufferedResult { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(PrestoSparkRowBatch.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(PrestoSparkRowBatch.class).instanceSize(); private static final int MIN_TARGET_SIZE_IN_BYTES = 1024 * 1024; private static final int MAX_TARGET_SIZE_IN_BYTES = 10 * 1024 * 1024; @@ -122,7 +122,7 @@ static PrestoSparkRowBatchBuilder builder( public static class PrestoSparkRowBatchBuilder { - private static final int BUILDER_INSTANCE_SIZE = ClassLayout.parseClass(PrestoSparkRowBatchBuilder.class).instanceSize(); + private static final long BUILDER_INSTANCE_SIZE = ClassLayout.parseClass(PrestoSparkRowBatchBuilder.class).instanceSize(); private final int partitionCount; private final int targetSizeInBytes; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/function/aggregation/GroupByIdBlock.java b/presto-spi/src/main/java/com/facebook/presto/spi/function/aggregation/GroupByIdBlock.java index 1143c2f69e12b..8ac521756f240 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/function/aggregation/GroupByIdBlock.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/function/aggregation/GroupByIdBlock.java @@ -28,7 +28,7 @@ public class GroupByIdBlock implements Block { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(GroupByIdBlock.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(GroupByIdBlock.class).instanceSize(); private final long groupCount; private final Block block; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/page/SerializedPage.java b/presto-spi/src/main/java/com/facebook/presto/spi/page/SerializedPage.java index 82c686a5f722c..c7a337f45d7ac 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/page/SerializedPage.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/page/SerializedPage.java @@ -25,7 +25,7 @@ public class SerializedPage { - private static final int INSTANCE_SIZE = ClassLayout.parseClass(SerializedPage.class).instanceSize(); + private static final long INSTANCE_SIZE = ClassLayout.parseClass(SerializedPage.class).instanceSize(); private final Slice slice; private final int positionCount;