You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/03/31 23:08:35 UTC
svn commit: r1670480 - in /lucene/dev/branches/lucene6271/lucene:
core/src/java/org/apache/lucene/index/ core/src/test/org/apache/lucene/index/
misc/src/java/org/apache/lucene/index/
test-framework/src/java/org/apache/lucene/index/
Author: rmuir
Date: Tue Mar 31 21:08:35 2015
New Revision: 1670480
URL: http://svn.apache.org/r1670480
Log:
LUCENE-6271: fix confusing naming... TODO: address SortingDocsEnum too
Modified:
lucene/dev/branches/lucene6271/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java
lucene/dev/branches/lucene6271/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java
lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
Modified: lucene/dev/branches/lucene6271/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java?rev=1670480&r1=1670479&r2=1670480&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java (original)
+++ lucene/dev/branches/lucene6271/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java Tue Mar 31 21:08:35 2015
@@ -222,17 +222,17 @@ public class FilterLeafReader extends Le
}
/** Base class for filtering {@link PostingsEnum} implementations. */
- public static class FilterDocsEnum extends PostingsEnum {
- /** The underlying DocsEnum instance. */
+ public static class FilterPostingsEnum extends PostingsEnum {
+ /** The underlying PostingsEnum instance. */
protected final PostingsEnum in;
/**
* Create a new FilterDocsEnum
- * @param in the underlying DocsEnum instance.
+ * @param in the underlying PostingsEnum instance.
*/
- public FilterDocsEnum(PostingsEnum in) {
+ public FilterPostingsEnum(PostingsEnum in) {
if (in == null) {
- throw new NullPointerException("incoming DocsEnum cannot be null");
+ throw new NullPointerException("incoming PostingsEnum cannot be null");
}
this.in = in;
}
Modified: lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java?rev=1670480&r1=1670479&r2=1670480&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java (original)
+++ lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java Tue Mar 31 21:08:35 2015
@@ -77,12 +77,12 @@ public class TestFilterLeafReader extend
@Override
public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
- return new TestPositions(super.postings(liveDocs, reuse == null ? null : ((FilterDocsEnum) reuse).in, flags));
+ return new TestPositions(super.postings(liveDocs, reuse == null ? null : ((FilterPostingsEnum) reuse).in, flags));
}
}
/** Filter that only returns odd numbered documents. */
- private static class TestPositions extends FilterDocsEnum {
+ private static class TestPositions extends FilterPostingsEnum {
public TestPositions(PostingsEnum in) {
super(in);
}
@@ -188,7 +188,7 @@ public class TestFilterLeafReader extend
checkOverrideMethods(FilterLeafReader.FilterFields.class);
checkOverrideMethods(FilterLeafReader.FilterTerms.class);
checkOverrideMethods(FilterLeafReader.FilterTermsEnum.class);
- checkOverrideMethods(FilterLeafReader.FilterDocsEnum.class);
+ checkOverrideMethods(FilterLeafReader.FilterPostingsEnum.class);
}
public void testUnwrap() throws IOException {
Modified: lucene/dev/branches/lucene6271/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java?rev=1670480&r1=1670479&r2=1670480&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java (original)
+++ lucene/dev/branches/lucene6271/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java Tue Mar 31 21:08:35 2015
@@ -326,7 +326,7 @@ public class SortingLeafReader extends F
}
}
- static class SortingDocsEnum extends FilterDocsEnum {
+ static class SortingDocsEnum extends FilterPostingsEnum {
private static final class DocFreqSorter extends TimSorter {
@@ -489,7 +489,7 @@ public class SortingLeafReader extends F
}
}
- static class SortingPostingsEnum extends FilterDocsEnum {
+ static class SortingPostingsEnum extends FilterPostingsEnum {
/**
* A {@link TimSorter} which sorts two parallel arrays of doc IDs and
Modified: lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java?rev=1670480&r1=1670479&r2=1670480&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java (original)
+++ lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java Tue Mar 31 21:08:35 2015
@@ -281,7 +281,7 @@ public class AssertingLeafReader extends
static enum DocsEnumState { START, ITERATING, FINISHED };
/** Wraps a docsenum with additional checks */
- public static class AssertingPostingsEnum extends FilterDocsEnum {
+ public static class AssertingPostingsEnum extends FilterPostingsEnum {
private final Thread creationThread = Thread.currentThread();
private DocsEnumState state = DocsEnumState.START;
int positionCount = 0;