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/09/11 16:47:30 UTC

svn commit: r1702485 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/CHANGES.txt lucene/queries/ lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java

Author: rmuir
Date: Fri Sep 11 14:47:25 2015
New Revision: 1702485

URL: http://svn.apache.org/r1702485
Log:
LUCENE-6792: Fix TermsQuery.toString to work with binary terms

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/lucene/queries/   (props changed)
    lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
    lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java

Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1702485&r1=1702484&r2=1702485&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Fri Sep 11 14:47:25 2015
@@ -73,6 +73,9 @@ Bug Fixes
 * LUCENE-6776: Fix geo3d math to handle randomly squashed planet
   models (Karl Wright via Mike McCandless) 
 
+* LUCENE-6792: Fix TermsQuery.toString() to work with binary terms.
+  (Ruslan Muzhikov, Robert Muir)
+
 Other
 
 * LUCENE-6174: Improve "ant eclipse" to select right JRE for building.

Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java?rev=1702485&r1=1702484&r2=1702485&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java Fri Sep 11 14:47:25 2015
@@ -186,8 +186,7 @@ public class TermsQuery extends Query im
         builder.append(' ');
       }
       first = false;
-      builder.append(iterator.field()).append(':');
-      builder.append(term.utf8ToString());
+      builder.append(new Term(iterator.field(), term).toString());
     }
     builder.append(ToStringUtils.boost(getBoost()));
     return builder.toString();

Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java?rev=1702485&r1=1702484&r2=1702485&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java Fri Sep 11 14:47:25 2015
@@ -321,4 +321,9 @@ public class TermsQueryTest extends Luce
     wrapped.close();
     dir.close();
   }
+  
+  public void testBinaryToString() {
+    TermsQuery query = new TermsQuery(new Term("field", new BytesRef(new byte[] { (byte) 0xff, (byte) 0xfe })));
+    assertEquals("field:[ff fe]", query.toString());
+  }
 }