From 57ef140d2f0bfd7aa3bd95e6ad5a30a7c65276ca Mon Sep 17 00:00:00 2001 From: Benjamin Trent Date: Mon, 9 Jun 2025 09:52:16 -0400 Subject: [PATCH] Correct index path validation (#129144) All we care about is if reindex is true or false. We shouldn't worry about force merge. Because if reindex is true, we will create the directory, if its false, we won't. --- .../java/org/elasticsearch/test/knn/KnnIndexTester.java | 9 ++------- .../main/java/org/elasticsearch/test/knn/KnnIndexer.java | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexTester.java b/qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexTester.java index 6aa2e051bacc..d3f707d191bc 100644 --- a/qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexTester.java +++ b/qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexTester.java @@ -177,13 +177,8 @@ public class KnnIndexTester { cmdLineArgs.vectorSpace(), cmdLineArgs.numDocs() ); - if (Files.exists(indexPath) == false) { - if (cmdLineArgs.reindex() == false) { - throw new IllegalArgumentException("Index path does not exist: " + indexPath); - } - if (cmdLineArgs.forceMerge()) { - throw new IllegalArgumentException("Force merging without an existing index in: " + indexPath); - } + if (cmdLineArgs.reindex() == false && Files.exists(indexPath) == false) { + throw new IllegalArgumentException("Index path does not exist: " + indexPath); } if (cmdLineArgs.reindex()) { knnIndexer.createIndex(result); diff --git a/qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexer.java b/qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexer.java index 07ee4975df7e..b6fc2ebd8b00 100644 --- a/qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexer.java +++ b/qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexer.java @@ -304,7 +304,7 @@ class KnnIndexer { bytes.position(0); // wrap around back to the start of the file if we hit the end: logger.warn("VectorReader hit EOF when reading " + this.input + "; now wrapping around to start of file again"); - this.input.position(position); + input.position(position); bytesRead = Channels.readFromFileChannel(this.input, position, bytes); if (bytesRead < bytes.capacity()) { throw new IllegalStateException(