From ec51a85c64d0361fc25bf387a91e3dafa8e5fa6c Mon Sep 17 00:00:00 2001 From: Ievgen Degtiarenko Date: Tue, 15 Jul 2025 09:50:35 +0200 Subject: [PATCH] Ensure single segment in test (#131077) --- .../lucene/read/ValuesSourceReaderOperatorTests.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorTests.java index 36f430452f7b8..3995d5011ca8a 100644 --- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorTests.java +++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorTests.java @@ -18,6 +18,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.NoMergePolicy; +import org.apache.lucene.index.TieredMergePolicy; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; @@ -389,11 +390,11 @@ private IndexReader initIndex(Directory directory, int size, int commitEvery) th return DirectoryReader.open(directory); } - private IndexReader initIndexLongField(Directory directory, int size, int commitEvery) throws IOException { + private IndexReader initIndexLongField(Directory directory, int size, int commitEvery, boolean forceMerge) throws IOException { try ( IndexWriter writer = new IndexWriter( directory, - newIndexWriterConfig().setMergePolicy(NoMergePolicy.INSTANCE).setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH) + newIndexWriterConfig().setMergePolicy(new TieredMergePolicy()).setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH) ) ) { for (int d = 0; d < size; d++) { @@ -412,6 +413,10 @@ private IndexReader initIndexLongField(Directory directory, int size, int commit writer.commit(); } } + + if (forceMerge) { + writer.forceMerge(1); + } } return DirectoryReader.open(directory); } @@ -923,7 +928,7 @@ private void testLoadLong(boolean shuffle, boolean manySegments) throws IOExcept int numDocs = between(10, 500); initMapping(); keyToTags.clear(); - reader = initIndexLongField(directory, numDocs, manySegments ? commitEvery(numDocs) : numDocs); + reader = initIndexLongField(directory, numDocs, manySegments ? commitEvery(numDocs) : numDocs, manySegments == false); DriverContext driverContext = driverContext(); List input = CannedSourceOperator.collectPages(sourceOperator(driverContext, numDocs));