Skip to content

Commit 8f7312c

Browse files
committed
Use direct IO in tests sometimes
1 parent a0c3005 commit 8f7312c

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
import java.util.IdentityHashMap;
1919
import java.util.Map;
2020

21+
/**
22+
* Keeps track of field-specific raw vector readers for vector reads
23+
*/
2124
public class GenericFlatVectorReaders {
2225

2326
public interface Field {
@@ -73,6 +76,7 @@ public Collection<FlatVectorsReader> allReaders() {
7376
public GenericFlatVectorReaders getMergeInstance() throws IOException {
7477
GenericFlatVectorReaders mergeReaders = new GenericFlatVectorReaders();
7578

79+
// link the original instance with the merge instance
7680
Map<FlatVectorsReader, FlatVectorsReader> mergeInstances = new IdentityHashMap<>();
7781
for (var reader : readers.entrySet()) {
7882
FlatVectorsReader mergeInstance = reader.getValue().getMergeInstance();

server/src/main/java/org/elasticsearch/index/codec/vectors/es93/ES93GenericFlatVectorsReader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ public FlatVectorsScorer getFlatVectorScorer() {
104104

105105
@Override
106106
public FlatVectorsReader getMergeInstance() throws IOException {
107-
// we know what the reader is, so we can return it directly
108107
return new ES93GenericFlatVectorsReader(fieldInfos, genericReaders.getMergeInstance());
109108
}
110109

server/src/test/java/org/elasticsearch/index/codec/vectors/es93/ES93BinaryQuantizedVectorsFormatTests.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,17 @@ public class ES93BinaryQuantizedVectorsFormatTests extends BaseKnnVectorsFormatT
7575
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
7676
}
7777

78-
static final Codec codec = TestUtil.alwaysKnnVectorsFormat(new ES93BinaryQuantizedVectorsFormat());
78+
private KnnVectorsFormat format;
79+
80+
@Override
81+
public void setUp() throws Exception {
82+
format = new ES93BinaryQuantizedVectorsFormat(random().nextBoolean());
83+
super.setUp();
84+
}
7985

8086
@Override
8187
protected Codec getCodec() {
82-
return codec;
88+
return TestUtil.alwaysKnnVectorsFormat(format);
8389
}
8490

8591
@Override
@@ -118,7 +124,7 @@ public void testEmptyDiversifiedChildSearch() throws Exception {
118124
float[] vector = randomVector(dims);
119125
VectorSimilarityFunction similarityFunction = VectorSimilarityFunction.EUCLIDEAN;
120126
try (Directory d = newDirectory()) {
121-
IndexWriterConfig iwc = newIndexWriterConfig().setCodec(codec);
127+
IndexWriterConfig iwc = newIndexWriterConfig().setCodec(getCodec());
122128
iwc.setMergePolicy(new SoftDeletesRetentionMergePolicy("soft_delete", MatchAllDocsQuery::new, iwc.getMergePolicy()));
123129
try (IndexWriter w = new IndexWriter(d, iwc)) {
124130
List<Document> toAdd = new ArrayList<>();

0 commit comments

Comments
 (0)