Skip to content

Commit 67fb702

Browse files
committed
Update implementations
1 parent 7d1edd3 commit 67fb702

File tree

2 files changed

+11
-97
lines changed

2 files changed

+11
-97
lines changed

server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2065,7 +2065,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
20652065
builder.field("m", m);
20662066
builder.field("ef_construction", efConstruction);
20672067
if (directRawVectorReads) {
2068-
builder.field("disable_offheap_cache_rescoring", true);
2068+
builder.field("direct_raw_vector_reads", true);
20692069
}
20702070
if (rescoreVector != null) {
20712071
rescoreVector.toXContent(builder, params);
@@ -2148,13 +2148,13 @@ public boolean validateDimension(int dim, boolean throwOnError) {
21482148
static class BBQIVFIndexOptions extends QuantizedIndexOptions {
21492149
final int clusterSize;
21502150
final double defaultVisitPercentage;
2151-
final boolean directRawDiskReads;
2151+
final boolean directRawVectorReads;
21522152

2153-
BBQIVFIndexOptions(int clusterSize, double defaultVisitPercentage, RescoreVector rescoreVector, boolean directRawDiskReads) {
2153+
BBQIVFIndexOptions(int clusterSize, double defaultVisitPercentage, RescoreVector rescoreVector, boolean directRawVectorReads) {
21542154
super(VectorIndexType.BBQ_DISK, rescoreVector);
21552155
this.clusterSize = clusterSize;
21562156
this.defaultVisitPercentage = defaultVisitPercentage;
2157-
this.directRawDiskReads = directRawDiskReads;
2157+
this.directRawVectorReads = directRawVectorReads;
21582158
}
21592159

21602160
@Override
@@ -2163,7 +2163,7 @@ KnnVectorsFormat getVectorsFormat(ElementType elementType) {
21632163
return new ES920DiskBBQVectorsFormat(
21642164
clusterSize,
21652165
ES920DiskBBQVectorsFormat.DEFAULT_CENTROIDS_PER_PARENT_CLUSTER,
2166-
directRawDiskReads
2166+
directRawVectorReads
21672167
);
21682168
}
21692169

@@ -2177,12 +2177,13 @@ boolean doEquals(DenseVectorIndexOptions other) {
21772177
BBQIVFIndexOptions that = (BBQIVFIndexOptions) other;
21782178
return clusterSize == that.clusterSize
21792179
&& defaultVisitPercentage == that.defaultVisitPercentage
2180-
&& Objects.equals(rescoreVector, that.rescoreVector);
2180+
&& Objects.equals(rescoreVector, that.rescoreVector)
2181+
&& directRawVectorReads == that.directRawVectorReads;
21812182
}
21822183

21832184
@Override
21842185
int doHashCode() {
2185-
return Objects.hash(clusterSize, defaultVisitPercentage, rescoreVector);
2186+
return Objects.hash(clusterSize, defaultVisitPercentage, rescoreVector, directRawVectorReads);
21862187
}
21872188

21882189
@Override
@@ -2196,6 +2197,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
21962197
builder.field("type", type);
21972198
builder.field("cluster_size", clusterSize);
21982199
builder.field("default_visit_percentage", defaultVisitPercentage);
2200+
if (directRawVectorReads) {
2201+
builder.field("direct_raw_vector_reads", true);
2202+
}
21992203
if (rescoreVector != null) {
22002204
rescoreVector.toXContent(builder, params);
22012205
}

server/src/test/java/org/elasticsearch/index/codec/vectors/es818/DirectIOES818HnswBinaryQuantizedVectorsFormatTests.java

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

0 commit comments

Comments
 (0)