PARQUET-2443: Simplify ColumnChunkPageReader

clairemcginty · Mar 6, 2024 · 2cabc3b · 2cabc3b
1 parent 94e4726
commit 2cabc3b
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 350 deletions.
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnReaderBase.java b/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnReaderBase.java
@@ -464,10 +464,8 @@ void writeValue() {
     } else {
       this.dictionary = null;
     }
-    if (pageReader.isFullyMaterialized()) {
-      if (pageReader.getTotalValueCount() <= 0) {
-        throw new ParquetDecodingException("totalValueCount '" + pageReader.getTotalValueCount() + "' <= 0");
-      }
+    if (pageReader.isFullyMaterialized() && pageReader.getTotalValueCount() <= 0) {
+      throw new ParquetDecodingException("totalValueCount '" + pageReader.getTotalValueCount() + "' <= 0");
     }
   }
 
@@ -601,7 +599,9 @@ public void readValue() {
                         + "%d, definition level: %d",
                     path,
                     readValues,
-                    pageReader.isFullyMaterialized() ? pageReader.getTotalValueCount() : -1,
+                    pageReader.isFullyMaterialized()
+                        ? pageReader.getTotalValueCount()
+                        : -1, // @Todo print something else?
                     readValues - (endOfPageValueCount - pageValueCount),
                     pageValueCount,
                     repetitionLevel,
@@ -615,7 +615,9 @@ public void readValue() {
                   + "%d, definition level: %d",
               path,
               readValues,
-              pageReader.isFullyMaterialized() ? pageReader.getTotalValueCount() : -1,
+              pageReader.isFullyMaterialized()
+                  ? pageReader.getTotalValueCount()
+                  : -1, // @Todo print something else?
               readValues - (endOfPageValueCount - pageValueCount),
               pageValueCount,
               repetitionLevel,