Skip to content

Commit 648d74b

Browse files
authored
Revert "Adds unused lower level ivf knn query (#127852)" (#128003)
This reverts commit a7a430f.
1 parent 0e64dee commit 648d74b

File tree

7 files changed

+3
-1469
lines changed

7 files changed

+3
-1469
lines changed

server/src/main/java/org/elasticsearch/index/codec/vectors/IVFVectorsFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*/
4747
public class IVFVectorsFormat extends KnnVectorsFormat {
4848

49-
public static final FeatureFlag IVF_FORMAT_FEATURE_FLAG = new FeatureFlag("ivf_format");
49+
static final FeatureFlag IVF_FORMAT_FEATURE_FLAG = new FeatureFlag("ivf_format");
5050
public static final String IVF_VECTOR_COMPONENT = "IVF";
5151
public static final String NAME = "IVFVectorsFormat";
5252
// centroid ordinals -> centroid values, offsets

server/src/main/java/org/elasticsearch/index/codec/vectors/IVFVectorsReader.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.apache.lucene.util.FixedBitSet;
3333
import org.apache.lucene.util.hnsw.NeighborQueue;
3434
import org.elasticsearch.core.IOUtils;
35-
import org.elasticsearch.search.vectors.IVFKnnSearchStrategy;
3635

3736
import java.io.IOException;
3837
import java.util.function.IntPredicate;
@@ -244,11 +243,8 @@ public final void search(String field, float[] target, KnnCollector knnCollector
244243
rawVectorsReader.search(field, target, knnCollector, acceptDocs);
245244
return;
246245
}
247-
if (fieldInfo.getVectorDimension() != target.length) {
248-
throw new IllegalArgumentException(
249-
"vector query dimension: " + target.length + " differs from field dimension: " + fieldInfo.getVectorDimension()
250-
);
251-
}
246+
// TODO add new ivf search strategy
247+
int nProbe = 10;
252248
float percentFiltered = 1f;
253249
if (acceptDocs instanceof BitSet bitSet) {
254250
percentFiltered = Math.max(0f, Math.min(1f, (float) bitSet.approximateCardinality() / bitSet.length()));
@@ -261,13 +257,6 @@ public final void search(String field, float[] target, KnnCollector knnCollector
261257
}
262258
return visitedDocs.getAndSet(docId) == false;
263259
};
264-
final int nProbe;
265-
if (knnCollector.getSearchStrategy() instanceof IVFKnnSearchStrategy ivfSearchStrategy) {
266-
nProbe = ivfSearchStrategy.getNProbe();
267-
} else {
268-
// TODO calculate nProbe given the number of centroids vs. number of vectors for given `k`
269-
nProbe = 10;
270-
}
271260

272261
FieldEntry entry = fields.get(fieldInfo.number);
273262
CentroidQueryScorer centroidQueryScorer = getCentroidScorer(

server/src/main/java/org/elasticsearch/search/vectors/AbstractIVFKnnVectorQuery.java

Lines changed: 0 additions & 198 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/search/vectors/IVFKnnFloatVectorQuery.java

Lines changed: 0 additions & 101 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/search/vectors/IVFKnnSearchStrategy.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)