Skip to content

Commit 3dfe043

Browse files
authored
Ensure single segment in test (elastic#131077) (elastic#131275)
1 parent cbcea11 commit 3dfe043

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorTests.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.apache.lucene.index.IndexWriter;
1919
import org.apache.lucene.index.IndexWriterConfig;
2020
import org.apache.lucene.index.NoMergePolicy;
21+
import org.apache.lucene.index.TieredMergePolicy;
2122
import org.apache.lucene.search.MatchAllDocsQuery;
2223
import org.apache.lucene.store.Directory;
2324
import org.apache.lucene.tests.index.RandomIndexWriter;
@@ -390,11 +391,11 @@ private IndexReader initIndex(Directory directory, int size, int commitEvery) th
390391
return DirectoryReader.open(directory);
391392
}
392393

393-
private IndexReader initIndexLongField(Directory directory, int size, int commitEvery) throws IOException {
394+
private IndexReader initIndexLongField(Directory directory, int size, int commitEvery, boolean forceMerge) throws IOException {
394395
try (
395396
IndexWriter writer = new IndexWriter(
396397
directory,
397-
newIndexWriterConfig().setMergePolicy(NoMergePolicy.INSTANCE).setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
398+
newIndexWriterConfig().setMergePolicy(new TieredMergePolicy()).setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
398399
)
399400
) {
400401
for (int d = 0; d < size; d++) {
@@ -413,6 +414,10 @@ private IndexReader initIndexLongField(Directory directory, int size, int commit
413414
writer.commit();
414415
}
415416
}
417+
418+
if (forceMerge) {
419+
writer.forceMerge(1);
420+
}
416421
}
417422
return DirectoryReader.open(directory);
418423
}
@@ -924,7 +929,7 @@ private void testLoadLong(boolean shuffle, boolean manySegments) throws IOExcept
924929
int numDocs = between(10, 500);
925930
initMapping();
926931
keyToTags.clear();
927-
reader = initIndexLongField(directory, numDocs, manySegments ? commitEvery(numDocs) : numDocs);
932+
reader = initIndexLongField(directory, numDocs, manySegments ? commitEvery(numDocs) : numDocs, manySegments == false);
928933

929934
DriverContext driverContext = driverContext();
930935
List<Page> input = CannedSourceOperator.collectPages(sourceOperator(driverContext, numDocs));

0 commit comments

Comments
 (0)