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

LUCENE-10329: Use computed mask for DirectMonotonicReader#get (#553) 

* use computed mask

* CHANGES

* use block mask for getBounds too

Co-authored-by: guofeng.my <guofeng.my@bytedance.com>
This commit is contained in:
gf2121 2021-12-22 19:03:12 +08:00 committed by GitHub
parent a94fbb79ac
commit c1fb591984
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/CHANGES.txt
View File

@ -104,6 +104,8 @@ Improvements
Optimizations Optimizations
--------------------- ---------------------
* LUCENE-10329: Use computed block mask for DirectMonotonicReader#get. (Guo Feng)
* LUCENE-10280: Optimize BKD leaves' doc IDs codec when they are continuous. (Guo Feng) * LUCENE-10280: Optimize BKD leaves' doc IDs codec when they are continuous. (Guo Feng)
* LUCENE-10233: Store BKD leaves' doc IDs as bitset in some cases (typically for low cardinality fields * LUCENE-10233: Store BKD leaves' doc IDs as bitset in some cases (typically for low cardinality fields

6
lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicReader.java
View File

@ -127,6 +127,7 @@ public final class DirectMonotonicReader extends LongValues implements Accountab
} }
private final int blockShift; private final int blockShift;
private final long blockMask;
private final LongValues[] readers; private final LongValues[] readers;
private final long[] mins; private final long[] mins;
private final float[] avgs; private final float[] avgs;
@ -136,6 +137,7 @@ public final class DirectMonotonicReader extends LongValues implements Accountab
private DirectMonotonicReader( private DirectMonotonicReader(
int blockShift, LongValues[] readers, long[] mins, float[] avgs, byte[] bpvs) { int blockShift, LongValues[] readers, long[] mins, float[] avgs, byte[] bpvs) {
this.blockShift = blockShift; this.blockShift = blockShift;
this.blockMask = (1L << blockShift) - 1;
this.readers = readers; this.readers = readers;
this.mins = mins; this.mins = mins;
this.avgs = avgs; this.avgs = avgs;
@ -157,7 +159,7 @@ public final class DirectMonotonicReader extends LongValues implements Accountab
@Override @Override
public long get(long index) { public long get(long index) {
final int block = (int) (index >>> blockShift); final int block = (int) (index >>> blockShift);
final long blockIndex = index & ((1 << blockShift) - 1); final long blockIndex = index & blockMask;
final long delta = readers[block].get(blockIndex); final long delta = readers[block].get(blockIndex);
return mins[block] + (long) (avgs[block] * blockIndex) + delta; return mins[block] + (long) (avgs[block] * blockIndex) + delta;
} }
@ -165,7 +167,7 @@ public final class DirectMonotonicReader extends LongValues implements Accountab
/** Get lower/upper bounds for the value at a given index without hitting the direct reader. */ /** Get lower/upper bounds for the value at a given index without hitting the direct reader. */
private long[] getBounds(long index) { private long[] getBounds(long index) {
final int block = Math.toIntExact(index >>> blockShift); final int block = Math.toIntExact(index >>> blockShift);
final long blockIndex = index & ((1 << blockShift) - 1); final long blockIndex = index & blockMask;
final long lowerBound = mins[block] + (long) (avgs[block] * blockIndex); final long lowerBound = mins[block] + (long) (avgs[block] * blockIndex);
final long upperBound = lowerBound + (1L << bpvs[block]) - 1; final long upperBound = lowerBound + (1L << bpvs[block]) - 1;
if (bpvs[block] == 64 || upperBound < lowerBound) { // overflow if (bpvs[block] == 64 || upperBound < lowerBound) { // overflow