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

LUCENE-6681: SortingMergePolicy must override MergePolicy.size(...). 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1691421 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrien Grand 2015-07-16 17:15:18 +00:00
parent 9342ddc392
commit e8a5ffbea3
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -259,6 +259,9 @@ Bug fixes
* LUCENE-6680: Preserve two suggestions that have same key and weight but * LUCENE-6680: Preserve two suggestions that have same key and weight but
different payloads (Arcadius Ahouansou via Mike McCandless) different payloads (Arcadius Ahouansou via Mike McCandless)
* LUCENE-6681: SortingMergePolicy must override MergePolicy.size(...).
(Christine Poerschke via Adrien Grand)
Changes in Runtime Behavior Changes in Runtime Behavior
* LUCENE-6501: The subreader structure in ParallelCompositeReader * LUCENE-6501: The subreader structure in ParallelCompositeReader

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

@ -260,6 +260,11 @@ public final class SortingMergePolicy extends MergePolicy {
return in.useCompoundFile(segments, newSegment, writer); return in.useCompoundFile(segments, newSegment, writer);
} }
@Override
protected long size(SegmentCommitInfo info, IndexWriter writer) throws IOException {
return in.size(info, writer);
}
@Override @Override
public String toString() { public String toString() {
return "SortingMergePolicy(" + in + ", sorter=" + sorter + ")"; return "SortingMergePolicy(" + in + ", sorter=" + sorter + ")";

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

@ -18,6 +18,8 @@ package org.apache.lucene.index;
*/ */
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -192,4 +194,15 @@ public class TestSortingMergePolicy extends LuceneTestCase {
} }
} }
public void testMethodsOverridden() throws Exception {
for (Method m : MergePolicy.class.getDeclaredMethods()) {
if (Modifier.isFinal(m.getModifiers())) continue;
try {
SortingMergePolicy.class.getDeclaredMethod(m.getName(), m.getParameterTypes());
} catch (NoSuchMethodException e) {
fail("SortingMergePolicy needs to override '"+m+"'");
}
}
}
} }