You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2016/11/24 12:52:43 UTC
lucene-solr:branch_6x: LUCENE-7569: Fix test failures due to merging
using cached doc values instances.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 63fd2e834 -> eb51ebc0e
LUCENE-7569: Fix test failures due to merging using cached doc values instances.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eb51ebc0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eb51ebc0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eb51ebc0
Branch: refs/heads/branch_6x
Commit: eb51ebc0e96d9b973a4e534795c620132b7cb0d2
Parents: 63fd2e8
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 13:51:35 2016 +0100
----------------------------------------------------------------------
.../src/test/org/apache/lucene/index/TestIndexSorting.java | 8 ++++++--
.../java/org/apache/lucene/index/MockRandomMergePolicy.java | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eb51ebc0/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 49fd827..93acc3b 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
@@ -140,7 +140,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;
@@ -2127,7 +2132,6 @@ public class TestIndexSorting extends LuceneTestCase {
}
// pits index time sorting against query time sorting
- @AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/LUCENE-7569")
public void testRandom3() throws Exception {
int numDocs;
if (TEST_NIGHTLY) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eb51ebc0/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;