Skip to content

Apache Lucene open-source search software

GITHUB-11761 (part 2): Fix unit tests to cleany work with new TierMergePolicy delete pct default (#11841)

Marc D'Mello3a608995a17d
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
index 9f8413a76bd..1fe44c7271e 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
@@ -1341,11 +1341,12 @@ public class TestIndexWriterDelete extends LuceneTestCase {
w.addDocument(doc);
w.addDocument(doc);
w.addDocument(doc);
+ w.addDocument(doc);
+ w.addDocument(doc);
doc.add(new StringField("id", "1", Field.Store.YES));
w.addDocument(doc);
w.close();
iwc = new IndexWriterConfig(new MockAnalyzer(random()));
- ((TieredMergePolicy) iwc.getMergePolicy()).setDeletesPctAllowed(33.0);
iwc.setOpenMode(IndexWriterConfig.OpenMode.APPEND);
w = new IndexWriter(d, iwc);
IndexReader r = DirectoryReader.open(w, false, false);
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
index 7d52107b900..5f6e8a15bb9 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
@@ -310,9 +310,9 @@ public class TestTieredMergePolicy extends BaseMergePolicyTestCase {
((1024.0 * 1024.0)); // fudge it up, we're trying to catch egregious errors and segbytes
// don't really reflect the number for original merges.
tmp.setMaxMergedSegmentMB(mbSize);
- tmp.setDeletesPctAllowed(33.0);
conf.setMaxBufferedDocs(100);
conf.setMergePolicy(tmp);
+ conf.setMergeScheduler(new SerialMergeScheduler());
final IndexWriter w = new IndexWriter(dir, conf);