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

Reduce long[] array allocation for bitset in readBitSetIterator (#13828)

This commit is contained in:
Zhang Chao 2024-10-08 10:19:28 +08:00 committed by easyice
parent 6a2d5354a5
commit e10e9d136d
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/CHANGES.txt
View File

@ -19,7 +19,7 @@ Improvements
Optimizations Optimizations
--------------------- ---------------------
(No changes) * GITHUB#13828: Reduce long[] array allocation for bitset in readBitSetIterator. (Zhang Chao)
Bug Fixes Bug Fixes
--------------------- ---------------------

22
lucene/core/src/java/org/apache/lucene/util/bkd/DocIdsWriter.java
View File

@ -17,13 +17,16 @@
package org.apache.lucene.util.bkd; package org.apache.lucene.util.bkd;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.IntersectVisitor;
import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.DataOutput; import org.apache.lucene.store.DataOutput;
import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.DocBaseBitSetIterator; import org.apache.lucene.util.DocBaseBitSetIterator;
import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRef;
import org.apache.lucene.util.LongsRef;
final class DocIdsWriter { final class DocIdsWriter {
@ -36,6 +39,7 @@ final class DocIdsWriter {
private static final byte LEGACY_DELTA_VINT = (byte) 0; private static final byte LEGACY_DELTA_VINT = (byte) 0;
private final int[] scratch; private final int[] scratch;
private final LongsRef scratchLongs = new LongsRef();
/** /**
* IntsRef to be used to iterate over the scratch buffer. A single instance is reused to avoid * IntsRef to be used to iterate over the scratch buffer. A single instance is reused to avoid
@ -205,12 +209,17 @@ final class DocIdsWriter {
} }
} }
private static DocIdSetIterator readBitSetIterator(IndexInput in, int count) throws IOException { private DocIdSetIterator readBitSetIterator(IndexInput in, int count) throws IOException {
int offsetWords = in.readVInt(); int offsetWords = in.readVInt();
int longLen = in.readVInt(); int longLen = in.readVInt();
long[] bits = new long[longLen]; scratchLongs.longs = ArrayUtil.growNoCopy(scratchLongs.longs, longLen);
in.readLongs(bits, 0, longLen); in.readLongs(scratchLongs.longs, 0, longLen);
FixedBitSet bitSet = new FixedBitSet(bits, longLen << 6); // make ghost bits clear for FixedBitSet.
if (longLen < scratchLongs.length) {
Arrays.fill(scratchLongs.longs, longLen, scratchLongs.longs.length, 0);
}
scratchLongs.length = longLen;
FixedBitSet bitSet = new FixedBitSet(scratchLongs.longs, longLen << 6);
return new DocBaseBitSetIterator(bitSet, count, offsetWords << 6); return new DocBaseBitSetIterator(bitSet, count, offsetWords << 6);
} }
@ -230,7 +239,7 @@ final class DocIdsWriter {
} }
} }
private static void readBitSet(IndexInput in, int count, int[] docIDs) throws IOException { private void readBitSet(IndexInput in, int count, int[] docIDs) throws IOException {
DocIdSetIterator iterator = readBitSetIterator(in, count); DocIdSetIterator iterator = readBitSetIterator(in, count);
int docId, pos = 0; int docId, pos = 0;
while ((docId = iterator.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { while ((docId = iterator.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
@ -307,8 +316,7 @@ final class DocIdsWriter {
} }
} }
private static void readBitSet(IndexInput in, int count, IntersectVisitor visitor) private void readBitSet(IndexInput in, int count, IntersectVisitor visitor) throws IOException {
throws IOException {
DocIdSetIterator bitSetIterator = readBitSetIterator(in, count); DocIdSetIterator bitSetIterator = readBitSetIterator(in, count);
visitor.visit(bitSetIterator); visitor.visit(bitSetIterator);
} }