Simplify block creation for all null values

trinodb · Mar 12, 2019 · 7f2b3cd · 7f2b3cd
1 parent ed044b5
commit 7f2b3cd
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 27 deletions.
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/orc/OrcPageSource.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/orc/OrcPageSource.java
@@ -23,9 +23,9 @@
 import io.prestosql.spi.Page;
 import io.prestosql.spi.PrestoException;
 import io.prestosql.spi.block.Block;
-import io.prestosql.spi.block.BlockBuilder;
 import io.prestosql.spi.block.LazyBlock;
 import io.prestosql.spi.block.LazyBlockLoader;
+import io.prestosql.spi.block.RunLengthEncodedBlock;
 import io.prestosql.spi.connector.ConnectorPageSource;
 import io.prestosql.spi.type.Type;
 import io.prestosql.spi.type.TypeManager;
@@ -96,11 +96,7 @@ public OrcPageSource(
             hiveColumnIndexes[columnIndex] = column.getHiveColumnIndex();
 
             if (!recordReader.isColumnPresent(column.getHiveColumnIndex())) {
-                BlockBuilder blockBuilder = type.createBlockBuilder(null, MAX_BATCH_SIZE, NULL_ENTRY_SIZE);
-                for (int i = 0; i < MAX_BATCH_SIZE; i++) {
-                    blockBuilder.appendNull();
-                }
-                constantBlocks[columnIndex] = blockBuilder.build();
+                constantBlocks[columnIndex] = RunLengthEncodedBlock.create(type, null, MAX_BATCH_SIZE);
             }
         }
         types = typesBuilder.build();

diff --git a/presto-orc/src/main/java/io/prestosql/orc/reader/BooleanStreamReader.java b/presto-orc/src/main/java/io/prestosql/orc/reader/BooleanStreamReader.java
@@ -99,9 +99,7 @@ public Block readBlock(Type type)
 
         if (dataStream == null && presentStream != null) {
             presentStream.skip(nextBatchSize);
-            Block nullValueBlock = new RunLengthEncodedBlock(
-                    type.createBlockBuilder(null, 1).appendNull().build(),
-                    nextBatchSize);
+            Block nullValueBlock = RunLengthEncodedBlock.create(type, null, nextBatchSize);
             readOffset = 0;
             nextBatchSize = 0;
             return nullValueBlock;

diff --git a/presto-orc/src/main/java/io/prestosql/orc/reader/ByteStreamReader.java b/presto-orc/src/main/java/io/prestosql/orc/reader/ByteStreamReader.java
@@ -100,9 +100,7 @@ public Block readBlock(Type type)
 
         if (dataStream == null && presentStream != null) {
             presentStream.skip(nextBatchSize);
-            Block nullValueBlock = new RunLengthEncodedBlock(
-                    type.createBlockBuilder(null, 1).appendNull().build(),
-                    nextBatchSize);
+            Block nullValueBlock = RunLengthEncodedBlock.create(type, null, nextBatchSize);
             readOffset = 0;
             nextBatchSize = 0;
             return nullValueBlock;

diff --git a/presto-orc/src/main/java/io/prestosql/orc/reader/DecimalStreamReader.java b/presto-orc/src/main/java/io/prestosql/orc/reader/DecimalStreamReader.java
@@ -105,9 +105,7 @@ public Block readBlock(Type type)
 
         if (decimalStream == null && scaleStream == null && presentStream != null) {
             presentStream.skip(nextBatchSize);
-            Block nullValueBlock = new RunLengthEncodedBlock(
-                    type.createBlockBuilder(null, 1).appendNull().build(),
-                    nextBatchSize);
+            Block nullValueBlock = RunLengthEncodedBlock.create(type, null, nextBatchSize);
             readOffset = 0;
             nextBatchSize = 0;
             return nullValueBlock;

diff --git a/presto-orc/src/main/java/io/prestosql/orc/reader/DoubleStreamReader.java b/presto-orc/src/main/java/io/prestosql/orc/reader/DoubleStreamReader.java
@@ -100,9 +100,7 @@ public Block readBlock(Type type)
 
         if (dataStream == null && presentStream != null) {
             presentStream.skip(nextBatchSize);
-            Block nullValueBlock = new RunLengthEncodedBlock(
-                    type.createBlockBuilder(null, 1).appendNull().build(),
-                    nextBatchSize);
+            Block nullValueBlock = RunLengthEncodedBlock.create(type, null, nextBatchSize);
             readOffset = 0;
             nextBatchSize = 0;
             return nullValueBlock;

diff --git a/presto-orc/src/main/java/io/prestosql/orc/reader/FloatStreamReader.java b/presto-orc/src/main/java/io/prestosql/orc/reader/FloatStreamReader.java
@@ -101,9 +101,7 @@ public Block readBlock(Type type)
 
         if (dataStream == null && presentStream != null) {
             presentStream.skip(nextBatchSize);
-            Block nullValueBlock = new RunLengthEncodedBlock(
-                    type.createBlockBuilder(null, 1).appendNull().build(),
-                    nextBatchSize);
+            Block nullValueBlock = RunLengthEncodedBlock.create(type, null, nextBatchSize);
             readOffset = 0;
             nextBatchSize = 0;
             return nullValueBlock;

diff --git a/presto-orc/src/main/java/io/prestosql/orc/reader/LongDirectStreamReader.java b/presto-orc/src/main/java/io/prestosql/orc/reader/LongDirectStreamReader.java
@@ -100,9 +100,7 @@ public Block readBlock(Type type)
 
         if (dataStream == null && presentStream != null) {
             presentStream.skip(nextBatchSize);
-            Block nullValueBlock = new RunLengthEncodedBlock(
-                    type.createBlockBuilder(null, 1).appendNull().build(),
-                    nextBatchSize);
+            Block nullValueBlock = RunLengthEncodedBlock.create(type, null, nextBatchSize);
             readOffset = 0;
             nextBatchSize = 0;
             return nullValueBlock;

diff --git a/presto-orc/src/main/java/io/prestosql/orc/reader/TimestampStreamReader.java b/presto-orc/src/main/java/io/prestosql/orc/reader/TimestampStreamReader.java
@@ -119,9 +119,7 @@ public Block readBlock(Type type)
 
         if (secondsStream == null && nanosStream == null && presentStream != null) {
             presentStream.skip(nextBatchSize);
-            Block nullValueBlock = new RunLengthEncodedBlock(
-                    type.createBlockBuilder(null, 1).appendNull().build(),
-                    nextBatchSize);
+            Block nullValueBlock = RunLengthEncodedBlock.create(type, null, nextBatchSize);
             readOffset = 0;
             nextBatchSize = 0;
             return nullValueBlock;