Started by an SCM changeStarted by an SCM changeStarted by an SCM changeStarted by an SCM changeStarted by an SCM change0017818892178188924515564515561.0050215021567d60e550b47f44253abc822454f7a5098526fb01dd60e550b47f44253abc822454f7a5098526fb01drefs/remotes/origin/branch_10xd60e550b47f44253abc822454f7a5098526fb01dd60e550b47f44253abc822454f7a5098526fb01drefs/remotes/origin/branch_10xd60e550b47f44253abc822454f7a5098526fb01dd60e550b47f44253abc822454f7a5098526fb01drefs/remotes/origin/branch_10xhttps://gitbox.apache.org/repos/asf/lucene.gitfalse#567451556461779Lucene ยป Lucene-Maven-Snapshots-10.x #567567falsefalse56721411054SUCCESS1783521604184https://ci-builds.apache.org/job/Lucene/job/Lucene-Maven-Snapshots-10.x/567/lucene-solr-3- lucene/core/src/java/org/apache/lucene/search/ReqExclBulkScorer.javalucene/core/src/test/org/apache/lucene/search/TestDenseConjunctionBulkScorer.javalucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.javad1e035949fb5c297257228d825307dafe5f36e031783500467000https://ci-builds.apache.org/user/jimcziJim Ferenczijim.ferenczi@elastic.coRevert TwoPhaseIterator#docIDRunEnd default to approximation().docID()
The default was changed in #16307 to return docID()+1, mirroring
DocIdSetIterator. That is wrong for a TwoPhaseIterator: its current
approximation doc is only a candidate until matches() confirms it.
DenseConjunctionBulkScorer#scoreWindow consults docIDRunEnd() before
matches(), so an optimistic docID()+1 let a width-1 window treat an
unconfirmed (possibly out-of-range) boundary doc as a fully-matching run
and collect it via collectRange, causing an off-by-one over-count (e.g.
TestRangeFacetCounts#testRandomLongsMultiValued).
Restore the conservative default (report no matching run) and document
why it differs from DocIdSetIterator. The ReqExclBulkScorer optimization
is unaffected: it calls docIDRunEnd() only after matches() and already
clamps to at least upTo+1.
Add a DenseConjunctionBulkScorer test asserting that a two-phase clause
on the default docIDRunEnd() collects the same docs whether scored in one
pass or as adjacent width-1 windows -- the partition invariance that
intra-segment search concurrency relies on.
(cherry picked from commit 32f32667a174c0df5dd6d0ba48870d073868f71b)
2026-07-08 10:47:47 +0200d1e035949fb5c297257228d825307dafe5f36e03Revert TwoPhaseIterator#docIDRunEnd default to approximation().docID()editlucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.javaeditlucene/core/src/test/org/apache/lucene/search/TestDenseConjunctionBulkScorer.javaeditlucene/core/src/java/org/apache/lucene/search/ReqExclBulkScorer.java
- lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupingSearch.javalucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.javalucene/core/src/java/org/apache/lucene/search/CachingCollector.javalucene/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollector.javalucene/core/src/test/org/apache/lucene/search/TestCachingCollectorManager.javalucene/core/src/java/org/apache/lucene/search/CachingCollectorManager.javalucene/grouping/src/test/org/apache/lucene/search/grouping/BaseGroupSelectorTestCase.javalucene/CHANGES.txtlucene/grouping/src/java/org/apache/lucene/search/grouping/AllGroupHeadsCollector.javad60e550b47f44253abc822454f7a5098526fb01d1783502953000https://ci-builds.apache.org/user/javannaLuca Cavannajavanna@apache.orgIntroduce CachingCollectorManager to parallelize search when using CachingCollector (#16247)
Introduce CachingCollectorManager, switch GroupingSearch to use search concurrency and move away from the deprecated search(Query, Collector) method.
In addition, remove experimental GroupingSearch constructor that takes a GroupSelector as argument in favor of providing a GroupSelector supplier.
Relates to #12892.
2026-07-08 11:29:13 +0200d60e550b47f44253abc822454f7a5098526fb01dIntroduce CachingCollectorManager to parallelize search when using CachingCollector (#16247)editlucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.javaaddlucene/core/src/test/org/apache/lucene/search/TestCachingCollectorManager.javaeditlucene/grouping/src/java/org/apache/lucene/search/grouping/GroupingSearch.javaeditlucene/CHANGES.txteditlucene/grouping/src/test/org/apache/lucene/search/grouping/BaseGroupSelectorTestCase.javaaddlucene/core/src/java/org/apache/lucene/search/CachingCollectorManager.javaeditlucene/core/src/java/org/apache/lucene/search/CachingCollector.javaeditlucene/grouping/src/java/org/apache/lucene/search/grouping/AllGroupHeadsCollector.javaeditlucene/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollector.java
githttps://ci-builds.apache.org/user/jimcziJim Ferenczihttps://ci-builds.apache.org/user/javannaLuca Cavanna