You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/11/28 17:26:43 UTC
[14/42] lucene-solr:jira/solr-8593: LUCENE-7569: Fix index sorting
test failures.
LUCENE-7569: Fix index sorting test failures.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/be74f4f7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/be74f4f7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/be74f4f7
Branch: refs/heads/jira/solr-8593
Commit: be74f4f7a7f808487489c315e616745fbad56186
Parents: 41d7b24
Author: Adrien Grand <jp...@gmail.com>
Authored: Thu Nov 24 13:51:35 2016 +0100
Committer: Adrien Grand <jp...@gmail.com>
Committed: Thu Nov 24 14:10:19 2016 +0100
----------------------------------------------------------------------
.../src/test/org/apache/lucene/index/TestIndexSorting.java | 7 ++++++-
.../java/org/apache/lucene/index/MockRandomMergePolicy.java | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/be74f4f7/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
index 26c4b95..eb74ab7 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
@@ -141,7 +141,12 @@ public class TestIndexSorting extends LuceneTestCase {
Sort indexSort = new Sort(sortField,
new SortField("id", SortField.Type.INT));
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
codec.numCalls = 0;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/be74f4f7/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java
index f32e4d3..b1cc0ee 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java
@@ -156,7 +156,7 @@ public class MockRandomMergePolicy extends MergePolicy {
if (LuceneTestCase.VERBOSE) {
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) {
// renumber fields
// NOTE: currently this only "blocks" bulk merges just by
@@ -165,7 +165,7 @@ public class MockRandomMergePolicy extends MergePolicy {
if (LuceneTestCase.VERBOSE) {
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 {
// otherwise, reader is unchanged
return reader;