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 2014/03/11 09:19:48 UTC
svn commit: r1576223 - in /lucene/dev/trunk/lucene: CHANGES.txt
queries/src/java/org/apache/lucene/queries/TermsFilter.java
queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
Author: jpountz
Date: Tue Mar 11 08:19:48 2014
New Revision: 1576223
URL: http://svn.apache.org/r1576223
Log:
LUCENE-5502: Fix TermsFilter.equals.
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1576223&r1=1576222&r2=1576223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Tue Mar 11 08:19:48 2014
@@ -156,6 +156,9 @@ Bug fixes
* LUCENE-5507: Fix HunspellStemFilter loading of dictionaries with large amounts of aliases
etc before the encoding declaration. (Robert Muir)
+* LUCENE-5502: Fixed TermsFilter.equals that could return true for different
+ filters. (Igor Motov via Adrien Grand)
+
Test Framework
* LUCENE-5449: Rename _TestUtil and _TestHelper to remove the leading _.
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java?rev=1576223&r1=1576222&r2=1576223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java Tue Mar 11 08:19:48 2014
@@ -222,24 +222,14 @@ public final class TermsFilter extends F
}
TermsFilter test = (TermsFilter) obj;
- if (test.hashCode == hashCode && this.termsAndFields.length == test.termsAndFields.length) {
- // first check the fields before even comparing the bytes
- for (int i = 0; i < termsAndFields.length; i++) {
- TermsAndField current = termsAndFields[i];
- if (!current.equals(test.termsAndFields[i])) {
- return false;
- }
- }
- // straight byte comparison since we sort they must be identical
- int end = offsets[termsAndFields.length];
- byte[] left = this.termsBytes;
- byte[] right = test.termsBytes;
- for(int i=0;i < end;i++) {
- if (left[i] != right[i]) {
- return false;
- }
+ // first check the fields before even comparing the bytes
+ if (test.hashCode == hashCode && Arrays.equals(termsAndFields, test.termsAndFields)) {
+ int lastOffset = termsAndFields[termsAndFields.length - 1].end;
+ // compare offsets since we sort they must be identical
+ if (ArrayUtil.equals(offsets, 0, test.offsets, 0, lastOffset + 1)) {
+ // straight byte comparison since we sort they must be identical
+ return ArrayUtil.equals(termsBytes, 0, test.termsBytes, 0, offsets[lastOffset]);
}
- return true;
}
return false;
}
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java?rev=1576223&r1=1576222&r2=1576223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java Tue Mar 11 08:19:48 2014
@@ -50,7 +50,6 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TestUtil;
public class TermsFilterTest extends LuceneTestCase {
@@ -297,7 +296,15 @@ public class TermsFilterTest extends Luc
}
}
}
-
+
+ public void testSingleFieldEquals() {
+ // Two terms with the same hash code
+ assertEquals("AaAaBB".hashCode(), "BBBBBB".hashCode());
+ TermsFilter left = termsFilter(true, new Term("id", "AaAaAa"), new Term("id", "AaAaBB"));
+ TermsFilter right = termsFilter(true, new Term("id", "AaAaAa"), new Term("id", "BBBBBB"));
+ assertFalse(left.equals(right));
+ }
+
public void testNoTerms() {
List<Term> emptyTerms = Collections.emptyList();
List<BytesRef> emptyBytesRef = Collections.emptyList();