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/04/13 09:01:30 UTC
svn commit: r1673120 - in /lucene/dev/trunk/lucene: CHANGES.txt
core/src/java/org/apache/lucene/search/BooleanQuery.java
core/src/test/org/apache/lucene/search/TestBooleanQuery.java
Author: jpountz
Date: Mon Apr 13 07:01:29 2015
New Revision: 1673120
URL: http://svn.apache.org/r1673120
Log:
LUCENE-6416: BooleanQuery.extractTerms now only extracts terms from scoring clauses.
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/test/org/apache/lucene/search/TestBooleanQuery.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1673120&r1=1673119&r2=1673120&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Apr 13 07:01:29 2015
@@ -85,6 +85,9 @@ Bug Fixes
* LUCENE-6415: TermsQuery.extractTerms is a no-op (used to throw an
UnsupportedOperationException). (Adrien Grand)
+* LUCENE-6416: BooleanQuery.extractTerms now only extracts terms from scoring
+ clauses. (Adrien Grand)
+
API Changes
* LUCENE-6377: SearcherFactory#newSearcher now accepts the previous reader
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=1673120&r1=1673119&r2=1673120&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 Apr 13 07:01:29 2015
@@ -237,7 +237,7 @@ public class BooleanQuery extends Query
@Override
public void extractTerms(Set<Term> terms) {
for (BooleanClause clause : clauses) {
- if (clause.isProhibited() == false) {
+ if (clause.isScoring()) {
clause.getQuery().extractTerms(terms);
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=1673120&r1=1673119&r2=1673120&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java Mon Apr 13 07:01:29 2015
@@ -21,7 +21,9 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.BitSet;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -755,4 +757,19 @@ public class TestBooleanQuery extends Lu
bq.add(new TermQuery(new Term("field", "d")), Occur.FILTER);
assertEquals("a +b -c #d", bq.toString("field"));
}
+
+ public void testExtractTerms() {
+ Term a = new Term("f", "a");
+ Term b = new Term("f", "b");
+ Term c = new Term("f", "c");
+ Term d = new Term("f", "d");
+ BooleanQuery bq = new BooleanQuery();
+ bq.add(new TermQuery(a), Occur.SHOULD);
+ bq.add(new TermQuery(b), Occur.MUST);
+ bq.add(new TermQuery(c), Occur.FILTER);
+ bq.add(new TermQuery(d), Occur.MUST_NOT);
+ Set<Term> terms = new HashSet<>();
+ bq.extractTerms(terms);
+ assertEquals(new HashSet<>(Arrays.asList(a, b)), terms);
+ }
}