diff --git a/LICENSE-binary b/LICENSE-binary index 33d2f8cec4c2..02af00daac0c 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -389,8 +389,8 @@ org.eclipse.jetty:jetty-util:9.4.39.v20210325 org.javassist:javassist:3.19.0-GA org.lz4:lz4-java:1.7.1 org.quartz-scheduler:quartz:2.3.2 -org.roaringbitmap:RoaringBitmap:0.9.23 -org.roaringbitmap:shims:0.9.23 +org.roaringbitmap:RoaringBitmap:0.9.25 +org.roaringbitmap:shims:0.9.25 org.typelevel:macro-compat_2.12:1.1.1 org.webjars:swagger-ui:3.23.11 org.wildfly.openssl:wildfly-openssl:1.0.7.Final diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BitSlicedRangeIndexReader.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BitSlicedRangeIndexReader.java index 41d34e1a93e7..b0d2a085217e 100644 --- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BitSlicedRangeIndexReader.java +++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BitSlicedRangeIndexReader.java @@ -27,7 +27,6 @@ import org.apache.pinot.segment.spi.index.reader.RangeIndexReader; import org.apache.pinot.segment.spi.memory.PinotDataBuffer; import org.roaringbitmap.RangeBitmap; -import org.roaringbitmap.RoaringBitmap; import org.roaringbitmap.buffer.ImmutableRoaringBitmap; import org.roaringbitmap.buffer.MutableRoaringBitmap; @@ -109,11 +108,10 @@ public ImmutableRoaringBitmap getPartiallyMatchingDocIds(double min, double max) private ImmutableRoaringBitmap queryRangeBitmap(long min, long max, long columnMax) { RangeBitmap rangeBitmap = mapRangeBitmap(); if (Long.compareUnsigned(max, columnMax) < 0) { - RoaringBitmap lte = rangeBitmap.lte(max); if (Long.compareUnsigned(min, 0) > 0) { - return rangeBitmap.gte(min, lte).toMutableRoaringBitmap(); + return rangeBitmap.between(min, max).toMutableRoaringBitmap(); } - return lte.toMutableRoaringBitmap(); + return rangeBitmap.lte(max).toMutableRoaringBitmap(); } else { if (Long.compareUnsigned(min, 0) > 0) { return rangeBitmap.gte(min).toMutableRoaringBitmap(); diff --git a/pom.xml b/pom.xml index 6b48e65b4cff..ebd3dde770ad 100644 --- a/pom.xml +++ b/pom.xml @@ -436,7 +436,7 @@ org.roaringbitmap RoaringBitmap - 0.9.23 + 0.9.25 com.101tec