Skip to content

Expose merge bug as test was swallowing it #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sam-herman merged 2 commits into from
Aug 28, 2025
Merged

Expose merge bug as test was swallowing it #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20adea7
Expose merge bug as test was swallowing it
Aug 28, 2025
c937a58
Update KNNJVectorTests.java
sam-herman Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/org/opensearch/knn/index/codec/jvector/JVectorReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ public void close() throws IOException {
for (FieldEntry fieldEntry : fieldEntryMap.values()) {
IOUtils.close(fieldEntry);
}
fieldEntryMap.clear();
}

private void readFields(ChecksumIndexInput meta) throws IOException {
Expand Down
13 changes: 9 additions & 4 deletions src/test/java/org/opensearch/knn/index/codec/jvector/KNNJVectorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,11 @@ public void testLuceneKnnIndex_multipleMerges_with_ordering_check() throws IOExc
try {
for (int t = 0; t < numThreads; t++) {
executor.submit(() -> {
int i = 0;

try {
ThreadLocalRandom random = ThreadLocalRandom.current();
for (int i = 0; i < queriesPerThread && !failureDetected.get(); i++) {
for (i = 0; i < queriesPerThread && !failureDetected.get(); i++) {
// Choose a random docId to search for
int randomDocId = random.nextInt(reader.maxDoc());
float[] query = new float[] { randomDocId, 0 };
Expand All @@ -472,13 +474,15 @@ public void testLuceneKnnIndex_multipleMerges_with_ordering_check() throws IOExc
assertEquals("Search should return correct number of results", k, td.scoreDocs.length);
assertEquals("Search should return the correct document", randomDocId, td.scoreDocs[0].doc);
totalQueries.incrementAndGet();
} catch (Exception e) {
failureDetected.set(true);
} catch (Throwable e) {
failureDetected.compareAndSet(false, true);
log.error("Exception encountered", e);
fail("Exception during concurrent search: " + e.getMessage());
}
}
} finally {
latch.countDown();
log.warn("Ran {} queries", i);
}
});
}
Expand All @@ -487,9 +491,10 @@ public void testLuceneKnnIndex_multipleMerges_with_ordering_check() throws IOExc
boolean completed = latch.await(30, TimeUnit.SECONDS);
assertTrue("Test timed out while waiting for concurrent searches", completed);
assertFalse("Test encountered failures during concurrent searches", failureDetected.get());
assertEquals("Incorrect number of queries executed", numThreads * queriesPerThread, totalQueries.get());

// Log the number of successful queries
log.info("Successfully completed {} concurrent kNN search queries", totalQueries.get());
log.info("Successfully completed {} concurrent kNN search queries!", totalQueries.get());

} finally {
executor.shutdownNow();
Expand Down
Loading