Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix this test to avoid MockRandomMergePolicy which leads to false failures

This commit is contained in:
Mike McCandless 2016-02-15 05:17:40 -05:00
parent ef965661ab
commit a9dc40294e
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/misc/src/java/org/apache/lucene/index/SortingMergePolicy.java
View File

@ -163,6 +163,10 @@ public final class SortingMergePolicy extends MergePolicyWrapper {
};
}
@Override
public String toString() {
return "SortingMergePolicy.SortingOneMerge(segments=" + segString() + " sort=" + sort + ")";
}
}
class SortingMergeSpecification extends MergeSpecification {

3
lucene/misc/src/test/org/apache/lucene/index/TestSortingMergePolicy.java
View File

@ -100,6 +100,9 @@ public class TestSortingMergePolicy extends BaseMergePolicyTestCase {
mp = newMergePolicy();
}
// wrap it with a sorting mp
if (VERBOSE) {
System.out.println("TEST: return SortingMergePolicy(mp=" + mp + " sort=" + sort + ")");
}
return new SortingMergePolicy(mp, sort);
}

24
lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java
View File

@ -39,14 +39,27 @@ public abstract class BaseMergePolicyTestCase extends LuceneTestCase {
final MergeScheduler mergeScheduler = new SerialMergeScheduler() {
@Override
synchronized public void merge(IndexWriter writer, MergeTrigger trigger, boolean newMergesFound) throws IOException {
if (!mayMerge.get() && writer.getNextMerge() != null) {
throw new AssertionError();
if (mayMerge.get() == false) {
MergePolicy.OneMerge merge = writer.getNextMerge();
if (merge != null) {
System.out.println("TEST: we should not need any merging, yet merge policy returned merge " + merge);
throw new AssertionError();
}
}
super.merge(writer, trigger, newMergesFound);
}
};
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setMergeScheduler(mergeScheduler).setMergePolicy(mergePolicy()));
writer.getConfig().getMergePolicy().setNoCFSRatio(random().nextBoolean() ? 0 : 1);
MergePolicy mp = mergePolicy();
assumeFalse("this test cannot tolerate random forceMerges", mp.toString().contains("MockRandomMergePolicy"));
mp.setNoCFSRatio(random().nextBoolean() ? 0 : 1);
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setMergeScheduler(mergeScheduler);
iwc.setMergePolicy(mp);
IndexWriter writer = new IndexWriter(dir, iwc);
final int numSegments = TestUtil.nextInt(random(), 2, 20);
for (int i = 0; i < numSegments; ++i) {
final int numDocs = TestUtil.nextInt(random(), 1, 5);
@ -59,6 +72,9 @@ public abstract class BaseMergePolicyTestCase extends LuceneTestCase {
final int segmentCount = writer.getSegmentCount();
final int maxNumSegments = i == 0 ? 1 : TestUtil.nextInt(random(), 1, 10);
mayMerge.set(segmentCount > maxNumSegments);
if (VERBOSE) {
System.out.println("TEST: now forceMerge(maxNumSegments=" + maxNumSegments + ") vs segmentCount=" + segmentCount);
}
writer.forceMerge(maxNumSegments);
}
writer.close();