Simplify createBlockBuilder for FixedWidthTypes

G-Research · Oct 16, 2024 · 13906d8 · 13906d8
1 parent ac778c9
commit 13906d8
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 119 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/type/IpAddressType.java b/core/trino-main/src/main/java/io/trino/type/IpAddressType.java
@@ -74,7 +74,7 @@ public int getFixedSize()
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -88,12 +88,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, getFixedSize());
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-main/src/main/java/io/trino/type/UnknownType.java b/core/trino-main/src/main/java/io/trino/type/UnknownType.java
@@ -62,7 +62,7 @@ public int getFixedSize()
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -76,12 +76,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, getFixedSize());
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/pom.xml b/core/trino-spi/pom.xml
@@ -307,6 +307,41 @@
                                     <code>java.method.removed</code>
                                     <old>method void io.trino.spi.PageBuilder::reset(int)</old>
                                 </item>
+                                <item>
+                                    <code>java.method.nowAbstract</code>
+                                    <old>method io.trino.spi.block.BlockBuilder io.trino.spi.type.AbstractIntType::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int)</old>
+                                    <new>method io.trino.spi.block.BlockBuilder io.trino.spi.type.Type::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int) @ io.trino.spi.type.AbstractIntType</new>
+                                </item>
+                                <item>
+                                    <code>java.method.nowAbstract</code>
+                                    <old>method io.trino.spi.block.BlockBuilder io.trino.spi.type.AbstractLongType::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int)</old>
+                                    <new>method io.trino.spi.block.BlockBuilder io.trino.spi.type.Type::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int) @ io.trino.spi.type.AbstractLongType</new>
+                                </item>
+                                <item>
+                                    <code>java.method.nowAbstract</code>
+                                    <old>method io.trino.spi.block.BlockBuilder io.trino.spi.type.BooleanType::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int)</old>
+                                    <new>method io.trino.spi.block.BlockBuilder io.trino.spi.type.Type::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int) @ io.trino.spi.type.BooleanType</new>
+                                </item>
+                                <item>
+                                    <code>java.method.nowAbstract</code>
+                                    <old>method io.trino.spi.block.BlockBuilder io.trino.spi.type.DoubleType::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int)</old>
+                                    <new>method io.trino.spi.block.BlockBuilder io.trino.spi.type.Type::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int) @ io.trino.spi.type.DoubleType</new>
+                                </item>
+                                <item>
+                                    <code>java.method.nowAbstract</code>
+                                    <old>method io.trino.spi.block.BlockBuilder io.trino.spi.type.SmallintType::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int)</old>
+                                    <new>method io.trino.spi.block.BlockBuilder io.trino.spi.type.Type::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int) @ io.trino.spi.type.SmallintType</new>
+                                </item>
+                                <item>
+                                    <code>java.method.nowAbstract</code>
+                                    <old>method io.trino.spi.block.BlockBuilder io.trino.spi.type.TinyintType::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int)</old>
+                                    <new>method io.trino.spi.block.BlockBuilder io.trino.spi.type.Type::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int) @ io.trino.spi.type.TinyintType</new>
+                                </item>
+                                <item>
+                                    <code>java.method.nowAbstract</code>
+                                    <old>method io.trino.spi.block.BlockBuilder io.trino.spi.type.UuidType::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int)</old>
+                                    <new>method io.trino.spi.block.BlockBuilder io.trino.spi.type.Type::createBlockBuilder(io.trino.spi.block.BlockBuilderStatus, int, int) @ io.trino.spi.type.UuidType</new>
+                                </item>
                             </differences>
                         </revapi.differences>
                     </analysisConfiguration>

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractIntType.java b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractIntType.java
@@ -131,7 +131,7 @@ public int getFlatFixedSize()
     }
 
     @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -145,12 +145,6 @@ public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStat
                 Math.min(expectedEntries, maxBlockSizeInBytes / Integer.BYTES));
     }
 
-    @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, Integer.BYTES);
-    }
-
     @Override
     public final BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractLongType.java b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractLongType.java
@@ -108,7 +108,7 @@ public int getFlatFixedSize()
     }
 
     @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -122,12 +122,6 @@ public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStat
                 Math.min(expectedEntries, maxBlockSizeInBytes / Long.BYTES));
     }
 
-    @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, Long.BYTES);
-    }
-
     @Override
     public final BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/BooleanType.java b/core/trino-spi/src/main/java/io/trino/spi/type/BooleanType.java
@@ -79,7 +79,7 @@ public int getFixedSize()
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -93,12 +93,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / Byte.BYTES));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, Byte.BYTES);
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/DoubleType.java b/core/trino-spi/src/main/java/io/trino/spi/type/DoubleType.java
@@ -121,7 +121,7 @@ public void writeDouble(BlockBuilder blockBuilder, double value)
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -135,12 +135,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / Double.BYTES));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, Double.BYTES);
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/FixedWidthType.java b/core/trino-spi/src/main/java/io/trino/spi/type/FixedWidthType.java
@@ -15,6 +15,7 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BlockBuilderStatus;
 
 /**
  * FixedWidthType is a type that has a fixed size for every value.
@@ -28,6 +29,12 @@ public interface FixedWidthType
      */
     int getFixedSize();
 
+    @Override
+    default BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    {
+        return createBlockBuilder(blockBuilderStatus, expectedEntries);
+    }
+
     /**
      * Creates a block builder for this type sized to hold the specified number
      * of positions.

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/LongDecimalType.java b/core/trino-spi/src/main/java/io/trino/spi/type/LongDecimalType.java
@@ -68,7 +68,7 @@ public int getFixedSize()
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -82,12 +82,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, getFixedSize());
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/LongTimeWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/LongTimeWithTimeZoneType.java
@@ -74,7 +74,7 @@ public int getFixedSize()
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -88,12 +88,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, getFixedSize());
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampType.java b/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampType.java
@@ -86,7 +86,7 @@ public int getFixedSize()
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -100,12 +100,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, getFixedSize());
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampWithTimeZoneType.java
@@ -85,7 +85,7 @@ public int getFixedSize()
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -99,12 +99,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, getFixedSize());
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/ShortDecimalType.java b/core/trino-spi/src/main/java/io/trino/spi/type/ShortDecimalType.java
@@ -97,7 +97,7 @@ public int getFixedSize()
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -111,12 +111,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, getFixedSize());
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimeWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimeWithTimeZoneType.java
@@ -101,7 +101,7 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -115,12 +115,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / Long.BYTES));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, Long.BYTES);
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampType.java b/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampType.java
@@ -112,7 +112,7 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -126,12 +126,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / Long.BYTES));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, Long.BYTES);
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampWithTimeZoneType.java
@@ -101,7 +101,7 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -115,12 +115,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / Long.BYTES));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, Long.BYTES);
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/SmallintType.java b/core/trino-spi/src/main/java/io/trino/spi/type/SmallintType.java
@@ -69,7 +69,7 @@ public int getFixedSize()
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -83,12 +83,6 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
                 Math.min(expectedEntries, maxBlockSizeInBytes / Short.BYTES));
     }
 
-    @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return createBlockBuilder(blockBuilderStatus, expectedEntries, Short.BYTES);
-    }
-
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {