renames and cleanup

apache · May 3, 2024 · fd47ee5 · fd47ee5
1 parent 8c6ab61
commit fd47ee5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/...ne/internal/vectorization/DotProduct.java → ...n/DotProductByteVectorScorerSupplier.java b/...ne/internal/vectorization/DotProduct.java → ...n/DotProductByteVectorScorerSupplier.java
@@ -20,9 +20,9 @@
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.util.hnsw.RandomAccessVectorValues;
 
-final class DotProduct extends MemorySegmentByteVectorScorerSupplier {
+final class DotProductByteVectorScorerSupplier extends MemorySegmentByteVectorScorerSupplier {
 
-  DotProduct(
+  DotProductByteVectorScorerSupplier(
       int dims, int maxOrd, int vectorByteSize, IndexInput input, RandomAccessVectorValues values) {
     super(dims, maxOrd, vectorByteSize, input, values);
   }
@@ -35,7 +35,8 @@ public float score(int node) throws IOException {
   }
 
   @Override
-  public DotProduct copy() throws IOException {
-    return new DotProduct(dims, maxOrd, vectorByteSize, input.clone(), values);
+  public DotProductByteVectorScorerSupplier copy() throws IOException {
+    return new DotProductByteVectorScorerSupplier(
+        dims, maxOrd, vectorByteSize, input.clone(), values);
   }
 }
diff --git a/...ene/internal/vectorization/Euclidean.java → ...on/EuclideanByteVectorScorerSupplier.java b/...ene/internal/vectorization/Euclidean.java → ...on/EuclideanByteVectorScorerSupplier.java
@@ -20,9 +20,9 @@
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.util.hnsw.RandomAccessVectorValues;
 
-final class Euclidean extends MemorySegmentByteVectorScorerSupplier {
+final class EuclideanByteVectorScorerSupplier extends MemorySegmentByteVectorScorerSupplier {
 
-  Euclidean(
+  EuclideanByteVectorScorerSupplier(
       int dims, int maxOrd, int vectorByteSize, IndexInput input, RandomAccessVectorValues values) {
     super(dims, maxOrd, vectorByteSize, input, values);
   }
@@ -34,7 +34,8 @@ public float score(int node) throws IOException {
   }
 
   @Override
-  public Euclidean copy() throws IOException {
-    return new Euclidean(dims, maxOrd, vectorByteSize, input.clone(), values);
+  public EuclideanByteVectorScorerSupplier copy() throws IOException {
+    return new EuclideanByteVectorScorerSupplier(
+        dims, maxOrd, vectorByteSize, input.clone(), values);
   }
 }
diff --git a/...ava21/org/apache/lucene/internal/vectorization/MemorySegmentByteVectorScorerSupplier.java b/...ava21/org/apache/lucene/internal/vectorization/MemorySegmentByteVectorScorerSupplier.java
@@ -30,7 +30,8 @@
 
 /** A scorer of vectors whose element size is byte. */
 public abstract sealed class MemorySegmentByteVectorScorerSupplier
-    implements RandomVectorScorerSupplier, RandomVectorScorer permits DotProduct, Euclidean {
+    implements RandomVectorScorerSupplier, RandomVectorScorer
+    permits DotProductByteVectorScorerSupplier, EuclideanByteVectorScorerSupplier {
   final int vectorByteSize;
   final int dims;
   final int maxOrd;
@@ -59,8 +60,10 @@ public static Optional<MemorySegmentByteVectorScorerSupplier> create(
     }
     checkInvariants(maxOrd, vectorByteSize, input);
     return switch (type) {
-      case DOT_PRODUCT -> Optional.of(new DotProduct(dims, maxOrd, vectorByteSize, input, values));
-      case EUCLIDEAN -> Optional.of(new Euclidean(dims, maxOrd, vectorByteSize, input, values));
+      case DOT_PRODUCT -> Optional.of(
+          new DotProductByteVectorScorerSupplier(dims, maxOrd, vectorByteSize, input, values));
+      case EUCLIDEAN -> Optional.of(
+          new EuclideanByteVectorScorerSupplier(dims, maxOrd, vectorByteSize, input, values));
       case MAXIMUM_INNER_PRODUCT -> Optional.empty(); // TODO: implement MAXIMUM_INNER_PRODUCT
       case COSINE -> Optional.empty(); // TODO: implement Cosine
     };

diff --git a/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQueryMMap.java b/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQueryMMap.java
@@ -22,7 +22,6 @@
 import org.apache.lucene.tests.store.BaseDirectoryWrapper;
 import org.apache.lucene.tests.store.MockDirectoryWrapper;
 
-@com.carrotsearch.randomizedtesting.annotations.Repeat(iterations = 100)
 public class TestKnnByteVectorQueryMMap extends TestKnnByteVectorQuery {
 
   @Override