Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize Iterator<ImmutableBitmap> implementation inside Filters.matchPredicate() so that it doesn't emit empty bitmap in the end of the iteration, and make it to follow Iterator contract, that is throw NoSuchElementException from next() if there are no more bitmaps (#3754)

This commit is contained in:
Roman Leventov 2016-12-07 14:54:09 -06:00 committed by Jonathan Wei
parent 361af4c94f
commit dc8f814acc
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
processing/src/main/java/io/druid/segment/filter/Filters.java
View File

@ -43,6 +43,7 @@ import io.druid.segment.data.Indexed;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
/**
*/
@ -141,26 +142,42 @@ public class Filters
{
return new Iterator<ImmutableBitmap>()
{
int currIndex = 0;
private final int bitmapIndexCardinality = bitmapIndex.getCardinality();
private int nextIndex = 0;
private ImmutableBitmap nextBitmap;
{
findNextBitmap();
}
private void findNextBitmap()
{
while (nextIndex < bitmapIndexCardinality) {
if (predicate.apply(dimValues.get(nextIndex))) {
nextBitmap = bitmapIndex.getBitmap(nextIndex);
nextIndex++;
return;
}
nextIndex++;
}
nextBitmap = null;
}
@Override
public boolean hasNext()
{
return currIndex < bitmapIndex.getCardinality();
return nextBitmap != null;
}
@Override
public ImmutableBitmap next()
{
while (currIndex < bitmapIndex.getCardinality() && !predicate.apply(dimValues.get(currIndex))) {
currIndex++;
ImmutableBitmap bitmap = nextBitmap;
if (bitmap == null) {
throw new NoSuchElementException();
}
if (currIndex == bitmapIndex.getCardinality()) {
return bitmapIndex.getBitmapFactory().makeEmptyImmutableBitmap();
}
return bitmapIndex.getBitmap(currIndex++);
findNextBitmap();
return bitmap;
}
@Override