Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-9614: Small fixes to KnnVectorQuery hashCode and toString

This commit is contained in:
Julie Tibshirani 2021-08-16 08:52:32 -07:00
parent e48be684b2
commit 29ed3908ea
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lucene/core/src/java/org/apache/lucene/search/KnnVectorQuery.java
View File

@ -117,7 +117,7 @@ public class KnnVectorQuery extends Query {
@Override
public String toString(String field) {
return "<vector:" + this.field + "[" + target[0] + ",...][" + k + "]>";
return getClass().getSimpleName() + ":" + this.field + "[" + target[0] + ",...][" + k + "]";
}
@Override
@ -129,7 +129,7 @@ public class KnnVectorQuery extends Query {
@Override
public boolean equals(Object obj) {
return obj instanceof KnnVectorQuery
return sameClassAs(obj)
&& ((KnnVectorQuery) obj).k == k
&& ((KnnVectorQuery) obj).field.equals(field)
&& Arrays.equals(((KnnVectorQuery) obj).target, target);
@ -137,7 +137,7 @@ public class KnnVectorQuery extends Query {
@Override
public int hashCode() {
return Objects.hash(field, k, Arrays.hashCode(target));
return Objects.hash(classHash(), field, k, Arrays.hashCode(target));
}
/** Caches the results of a KnnVector search: a list of docs and their scores */
@ -293,7 +293,7 @@ public class KnnVectorQuery extends Query {
@Override
public boolean equals(Object obj) {
if (obj instanceof DocAndScoreQuery == false) {
if (sameClassAs(obj) == false) {
return false;
}
return Arrays.equals(docs, ((DocAndScoreQuery) obj).docs)
@ -302,8 +302,7 @@ public class KnnVectorQuery extends Query {
@Override
public int hashCode() {
return Objects.hash(
DocAndScoreQuery.class.hashCode(), Arrays.hashCode(docs), Arrays.hashCode(scores));
return Objects.hash(classHash(), Arrays.hashCode(docs), Arrays.hashCode(scores));
}
}
}

2
lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java
View File

@ -58,7 +58,7 @@ public class TestKnnVectorQuery extends LuceneTestCase {
public void testToString() {
KnnVectorQuery q1 = new KnnVectorQuery("f1", new float[] {0, 1}, 10);
assertEquals("<vector:f1[0.0,...][10]>", q1.toString("ignored"));
assertEquals("KnnVectorQuery:f1[0.0,...][10]", q1.toString("ignored"));
}
/**