Add more checks to OrcTester.assertFileContentsPresto

prestodb · Sep 5, 2019 · 6cffd16 · 6cffd16
1 parent 2de28d2
commit 6cffd16
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java b/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java
@@ -599,25 +599,30 @@ private static void assertFileContentsPresto(
                     break;
                 }
 
-                if (page.getPositionCount() == 0) {
+                int positionCount = page.getPositionCount();
+                if (positionCount == 0) {
                     continue;
                 }
 
+                assertTrue(expectedValues.get(0).size() >= rowsProcessed + positionCount);
+
                 for (int i = 0; i < types.size(); i++) {
                     Type type = types.get(i);
                     Block block = page.getBlock(i);
 
-                    List<Object> data = new ArrayList<>(block.getPositionCount());
-                    for (int position = 0; position < block.getPositionCount(); position++) {
+                    assertEquals(block.getPositionCount(), positionCount);
+
+                    List<Object> data = new ArrayList<>(positionCount);
+                    for (int position = 0; position < positionCount; position++) {
                         data.add(type.getObjectValue(SESSION, block, position));
                     }
 
-                    for (int j = 0; j < block.getPositionCount(); j++) {
+                    for (int j = 0; j < positionCount; j++) {
                         assertColumnValueEquals(type, data.get(j), expectedValues.get(i).get(rowsProcessed + j));
                     }
                 }
 
-                rowsProcessed += page.getPositionCount();
+                rowsProcessed += positionCount;
             }
 
             assertEquals(rowsProcessed, expectedValues.get(0).size());