Skip to content

Commit 660cf8c

Browse files
authored
Merge branch '9.1' into fix-bulkinference-test-timeout
2 parents a68115d + 10a8af2 commit 660cf8c

File tree

6 files changed

+7
-3
lines changed

6 files changed

+7
-3
lines changed

server/src/internalClusterTest/java/org/elasticsearch/index/store/DirectIOIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.apache.lucene.store.IndexOutput;
1818
import org.apache.lucene.tests.util.LuceneTestCase;
1919
import org.elasticsearch.common.settings.Settings;
20+
import org.elasticsearch.index.codec.vectors.es818.ES818BinaryQuantizedVectorsFormat;
2021
import org.elasticsearch.plugins.Plugin;
2122
import org.elasticsearch.search.vectors.KnnSearchBuilder;
2223
import org.elasticsearch.search.vectors.VectorData;
@@ -46,6 +47,7 @@ public class DirectIOIT extends ESIntegTestCase {
4647

4748
@BeforeClass
4849
public static void checkSupported() throws IOException {
50+
assumeTrue("test requires direct IO", ES818BinaryQuantizedVectorsFormat.USE_DIRECT_IO);
4951
Path path = createTempDir("directIOProbe");
5052
try (Directory dir = open(path); IndexOutput out = dir.createOutput("out", IOContext.DEFAULT)) {
5153
out.writeString("test");

server/src/main/java/org/elasticsearch/index/codec/vectors/es818/ES818BinaryQuantizedVectorsFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
*/
8888
public class ES818BinaryQuantizedVectorsFormat extends FlatVectorsFormat {
8989

90-
static final boolean USE_DIRECT_IO = Boolean.parseBoolean(System.getProperty("vector.rescoring.directio", "true"));
90+
public static final boolean USE_DIRECT_IO = Boolean.parseBoolean(System.getProperty("vector.rescoring.directio", "false"));
9191

9292
public static final String BINARIZED_VECTOR_COMPONENT = "BVEC";
9393
public static final String NAME = "ES818BinaryQuantizedVectorsFormat";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ private Directory newFSDirectory() throws IOException {
373373
}
374374

375375
static void checkDirectIOSupported() {
376+
assumeTrue("test requires direct IO", ES818BinaryQuantizedVectorsFormat.USE_DIRECT_IO);
376377
Path path = createTempDir("directIOProbe");
377378
try (Directory dir = open(path); IndexOutput out = dir.createOutput("out", IOContext.DEFAULT)) {
378379
out.writeString("test");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ private Directory newFSDirectory() throws IOException {
221221
}
222222

223223
static void checkDirectIOSupported() {
224+
assumeTrue("test requires direct IO", ES818BinaryQuantizedVectorsFormat.USE_DIRECT_IO);
224225
Path path = createTempDir("directIOProbe");
225226
try (Directory dir = open(path); IndexOutput out = dir.createOutput("out", IOContext.DEFAULT)) {
226227
out.writeString("test");

test/external-modules/multi-project/src/test/java/org/elasticsearch/multiproject/action/DeleteProjectActionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void testDeleteNonExisting() throws Exception {
6464
);
6565
var nonExistingTask = createTask(randomUniqueProjectId(), listener);
6666
var tasks = Stream.concat(Stream.of(nonExistingTask), deletedProjects.stream().map(this::createTask)).toList();
67-
var result = ClusterStateTaskExecutorUtils.executeIgnoringFailures(state, executor, tasks);
67+
var result = ClusterStateTaskExecutorUtils.executeHandlingResults(state, executor, tasks, t -> {}, DeleteProjectTask::onFailure);
6868
for (ProjectId deletedProject : deletedProjects) {
6969
assertNull(result.metadata().projects().get(deletedProject));
7070
assertNull(result.globalRoutingTable().routingTables().get(deletedProject));

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/StdDevTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private static TestCaseSupplier makeSupplier(TestCaseSupplier.TypedDataSupplier
6161
welfordAlgorithm.add(value);
6262
}
6363
var result = welfordAlgorithm.evaluate();
64-
var expected = Double.isInfinite(result) ? null : result;
64+
var expected = Double.isFinite(result) ? result : null;
6565
return new TestCaseSupplier.TestCase(
6666
List.of(fieldTypedData),
6767
"StdDev[field=Attribute[channel=0]]",

0 commit comments

Comments
 (0)