Skip to content

Seal Block interface #19480

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
dain merged 2 commits into from
Oct 22, 2023
Merged

Seal Block interface #19480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32948a2
Remove unnecessary VariableWidthBlock subclass in TestDictionaryBuilder
dain Oct 21, 2023
af9b9d0
Only allow ValueBlock implementations of Block
dain Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 163 additions & 0 deletions core/trino-spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,169 @@
<code>java.method.removed</code>
<old>method void io.trino.spi.block.VariableWidthBlock::writeSliceTo(int, int, int, io.airlift.slice.SliceOutput)</old>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.ArrayBlock</old>
<new>class io.trino.spi.block.ArrayBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.ByteArrayBlock</old>
<new>class io.trino.spi.block.ByteArrayBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.DictionaryBlock</old>
<new>class io.trino.spi.block.DictionaryBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.Fixed12Block</old>
<new>class io.trino.spi.block.Fixed12Block</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.Int128ArrayBlock</old>
<new>class io.trino.spi.block.Int128ArrayBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.IntArrayBlock</old>
<new>class io.trino.spi.block.IntArrayBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.LazyBlock</old>
<new>class io.trino.spi.block.LazyBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.LongArrayBlock</old>
<new>class io.trino.spi.block.LongArrayBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.MapBlock</old>
<new>class io.trino.spi.block.MapBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.RowBlock</old>
<new>class io.trino.spi.block.RowBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.RunLengthEncodedBlock</old>
<new>class io.trino.spi.block.RunLengthEncodedBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.ShortArrayBlock</old>
<new>class io.trino.spi.block.ShortArrayBlock</new>
</item>
<item>
<code>java.class.nowFinal</code>
<old>class io.trino.spi.block.VariableWidthBlock</old>
<new>class io.trino.spi.block.VariableWidthBlock</new>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method int io.trino.spi.block.ArrayBlock::getOffsetBase()</old>
<new>method int io.trino.spi.block.ArrayBlock::getOffsetBase()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method int[] io.trino.spi.block.ArrayBlock::getOffsets()</old>
<new>method int[] io.trino.spi.block.ArrayBlock::getOffsets()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::getRawElementBlock()</old>
<new>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::getRawElementBlock()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method void io.trino.spi.block.MapBlock::ensureHashTableLoaded()</old>
<new>method void io.trino.spi.block.MapBlock::ensureHashTableLoaded()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method io.trino.spi.block.MapHashTables io.trino.spi.block.MapBlock::getHashTables()</old>
<new>method io.trino.spi.block.MapHashTables io.trino.spi.block.MapBlock::getHashTables()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method io.trino.spi.type.MapType io.trino.spi.block.MapBlock::getMapType()</old>
<new>method io.trino.spi.type.MapType io.trino.spi.block.MapBlock::getMapType()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method int io.trino.spi.block.MapBlock::getOffsetBase()</old>
<new>method int io.trino.spi.block.MapBlock::getOffsetBase()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method int[] io.trino.spi.block.MapBlock::getOffsets()</old>
<new>method int[] io.trino.spi.block.MapBlock::getOffsets()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getRawKeyBlock()</old>
<new>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getRawKeyBlock()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getRawValueBlock()</old>
<new>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getRawValueBlock()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method int[] io.trino.spi.block.RowBlock::getFieldBlockOffsets()</old>
<new>method int[] io.trino.spi.block.RowBlock::getFieldBlockOffsets()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method int io.trino.spi.block.RowBlock::getOffsetBase()</old>
<new>method int io.trino.spi.block.RowBlock::getOffsetBase()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method java.util.List&lt;io.trino.spi.block.Block&gt; io.trino.spi.block.RowBlock::getRawFieldBlocks()</old>
<new>method java.util.List&lt;io.trino.spi.block.Block&gt; io.trino.spi.block.RowBlock::getRawFieldBlocks()</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
<item>
<code>java.method.visibilityReduced</code>
<old>method int io.trino.spi.block.VariableWidthBlock::getPositionOffset(int)</old>
<new>method int io.trino.spi.block.VariableWidthBlock::getPositionOffset(int)</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>package</newVisibility>
</item>
</differences>
</revapi.differences>
</analysisConfiguration>
Expand Down
14 changes: 7 additions & 7 deletions core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import static java.util.Collections.singletonList;
import static java.util.Objects.requireNonNull;

public class ArrayBlock
public final class ArrayBlock
implements ValueBlock
{
private static final int INSTANCE_SIZE = instanceSize(ArrayBlock.class);
Expand Down Expand Up @@ -73,7 +73,7 @@ public static ArrayBlock fromElementBlock(int positionCount, Optional<boolean[]>
}

/**
* Create an array block directly without per element validations.
* Create an array block directly without per-element validations.
*/
static ArrayBlock createArrayBlockInternal(int arrayOffset, int positionCount, @Nullable boolean[] valueIsNull, int[] offsets, Block values)
{
Expand Down Expand Up @@ -167,23 +167,23 @@ public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
consumer.accept(this, INSTANCE_SIZE);
}

protected Block getRawElementBlock()
Block getRawElementBlock()
{
return values;
}

protected int[] getOffsets()
int[] getOffsets()
{
return offsets;
}

protected int getOffsetBase()
int getOffsetBase()
{
return arrayOffset;
}

@Override
public final List<Block> getChildren()
public List<Block> getChildren()
{
return singletonList(values);
}
Expand Down Expand Up @@ -310,7 +310,7 @@ public long getRegionSizeInBytes(int position, int length)
}

