From 669b86f7fc34619661c58cb711cd925083e45c65 Mon Sep 17 00:00:00 2001 From: Xu Zhang Date: Wed, 1 Jul 2026 17:02:40 +0800 Subject: [PATCH 1/2] Fix flaky test TestIndexOptions > testMultiValueForcesDeoptimization --- .../core/src/test/org/apache/lucene/index/TestIndexOptions.java | 1 + 1 file changed, 1 insertion(+) diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexOptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexOptions.java index 3c360ac4d8ec..9b2a8ea016a5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexOptions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexOptions.java @@ -350,6 +350,7 @@ public void testMultiValueForcesDeoptimization() throws IOException { w.addDocument(Collections.singleton(new Field("foo", "val2", ftB))); // Doc 3 w.addDocument(Collections.singleton(new Field("foo", "val3", ftB))); + w.forceMerge(1); try (LeafReader r = getOnlyLeafReader(DirectoryReader.open(w))) { assertEquals(4, r.maxDoc()); } From c34485d0138e3492af06ad13a3505cf02d9c4fb0 Mon Sep 17 00:00:00 2001 From: Xu Zhang Date: Wed, 1 Jul 2026 17:10:31 +0800 Subject: [PATCH 2/2] Update CHANGES.txt --- lucene/CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 622c9cb06215..94770cc9475d 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -317,6 +317,8 @@ Other * GITHUB#16266: Remove deprecated search(Query, Collector) calls in QueryUtils by replacing SimpleCollector-based iteration with explicit leaf-level Weight.scorer() calls. (Luca Cavanna) +* GITHUB#16315: Fix flaky test TestIndexOptions > testMultiValueForcesDeoptimization (neoremind) + ======================= Lucene 10.5.0 ======================= API Changes