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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Noble Paul 2016-11-25 00:51:49 +05:30
parent 5650939a8d be74f4f7a7
commit e35500dc13
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
View File

@ -141,7 +141,12 @@ public class TestIndexSorting extends LuceneTestCase {
Sort indexSort = new Sort(sortField, Sort indexSort = new Sort(sortField,
new SortField("id", SortField.Type.INT)); new SortField("id", SortField.Type.INT));
iwc.setIndexSort(indexSort); iwc.setIndexSort(indexSort);
iwc.setMergePolicy(newLogMergePolicy()); LogMergePolicy policy = newLogMergePolicy();
// make sure that merge factor is always > 2
if (policy.getMergeFactor() <= 2) {
policy.setMergeFactor(3);
}
iwc.setMergePolicy(policy);
// add already sorted documents // add already sorted documents
codec.numCalls = 0; codec.numCalls = 0;

4
lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java
View File

@ -156,7 +156,7 @@ public class MockRandomMergePolicy extends MergePolicy {
if (LuceneTestCase.VERBOSE) { if (LuceneTestCase.VERBOSE) {
System.out.println("NOTE: MockRandomMergePolicy now swaps in a SlowCodecReaderWrapper for merging reader=" + reader); System.out.println("NOTE: MockRandomMergePolicy now swaps in a SlowCodecReaderWrapper for merging reader=" + reader);
} }
return SlowCodecReaderWrapper.wrap(new FilterLeafReader(reader) {}); return SlowCodecReaderWrapper.wrap(new FilterLeafReader(new MergeReaderWrapper(reader)) {});
} else if (thingToDo == 1) { } else if (thingToDo == 1) {
// renumber fields // renumber fields
// NOTE: currently this only "blocks" bulk merges just by // NOTE: currently this only "blocks" bulk merges just by
@ -165,7 +165,7 @@ public class MockRandomMergePolicy extends MergePolicy {
if (LuceneTestCase.VERBOSE) { if (LuceneTestCase.VERBOSE) {
System.out.println("NOTE: MockRandomMergePolicy now swaps in a MismatchedLeafReader for merging reader=" + reader); System.out.println("NOTE: MockRandomMergePolicy now swaps in a MismatchedLeafReader for merging reader=" + reader);
} }
return SlowCodecReaderWrapper.wrap(new MismatchedLeafReader(reader, r)); return SlowCodecReaderWrapper.wrap(new MismatchedLeafReader(new MergeReaderWrapper(reader), r));
} else { } else {
// otherwise, reader is unchanged // otherwise, reader is unchanged
return reader; return reader;