Skip to content

Apache Lucene open-source search software

LUCENE-10552: KnnVectorQuery has incorrect equals/ hashCode (#859)

Lu Xugangfe9d26178d03
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index b0ec21201f4..e8d78eff210 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -164,6 +164,8 @@ Bug Fixes
* LUCENE-10530: Avoid floating point precision test case bug in TestTaxonomyFacetAssociations.
(Greg Miller)
+* LUCENE-10552: KnnVectorQuery has incorrect equals/ hashCode. (Lu Xugang)
+
Build
---------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/KnnVectorQuery.java b/lucene/core/src/java/org/apache/lucene/search/KnnVectorQuery.java
index ec5d64db1a0..0bd62b4f923 100644
--- a/lucene/core/src/java/org/apache/lucene/search/KnnVectorQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/KnnVectorQuery.java
@@ -288,15 +288,18 @@ public class KnnVectorQuery extends Query {
@Override
public boolean equals(Object obj) {
- return sameClassAs(obj)
- && ((KnnVectorQuery) obj).k == k
+ if (sameClassAs(obj) == false) {
+ return false;
+ }
+ return ((KnnVectorQuery) obj).k == k
&& ((KnnVectorQuery) obj).field.equals(field)
- && Arrays.equals(((KnnVectorQuery) obj).target, target);
+ && Arrays.equals(((KnnVectorQuery) obj).target, target)
+ && Objects.equals(filter, ((KnnVectorQuery) obj).filter);
}
@Override
public int hashCode() {
- return Objects.hash(classHash(), field, k, Arrays.hashCode(target));
+ return Objects.hash(classHash(), field, k, Arrays.hashCode(target), filter);
}
/** Caches the results of a KnnVector search: a list of docs and their scores */
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java
index 6886c268f15..d698bbe668a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java
@@ -53,6 +53,15 @@ public class TestKnnVectorQuery extends LuceneTestCase {
public void testEquals() {
KnnVectorQuery q1 = new KnnVectorQuery("f1", new float[] {0, 1}, 10);
+ Query filter1 = new TermQuery(new Term("id", "id1"));
+ KnnVectorQuery q2 = new KnnVectorQuery("f1", new float[] {0, 1}, 10, filter1);
+
+ assertNotEquals(q2, q1);
+ assertNotEquals(q1, q2);
+ assertEquals(q2, new KnnVectorQuery("f1", new float[] {0, 1}, 10, filter1));
+
+ Query filter2 = new TermQuery(new Term("id", "id2"));
+ assertNotEquals(q2, new KnnVectorQuery("f1", new float[] {0, 1}, 10, filter2));
assertEquals(q1, new KnnVectorQuery("f1", new float[] {0, 1}, 10));