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 2015/12/21 18:01:57 UTC

svn commit: r1721215 - in /lucene/dev/trunk/lucene: CHANGES.txt core/src/java/org/apache/lucene/search/BooleanQuery.java core/src/java/org/apache/lucene/search/BooleanWeight.java

Author: jpountz
Date: Mon Dec 21 17:01:57 2015
New Revision: 1721215

URL: http://svn.apache.org/viewvc?rev=1721215&view=rev
Log:
LUCENE-6944: Prevent BooleanWeight from creating sub bulk-scorers to only trash them later.

Modified:
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1721215&r1=1721214&r2=1721215&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Dec 21 17:01:57 2015
@@ -146,6 +146,9 @@ Optimizations
 * LUCENE-6926: MUST_NOT clauses now use the match cost API to run the slow bits
   last whenever possible. (Adrien Grand)
 
+* LUCENE-6944: BooleanWeight no longer creates sub-scorers if BS1 is not
+  applicable. (Adrien Grand)
+
 Bug Fixes
 
 * LUCENE-6918: LRUQueryCache.onDocIdSetEviction is only called when at least

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java?rev=1721215&r1=1721214&r2=1721215&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java Mon Dec 21 17:01:57 2015
@@ -189,6 +189,11 @@ public class BooleanQuery extends Query
     return clauses;
   }
 
+  /** Return the collection of queries for the given {@link Occur}. */
+  Collection<Query> getClauses(Occur occur) {
+    return clauseSets.get(occur);
+  }
+
   /** Returns an iterator on the clauses in this query. It implements the {@link Iterable} interface to
    * make it possible to do:
    * <pre class="prettyprint">for (BooleanClause clause : booleanQuery) {}</pre>

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java?rev=1721215&r1=1721214&r2=1721215&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java Mon Dec 21 17:01:57 2015
@@ -191,25 +191,27 @@ final class BooleanWeight extends Weight
    *  cannot be used. */
   // pkg-private for forcing use of BooleanScorer in tests
   BulkScorer booleanScorer(LeafReaderContext context) throws IOException {
+    if (query.getClauses(Occur.MUST).isEmpty() == false
+        || query.getClauses(Occur.FILTER).isEmpty() == false) {
+      // TODO: there are some cases where BooleanScorer
+      // would handle conjunctions faster than
+      // BooleanScorer2...
+      return null;
+    } else if (query.getClauses(Occur.MUST_NOT).isEmpty() == false) {
+      // TODO: there are some cases where BooleanScorer could do this faster
+      return null;
+    }
+
     List<BulkScorer> optional = new ArrayList<BulkScorer>();
     Iterator<BooleanClause> cIter = query.iterator();
     for (Weight w  : weights) {
       BooleanClause c =  cIter.next();
+      if (c.getOccur() != Occur.SHOULD) {
+        throw new AssertionError();
+      }
       BulkScorer subScorer = w.bulkScorer(context);
-      
-      if (subScorer == null) {
-        if (c.isRequired()) {
-          return null;
-        }
-      } else if (c.isRequired()) {
-        // TODO: there are some cases where BooleanScorer
-        // would handle conjunctions faster than
-        // BooleanScorer2...
-        return null;
-      } else if (c.isProhibited()) {
-        // TODO: there are some cases where BooleanScorer could do this faster
-        return null;
-      } else {
+
+      if (subScorer != null) {
         optional.add(subScorer);
       }
     }