Apache Lucene open-source search software
Speed up DocIdMerger on sorted indexes. (#12081)
Adrien Grandaaab028266d9
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 408c2fcf838..e655d487c67 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -280,6 +280,8 @@ Optimizations* GITHUB#12079: Faster merging of 1D points. (Adrien Grand)+* GITHUB#12081: Small merging speedup on sorted indexes. (Adrien Grand)+Other---------------------diff --git a/lucene/core/src/java/org/apache/lucene/index/DocIDMerger.java b/lucene/core/src/java/org/apache/lucene/index/DocIDMerger.javaindex f9accb710f1..dd1840ca850 100644--- a/lucene/core/src/java/org/apache/lucene/index/DocIDMerger.java+++ b/lucene/core/src/java/org/apache/lucene/index/DocIDMerger.java@@ -137,6 +137,7 @@ public abstract class DocIDMerger<T extends DocIDMerger.Sub> {private final List<T> subs;private T current;private final PriorityQueue<T> queue;+ private int queueMinDocID;private SortedDocIDMerger(List<T> subs, int maxCount) throws IOException {if (maxCount <= 1) {@@ -154,6 +155,14 @@ public abstract class DocIDMerger<T extends DocIDMerger.Sub> {reset();}+ private void setQueueMinDocID() {+ if (queue.size() > 0) {+ queueMinDocID = queue.top().mappedDocID;+ } else {+ queueMinDocID = DocIdSetIterator.NO_MORE_DOCS;+ }+ }+@Overridepublic void reset() throws IOException {// caller may not have fully consumed the queue:@@ -171,23 +180,33 @@ public abstract class DocIDMerger<T extends DocIDMerger.Sub> {queue.add(sub);} // else all docs in this sub were deleted; do not add it to the queue!}+ setQueueMinDocID();}@Overridepublic T next() throws IOException {int nextDoc = current.nextMappedDoc();+ if (nextDoc < queueMinDocID) {+ // This should be the common case when index sorting is either disabled, or enabled on a+ // low-cardinality field, or enabled on a field that correlates with index order.+ return current;+ }+if (nextDoc == NO_MORE_DOCS) {if (queue.size() == 0) {current = null;} else {current = queue.pop();}- } else if (queue.size() > 0 && nextDoc > queue.top().mappedDocID) {+ } else if (queue.size() > 0) {+ assert queueMinDocID == queue.top().mappedDocID;+ assert nextDoc > queueMinDocID;T newCurrent = queue.top();queue.updateTop(current);current = newCurrent;}+ setQueueMinDocID();return current;}}