You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/12/07 18:35:55 UTC
svn commit: r1211555 - in /lucene/dev/branches/lucene3606/lucene/src:
java/org/apache/lucene/index/FilterIndexReader.java
test/org/apache/lucene/index/TestFilterIndexReader.java
Author: uschindler
Date: Wed Dec 7 17:35:55 2011
New Revision: 1211555
URL: http://svn.apache.org/viewvc?rev=1211555&view=rev
Log:
LUCENE-3620: Add Shais patch to branch
Modified:
lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
Modified: lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java?rev=1211555&r1=1211554&r2=1211555&view=diff
==============================================================================
--- lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java (original)
+++ lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java Wed Dec 7 17:35:55 2011
@@ -426,4 +426,14 @@ public class FilterIndexReader extends I
ensureOpen();
return in.perDocValues();
}
+
+ @Override
+ public IndexCommit getIndexCommit() throws IOException {
+ return in.getIndexCommit();
+ }
+
+ @Override
+ public int getTermInfosIndexDivisor() {
+ return in.getTermInfosIndexDivisor();
+ }
}
Modified: lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java?rev=1211555&r1=1211554&r2=1211555&view=diff
==============================================================================
--- lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java (original)
+++ lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java Wed Dec 7 17:35:55 2011
@@ -28,6 +28,9 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.Bits;
import java.io.IOException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.HashSet;
public class TestFilterIndexReader extends LuceneTestCase {
@@ -167,4 +170,28 @@ public class TestFilterIndexReader exten
directory.close();
target.close();
}
+
+ public void testOverrideMethods() throws Exception {
+ HashSet<String> methodsThatShouldNotBeOverridden = new HashSet<String>();
+ methodsThatShouldNotBeOverridden.add("doOpenIfChanged");
+ methodsThatShouldNotBeOverridden.add("clone");
+ boolean fail = false;
+ for (Method m : FilterIndexReader.class.getMethods()) {
+ int mods = m.getModifiers();
+ if (Modifier.isStatic(mods) || Modifier.isFinal(mods)) {
+ continue;
+ }
+ Class< ? > declaringClass = m.getDeclaringClass();
+ String name = m.getName();
+ if (declaringClass != FilterIndexReader.class && declaringClass != Object.class && !methodsThatShouldNotBeOverridden.contains(name)) {
+ System.err.println("method is not overridden by FilterIndexReader: " + name);
+ fail = true;
+ } else if (declaringClass == FilterIndexReader.class && methodsThatShouldNotBeOverridden.contains(name)) {
+ System.err.println("method should not be overridden by FilterIndexReader: " + name);
+ fail = true;
+ }
+ }
+ assertFalse("FilterIndexReader overrides (or not) some problematic methods; see log above", fail);
+ }
+
}