Avoid calling SelectiveStreamReader#read with zero positions to read

prestodb · Aug 23, 2019 · 0a41532 · 0a41532
1 parent 6d22ca9
commit 0a41532
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
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
@@ -150,6 +150,7 @@ private void openRowGroup()
     public int read(int offset, int[] positions, int positionCount)
             throws IOException
     {
+        checkArgument(positionCount > 0, "positionCount must be greater than zero");
         checkState(!valuesInUse, "BlockLease hasn't been closed yet");
 
         if (!rowGroupOpen) {

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
@@ -189,6 +189,7 @@ private static Optional<TupleDomainFilter> getTopLevelFilter(Map<Subfield, Tuple
     public int read(int offset, int[] positions, int positionCount)
             throws IOException
     {
+        checkArgument(positionCount > 0, "positionCount must be greater than zero");
         checkState(!valuesInUse, "BlockLease hasn't been closed yet");
 
         if (!rowGroupOpen) {
@@ -369,7 +370,7 @@ private int readNotAllNulls(int[] positions, int positionCount)
             listFilter.populateElementFilters(outputPositionCount, nulls, elementLengths, elementPositionCount);
         }
 
-        if (elementStreamReader != null) {
+        if (elementStreamReader != null && elementPositionCount > 0) {
             elementStreamReader.read(elementReadOffset, elementPositions, elementPositionCount);
         }
         elementReadOffset += elementPositionCount + skippedElements;

diff --git a/...orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java b/...orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java
@@ -97,6 +97,8 @@ public LongDictionarySelectiveStreamReader(
     public int read(int offset, int[] positions, int positionCount)
             throws IOException
     {
+        checkArgument(positionCount > 0, "positionCount must be greater than zero");
+
         if (!rowGroupOpen) {
             openRowGroup();
         }

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
@@ -88,6 +88,8 @@ public LongDirectSelectiveStreamReader(
     public int read(int offset, int[] positions, int positionCount)
             throws IOException
     {
+        checkArgument(positionCount > 0, "positionCount must be greater than zero");
+
         if (!rowGroupOpen) {
             openRowGroup();
         }

diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampSelectiveStreamReader.java
@@ -144,6 +144,7 @@ private void openRowGroup()
     public int read(int offset, int[] positions, int positionCount)
             throws IOException
     {
+        checkArgument(positionCount > 0, "positionCount must be greater than zero");
         checkState(!valuesInUse, "BlockLease hasn't been closed yet");
 
         if (!rowGroupOpen) {