You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2024/10/16 13:15:44 UTC
(lucene) branch branch_10x updated: Revert "Better handle dynamic pruning when the leading clause has a single impact block. (#13904)"
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch branch_10x
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/branch_10x by this push:
new 1a7514f9dd1 Revert "Better handle dynamic pruning when the leading clause has a single impact block. (#13904)"
1a7514f9dd1 is described below
commit 1a7514f9dd1c06c5e5c2b7be2ab45bade11547b8
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Wed Oct 16 15:15:27 2024 +0200
Revert "Better handle dynamic pruning when the leading clause has a single impact block. (#13904)"
This reverts commit 92c4f5122431674e9a46124ece97295fee812c57.
---
lucene/CHANGES.txt | 4 ----
.../lucene/search/BlockMaxConjunctionBulkScorer.java | 17 +++--------------
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 13e2990a086..6acd0414e07 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -27,10 +27,6 @@ Optimizations
* GITHUB#13800: MaxScoreBulkScorer now recomputes scorer partitions when the
minimum competitive allows for a more favorable partitioning. (Adrien Grand)
-* GITHUB#13904: BlockMaxConjunctionBulkScorer can now early exit when the
- leading clause has a single impact block (e.g. ConstantScoreQuery).
- (Adrien Grand)
-
Bug Fixes
---------------------
* GITHUB#13832: Fixed an issue where the DefaultPassageFormatter.format method did not format passages as intended
diff --git a/lucene/core/src/java/org/apache/lucene/search/BlockMaxConjunctionBulkScorer.java b/lucene/core/src/java/org/apache/lucene/search/BlockMaxConjunctionBulkScorer.java
index d7e939f4c13..9f4531540a5 100644
--- a/lucene/core/src/java/org/apache/lucene/search/BlockMaxConjunctionBulkScorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/BlockMaxConjunctionBulkScorer.java
@@ -85,20 +85,9 @@ final class BlockMaxConjunctionBulkScorer extends BulkScorer {
int windowMin = Math.max(lead1.docID(), min);
while (windowMin < max) {
- // Use impacts of the least costly scorer to compute windows to keep the per-block overhead
- // under control.
- // NOTE: windowMax is inclusive.
- int windowMax = scorer1.advanceShallow(windowMin);
- if (windowMax == DocIdSetIterator.NO_MORE_DOCS) {
- // If the query doesn't have impacts anymore, or has a single block for the whole doc ID
- // space (e.g. ConstantScoreQuery), then we try to create a block that has ~128 docs of the
- // leading clause. This gives us higher chances to exit early based on the maximum scores of
- // other clauses.
- long windowSize = 128L * maxDoc / Math.max(1, lead1.cost());
- windowSize = Math.max(windowSize, 128L);
- windowMax = (int) Math.min(Integer.MAX_VALUE, windowMin + windowSize);
- }
- windowMax = Math.min(windowMax, max - 1);
+ // Use impacts of the least costly scorer to compute windows
+ // NOTE: windowMax is inclusive
+ int windowMax = Math.min(scorers[0].advanceShallow(windowMin), max - 1);
float maxWindowScore = Float.POSITIVE_INFINITY;
if (0 < scorable.minCompetitiveScore) {