(parquet-mr) branch master updated: PARQUET-2396: Refactor `ColumnIndexBuilder` (#1219)

[fokko]

This is an automated email from the ASF dual-hosted git repository.

fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-mr.git


The following commit(s) were added to refs/heads/master by this push:
     new 7de479c2f PARQUET-2396: Refactor `ColumnIndexBuilder` (#1219)
7de479c2f is described below

commit 7de479c2f096241a642e586719a2f5638752acd9
Author: Fokko Driesprong <fo...@apache.org>
AuthorDate: Mon Dec 4 08:37:44 2023 +0100

    PARQUET-2396: Refactor `ColumnIndexBuilder` (#1219)
---
 .../internal/column/columnindex/ColumnIndexBuilder.java        | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/ColumnIndexBuilder.java
 
b/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/ColumnIndexBuilder.java
index adb1b4213..7dd19a87c 100644
--- 
a/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/ColumnIndexBuilder.java
+++ 
b/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/ColumnIndexBuilder.java
@@ -33,7 +33,6 @@ import it.unimi.dsi.fastutil.longs.LongLists;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Formatter;
-import java.util.Iterator;
 import java.util.List;
 import java.util.PrimitiveIterator;
 import java.util.Set;
@@ -299,9 +298,7 @@ public abstract class ColumnIndexBuilder {
     public <T extends Comparable<T>> PrimitiveIterator.OfInt visit(In<T> in) {
       Set<T> values = in.getValues();
       IntSet matchingIndexesForNull = new IntOpenHashSet(); // for null
-      Iterator<T> it = values.iterator();
-      while (it.hasNext()) {
-        T value = it.next();
+      for (T value : values) {
         if (value == null) {
           if (nullCounts == null) {
             // Searching for nulls so if we don't have null related statistics 
we have to return all pages
@@ -313,8 +310,7 @@ public abstract class ColumnIndexBuilder {
               }
             }
             if (values.size() == 1) {
-              return IndexIterator.filter(
-                  getPageCount(), pageIndex -> 
matchingIndexesForNull.contains(pageIndex));
+              return IndexIterator.filter(getPageCount(), 
matchingIndexesForNull::contains);
             }
           }
         }
@@ -343,7 +339,7 @@ public abstract class ColumnIndexBuilder {
       matchingIndexesLessThanMax.retainAll(matchingIndexesGreaterThanMin);
       IntSet matchingIndex = matchingIndexesLessThanMax;
       matchingIndex.addAll(matchingIndexesForNull); // add the matching null 
pages
-      return IndexIterator.filter(getPageCount(), pageIndex -> 
matchingIndex.contains(pageIndex));
+      return IndexIterator.filter(getPageCount(), matchingIndex::contains);
     }
 
     @Override