Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<air.maven.version>3.3.9</air.maven.version>

<dep.antlr.version>4.13.2</dep.antlr.version>
<dep.airlift.version>0.227</dep.airlift.version>
<dep.airlift.version>0.228</dep.airlift.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.slice.version>0.38</dep.slice.version>
<dep.slice.version>0.45</dep.slice.version>
<dep.testing-mysql-server-5.version>0.6</dep.testing-mysql-server-5.version>
<dep.aws-sdk.version>1.12.782</dep.aws-sdk.version>
<dep.okhttp.version>4.12.0</dep.okhttp.version>
Expand Down Expand Up @@ -1511,7 +1511,7 @@
<dependency>
<groupId>org.openjdk.jol</groupId>
<artifactId>jol-core</artifactId>
<version>0.2</version>
<version>0.17</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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];

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Block> array;
private final ReferenceCountMap trackedObjects = new ReferenceCountMap();
private long sizeOfBlocks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// Copyright (C) 2010-2013 Sebastiano Vigna
public final class ObjectBigArray<T>
{
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Slice> array;
private final ReferenceCountMap trackedSlices = new ReferenceCountMap();
private long sizeOfSlices;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<LazyBlock> loader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading
Loading