iverase commented on a change in pull request #7: URL: https://github.com/apache/lucene/pull/7#discussion_r745897082
########## File path: lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java ########## @@ -328,31 +288,88 @@ public Relation compare(byte[] minPackedValue, byte[] maxPackedValue) { // Not deleted! docID = mappedDocID; System.arraycopy( - packedValues, - index * bkd.config.packedBytesLength, - state.scratchDataPackedValue, + mergeIntersectsVisitor.packedValues, + index * packedBytesLength, + packedValue, 0, - bkd.config.packedBytesLength); + packedBytesLength); + return true; + } + } + } + + private boolean collectNextLeaf() throws IOException { + assert pointTree.moveToChild() == false; + mergeIntersectsVisitor.reset(); + do { + if (pointTree.moveToSibling()) { + // move to first child of this node and collect docs + while (pointTree.moveToChild()) {} + pointTree.visitDocValues(mergeIntersectsVisitor); return true; } + } while (pointTree.moveToParent()); + return false; + } + } + + private static class MergeIntersectsVisitor implements IntersectVisitor { + + int docsInBlock = 0; + byte[] packedValues; + int[] docIDs; + private final int packedBytesLength; + + MergeIntersectsVisitor(int packedBytesLength) { + this.docIDs = new int[0]; + this.packedValues = new byte[0]; + this.packedBytesLength = packedBytesLength; + } + + void reset() { + docsInBlock = 0; + } + + @Override + public void grow(int count) { + if (docIDs.length - docsInBlock < count) { + docIDs = ArrayUtil.grow(docIDs, count + docsInBlock); + packedValues = ArrayUtil.grow(packedValues, (count + docsInBlock) * packedBytesLength); Review comment: >> Do we need to care about not overflowing the max array length on packedValues? Nope, count should be always <= maxPointInLeafNode and docsInBlock should always be 0. My proposal is: ``` public void grow(int count) { assert docsInBlock == 0; if (docIDs.length < count) { docIDs = ArrayUtil.grow(docIDs, count); packedValues = ArrayUtil.growExact(packedValues, docIDs.length * packedBytesLength); } } ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org