You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2018/04/13 20:23:26 UTC
lucene-solr:branch_7x: LUCENE-8248: remove duplicate method;
fix test to reference FilterMergePolicy
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 0836ea5c3 -> ffa1bf7a0
LUCENE-8248: remove duplicate method; fix test to reference FilterMergePolicy
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ffa1bf7a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ffa1bf7a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ffa1bf7a
Branch: refs/heads/branch_7x
Commit: ffa1bf7a0a206dd2fbdf4a1ad68b8f00f250a20f
Parents: 0836ea5
Author: Mike McCandless <mi...@apache.org>
Authored: Fri Apr 13 16:23:11 2018 -0400
Committer: Mike McCandless <mi...@apache.org>
Committed: Fri Apr 13 16:23:11 2018 -0400
----------------------------------------------------------------------
.../src/java/org/apache/lucene/index/MergePolicyWrapper.java | 5 -----
.../src/test/org/apache/lucene/index/TestFilterMergePolicy.java | 3 +--
2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ffa1bf7a/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java b/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java
index 4731e5e..e04cc26 100644
--- a/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java
+++ b/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java
@@ -37,9 +37,4 @@ public class MergePolicyWrapper extends FilterMergePolicy {
public MergePolicyWrapper(MergePolicy in) {
super(in);
}
-
- @Override
- public int numDeletesToMerge(SegmentCommitInfo info, int pendingDeleteCount, IOSupplier<CodecReader> readerSupplier) throws IOException {
- return in.numDeletesToMerge(info, pendingDeleteCount, readerSupplier);
- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ffa1bf7a/lucene/core/src/test/org/apache/lucene/index/TestFilterMergePolicy.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterMergePolicy.java
index 4057d3c..58baa5d 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestFilterMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterMergePolicy.java
@@ -29,9 +29,8 @@ public class TestFilterMergePolicy extends LuceneTestCase {
try {
FilterMergePolicy.class.getDeclaredMethod(m.getName(), m.getParameterTypes());
} catch (NoSuchMethodException e) {
- fail("MergePolicyWrapper needs to override '" + m + "'");
+ fail("FilterMergePolicy needs to override '" + m + "'");
}
}
}
-
}