implement workaround for BatchIterator interface change

apache · Sep 18, 2023 · 8e68427 · 8e68427
1 parent b404563
commit 8e68427
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/processing/src/main/java/org/apache/druid/collections/bitmap/BatchIteratorAdapter.java b/processing/src/main/java/org/apache/druid/collections/bitmap/BatchIteratorAdapter.java
@@ -21,13 +21,13 @@
 
 import com.google.common.base.Preconditions;
 import org.roaringbitmap.BatchIterator;
-import org.roaringbitmap.IntIterator;
+import org.roaringbitmap.PeekableIntIterator;
 
 public final class BatchIteratorAdapter implements BatchIterator
 {
-  private final IntIterator iterator;
+  private final PeekableIntIterator iterator;
 
-  public BatchIteratorAdapter(IntIterator iterator)
+  public BatchIteratorAdapter(PeekableIntIterator iterator)
   {
     this.iterator = Preconditions.checkNotNull(iterator, "iterator");
   }
@@ -49,6 +49,12 @@ public boolean hasNext()
     return iterator.hasNext();
   }
 
+  @Override
+  public void advanceIfNeeded(int target)
+  {
+    iterator.advanceIfNeeded(target);
+  }
+
   @Override
   public BatchIterator clone()
   {

diff --git a/processing/src/main/java/org/apache/druid/collections/bitmap/ImmutableBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/ImmutableBitmap.java
@@ -47,7 +47,7 @@ default PeekableIntIterator peekableIterator()
    */
   default BatchIterator batchIterator()
   {
-    return new BatchIteratorAdapter(iterator());
+    return new BatchIteratorAdapter(peekableIterator());
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ default PeekableIntIterator peekableIterator() @@
        */
       default BatchIterator batchIterator()
       {
-        return new BatchIteratorAdapter(iterator());
+        return new BatchIteratorAdapter(peekableIterator());
       }
       /**
@@ Expand Down @@