kaivalnp commented on PR #16654:
URL: https://github.com/apache/lucene/pull/16654#issuecomment-5625940125
Also added tests for the "explicit" version of the query, which is a copy of
the test class from `branch_10_4`, see `git diff` between the files:
```diff
diff --git
a/lucene/core/src/test/org/apache/lucene/search/BaseVectorSimilarityQueryTestCase.java
b/lucene/core/src/test/org/apache/lucene/search/BaseExplicitVectorSimilarityQueryTestCase.java
index f7230837e8f..583f6c7cee1 100644
---
a/lucene/core/src/test/org/apache/lucene/search/BaseVectorSimilarityQueryTestCase.java
+++
b/lucene/core/src/test/org/apache/lucene/search/BaseExplicitVectorSimilarityQueryTestCase.java
@@ -47,8 +47,9 @@ import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.tests.util.TestUtil;
import org.apache.lucene.util.hnsw.HnswUtil;
+@Deprecated
@LuceneTestCase.SuppressCodecs("SimpleText")
-abstract class BaseVectorSimilarityQueryTestCase<
+abstract class BaseExplicitVectorSimilarityQueryTestCase<
V, F extends Field, Q extends AbstractVectorSimilarityQuery>
extends LuceneTestCase {
String vectorField, idField;
@@ -581,7 +582,7 @@ abstract class BaseVectorSimilarityQueryTestCase<
@SuppressWarnings("unchecked")
V[] getRandomVectors(int numDocs, int dim) {
- return (V[]) IntStream.range(0, numDocs).mapToObj(i ->
getRandomVector(dim)).toArray();
+ return (V[]) IntStream.range(0, numDocs).mapToObj(_ ->
getRandomVector(dim)).toArray();
}
@SafeVarargs
```
```diff
diff --git
a/lucene/core/src/test/org/apache/lucene/search/TestFloatVectorSimilarityQuery.java
b/lucene/core/src/test/org/apache/lucene/search/TestExplicitFloatVectorSimilarityQuery.java
index 479d4ef0df1..bb12318e366 100644
---
a/lucene/core/src/test/org/apache/lucene/search/TestFloatVectorSimilarityQuery.java
+++
b/lucene/core/src/test/org/apache/lucene/search/TestExplicitFloatVectorSimilarityQuery.java
@@ -23,8 +23,9 @@ import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.util.TestVectorUtil;
import org.junit.Before;
-public class TestFloatVectorSimilarityQuery
- extends BaseVectorSimilarityQueryTestCase<
+@Deprecated
+public class TestExplicitFloatVectorSimilarityQuery
+ extends BaseExplicitVectorSimilarityQueryTestCase<
float[], KnnFloatVectorField, FloatVectorSimilarityQuery> {
@Before
@@ -64,7 +65,7 @@ public class TestFloatVectorSimilarityQuery
float traversalSimilarity,
float resultSimilarity,
Query filter) {
- return new FloatVectorSimilarityQuery(
+ return new FloatVectorSimilarityQuery.Explicit(
field, vector, traversalSimilarity, resultSimilarity, filter);
}
@@ -75,7 +76,7 @@ public class TestFloatVectorSimilarityQuery
float traversalSimilarity,
float resultSimilarity,
Query filter) {
- return new FloatVectorSimilarityQuery(
+ return new FloatVectorSimilarityQuery.Explicit(
field, vector, traversalSimilarity, resultSimilarity, filter) {
@Override
VectorScorer createVectorScorer(LeafReaderContext context) {
```
```diff
diff --git
a/lucene/core/src/test/org/apache/lucene/search/TestByteVectorSimilarityQuery.java
b/lucene/core/src/test/org/apache/lucene/search/TestExplicitByteVectorSimilarityQuery.java
index 07f9e8a86e9..83f9da7f28b 100644
---
a/lucene/core/src/test/org/apache/lucene/search/TestByteVectorSimilarityQuery.java
+++
b/lucene/core/src/test/org/apache/lucene/search/TestExplicitByteVectorSimilarityQuery.java
@@ -23,8 +23,9 @@ import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.util.TestVectorUtil;
import org.junit.Before;
-public class TestByteVectorSimilarityQuery
- extends BaseVectorSimilarityQueryTestCase<
+@Deprecated
+public class TestExplicitByteVectorSimilarityQuery
+ extends BaseExplicitVectorSimilarityQueryTestCase<
byte[], KnnByteVectorField, ByteVectorSimilarityQuery> {
@Before
@@ -63,7 +64,7 @@ public class TestByteVectorSimilarityQuery
float traversalSimilarity,
float resultSimilarity,
Query filter) {
- return new ByteVectorSimilarityQuery(
+ return new ByteVectorSimilarityQuery.Explicit(
field, vector, traversalSimilarity, resultSimilarity, filter);
}
@@ -74,7 +75,7 @@ public class TestByteVectorSimilarityQuery
float traversalSimilarity,
float resultSimilarity,
Query filter) {
- return new ByteVectorSimilarityQuery(
+ return new ByteVectorSimilarityQuery.Explicit(
field, vector, traversalSimilarity, resultSimilarity, filter) {
@Override
VectorScorer createVectorScorer(LeafReaderContext context) {
```
I'm not sure if this is needed or not though.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
