You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/03/01 14:52:30 UTC
svn commit: r1663102 - in /lucene/dev/trunk/lucene/core/src:
java/org/apache/lucene/search/BooleanQuery.java
test/org/apache/lucene/search/TestBooleanQuery.java
Author: rmuir
Date: Sun Mar 1 13:52:28 2015
New Revision: 1663102
URL: http://svn.apache.org/r1663102
Log:
BooleanQuery toString() is wrong for FILTER clauses
Modified:
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/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=1663102&r1=1663101&r2=1663102&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 Sun Mar 1 13:52:28 2015
@@ -261,11 +261,7 @@ public class BooleanQuery extends Query
for (int i = 0 ; i < clauses.size(); i++) {
BooleanClause c = clauses.get(i);
- if (c.isProhibited()) {
- buffer.append("-");
- } else if (c.isRequired()) {
- buffer.append("+");
- }
+ buffer.append(c.getOccur().toString());
Query subQuery = c.getQuery();
if (subQuery != null) {
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=1663102&r1=1663101&r2=1663102&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 Sun Mar 1 13:52:28 2015
@@ -741,4 +741,13 @@ public class TestBooleanQuery extends Lu
w.close();
dir.close();
}
+
+ public void testToString() {
+ BooleanQuery bq = new BooleanQuery();
+ bq.add(new TermQuery(new Term("field", "a")), Occur.SHOULD);
+ bq.add(new TermQuery(new Term("field", "b")), Occur.MUST);
+ bq.add(new TermQuery(new Term("field", "c")), Occur.MUST_NOT);
+ bq.add(new TermQuery(new Term("field", "d")), Occur.FILTER);
+ assertEquals("a +b -c #d", bq.toString("field"));
+ }
}