Fix bug in ORC flat map reader causing 'Read past RLE' and 'Positions…

… must monotonically increase' errors
majian4work · Sep 6, 2022 · 818adb6 · 818adb6
1 parent fd4ee43
commit 818adb6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java
@@ -774,23 +774,6 @@ private boolean hasAnyFilter(int columnIndex)
         return columnsWithFilterScores.containsKey(columnIndex) || filterFunctionInputMapping.containsKey(columnIndex);
     }
 
-    private void initializePositions(int batchSize)
-    {
-        if (positions == null || positions.length < batchSize) {
-            positions = new int[batchSize];
-            for (int i = 0; i < batchSize; i++) {
-                positions[i] = i;
-            }
-        }
-
-        if (errors == null || errors.length < batchSize) {
-            errors = new RuntimeException[batchSize];
-        }
-        else {
-            Arrays.fill(errors, null);
-        }
-    }
-
     private int applyFilterFunctionWithNoInputs(int positionCount)
     {
         initializeOutputPositions(positionCount);
@@ -876,6 +859,24 @@ private void initializeTmpErrors(int positionCount)
         }
     }
 
+    private void initializePositions(int batchSize)
+    {
+        if (positions == null || positions.length < batchSize) {
+            positions = new int[batchSize];
+        }
+
+        for (int i = 0; i < batchSize; i++) {
+            positions[i] = i;
+        }
+
+        if (errors == null || errors.length < batchSize) {
+            errors = new RuntimeException[batchSize];
+        }
+        else {
+            Arrays.fill(errors, null);
+        }
+    }
+
     private void initializeOutputPositions(int positionCount)
     {
         if (outputPositions == null || outputPositions.length < positionCount) {

diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java
@@ -233,7 +233,7 @@ public int read(int offset, int[] positions, int positionCount)
         outputPositions = initializeOutputPositions(outputPositions, positions, positionCount);
 
         if (keyCount == 0 && presentStream == null) {
-            readAllEmpty(positions, positionCount);
+            readAllEmpty(positionCount);
         }
         else {
             readNotAllNulls(offset, positions, positionCount);
@@ -244,9 +244,8 @@ public int read(int offset, int[] positions, int positionCount)
         return outputPositionCount;
     }
 
-    private void readAllEmpty(int[] positions, int positionCount)
+    private void readAllEmpty(int positionCount)
     {
-        outputPositions = positions;
         outputPositionsReadOnly = true;
 
         if (!nonNullsAllowed) {