@Override
public final long getPositionsSizeInBytes(boolean[] positions, int selectedArrayPositions)
public long getPositionsSizeInBytes(boolean[] positions, int selectedArrayPositions)
{
int positionCount = getPositionCount();
checkValidPositions(positions, positionCount);
Expand Down
3 changes: 2 additions & 1 deletion core/trino-spi/src/main/java/io/trino/spi/block/Block.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
import static io.trino.spi.block.BlockUtil.checkArrayRange;
import static io.trino.spi.block.DictionaryId.randomDictionaryId;

public interface Block
public sealed interface Block
permits DictionaryBlock, RunLengthEncodedBlock, LazyBlock, ValueBlock
{
/**
* Gets the length of the value at the {@code position}.
Expand Down
2 changes: 1 addition & 1 deletion core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
import static io.trino.spi.block.BlockUtil.ensureCapacity;

public class ByteArrayBlock
public final class ByteArrayBlock
implements ValueBlock
{
private static final int INSTANCE_SIZE = instanceSize(ByteArrayBlock.class);
Expand Down
6 changes: 3 additions & 3 deletions core/trino-spi/src/main/java/io/trino/spi/block/DictionaryBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import static java.util.Collections.singletonList;
import static java.util.Objects.requireNonNull;

public class DictionaryBlock
public final class DictionaryBlock
implements Block
{
private static final int INSTANCE_SIZE = instanceSize(DictionaryBlock.class) + instanceSize(DictionaryId.class);
Expand Down Expand Up @@ -526,7 +526,7 @@ public String toString()
}

@Override
public final List<Block> getChildren()
public List<Block> getChildren()
{
return singletonList(getDictionary());
}
Expand Down Expand Up @@ -694,7 +694,7 @@ public static List<DictionaryBlock> compactRelatedBlocks(List<DictionaryBlock> b
positionCount,
compactDictionary,
newIds,
!(compactDictionary instanceof DictionaryBlock),
true,
false,
newDictionaryId));
}
Expand Down
2 changes: 1 addition & 1 deletion core/trino-spi/src/main/java/io/trino/spi/block/Fixed12Block.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
import static io.trino.spi.block.BlockUtil.ensureCapacity;

public class Fixed12Block
public final class Fixed12Block
implements ValueBlock
{
private static final int INSTANCE_SIZE = instanceSize(Fixed12Block.class);
Expand Down
2 changes: 1 addition & 1 deletion core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
import static io.trino.spi.block.BlockUtil.ensureCapacity;

public class Int128ArrayBlock
public final class Int128ArrayBlock
implements ValueBlock
{
private static final int INSTANCE_SIZE = instanceSize(Int128ArrayBlock.class);
Expand Down
2 changes: 1 addition & 1 deletion core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
import static io.trino.spi.block.BlockUtil.ensureCapacity;

public class IntArrayBlock
public final class IntArrayBlock
implements ValueBlock
{
private static final int INSTANCE_SIZE = instanceSize(IntArrayBlock.class);
Expand Down
6 changes: 3 additions & 3 deletions core/trino-spi/src/main/java/io/trino/spi/block/LazyBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import static java.util.Objects.requireNonNull;

// This class is not considered thread-safe.
public class LazyBlock
public final class LazyBlock
implements Block
{
private static final int INSTANCE_SIZE = instanceSize(LazyBlock.class) + instanceSize(LazyData.class);
Expand Down Expand Up @@ -213,7 +213,7 @@ public boolean mayHaveNull()
}

@Override
public final List<Block> getChildren()
public List<Block> getChildren()
{
return singletonList(getBlock());
}
Expand Down Expand Up @@ -390,7 +390,7 @@ private void load(boolean recursive)
}

/**
* If block is unloaded, add the listeners; otherwise call this method on child blocks
* If the block is unloaded, add the listeners; otherwise call this method on child blocks
*/
@SuppressWarnings("AccessingNonPublicFieldOfAnotherObject")
private static void addListenersRecursive(Block block, List<Consumer<Block>> listeners)
Expand Down
2 changes: 1 addition & 1 deletion core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import static io.trino.spi.block.BlockUtil.ensureCapacity;
import static java.lang.Math.toIntExact;

public class LongArrayBlock
public final class LongArrayBlock
implements ValueBlock
{
private static final int INSTANCE_SIZE = instanceSize(LongArrayBlock.class);
Expand Down
Loading