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 2012/01/30 11:46:38 UTC
svn commit: r1237596 [2/3] - in /lucene/dev/branches/lucene2858:
lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/memory/src/java/org/apache/l...
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Weight.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Weight.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Weight.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Weight.java Mon Jan 30 10:46:30 2012
@@ -19,9 +19,9 @@ package org.apache.lucene.search;
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.search.similarities.SimilarityProvider;
import org.apache.lucene.util.Bits;
@@ -38,7 +38,7 @@ import org.apache.lucene.util.Bits;
* {@link AtomicReaderContext} ({@link #scorer(IndexReader.AtomicReaderContext,
* boolean, boolean, Bits)})
* callers must maintain the relationship between the searcher's top-level
- * {@link ReaderContext} and the context used to create a {@link Scorer}.
+ * {@link IndexReaderContext} and the context used to create a {@link Scorer}.
* <p>
* A <code>Weight</code> is used in the following way:
* <ol>
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.payload
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.ComplexExplanation;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.Scorer;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java Mon Jan 30 10:46:30 2012
@@ -26,9 +26,9 @@ import java.util.List;
import java.util.Map;
import java.util.TreeSet;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
@@ -55,7 +55,7 @@ import org.apache.lucene.util.TermContex
*
*/
public class PayloadSpanUtil {
- private ReaderContext context;
+ private IndexReaderContext context;
/**
* @param context
@@ -63,7 +63,7 @@ public class PayloadSpanUtil {
*
* @see IndexReader#getTopReaderContext()
*/
- public PayloadSpanUtil(ReaderContext context) {
+ public PayloadSpanUtil(IndexReaderContext context) {
this.context = context;
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.payload
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java Mon Jan 30 10:46:30 2012
@@ -19,9 +19,9 @@ package org.apache.lucene.search.similar
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java Mon Jan 30 10:46:30 2012
@@ -19,8 +19,8 @@ package org.apache.lucene.search.similar
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java Mon Jan 30 10:46:30 2012
@@ -21,9 +21,9 @@ package org.apache.lucene.search.similar
import java.io.IOException;
import org.apache.lucene.document.DocValuesField; // javadoc
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader; // javadoc
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.index.Terms; // javadoc
import org.apache.lucene.search.BooleanQuery;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java Mon Jan 30 10:46:30 2012
@@ -19,9 +19,9 @@ package org.apache.lucene.search.similar
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java Mon Jan 30 10:46:30 2012
@@ -20,8 +20,8 @@ package org.apache.lucene.search.similar
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java Mon Jan 30 10:46:30 2012
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.util.Map;
import java.util.Set;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Weight;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java Mon Jan 30 10:46:30 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.TermContext;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java Mon Jan 30 10:46:30 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.PriorityQueue;
import org.apache.lucene.util.TermContext;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java Mon Jan 30 10:46:30 2012
@@ -20,8 +20,8 @@ package org.apache.lucene.search.spans;
import java.io.IOException;
import java.util.Map;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.MultiTermQuery;
import org.apache.lucene.search.Query;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java Mon Jan 30 10:46:30 2012
@@ -27,8 +27,8 @@ import java.util.Map;
import java.util.Set;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java Mon Jan 30 10:46:30 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java Mon Jan 30 10:46:30 2012
@@ -26,8 +26,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.PriorityQueue;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java Mon Jan 30 10:46:30 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.search.spans;
*/
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java Mon Jan 30 10:46:30 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search.spans;
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.DocsAndPositionsEnum;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java Mon Jan 30 10:46:30 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
import org.apache.lucene.search.similarities.Similarity;
@@ -48,7 +48,7 @@ public class SpanWeight extends Weight {
termContexts = new HashMap<Term,TermContext>();
TreeSet<Term> terms = new TreeSet<Term>();
query.extractTerms(terms);
- final ReaderContext context = searcher.getTopReaderContext();
+ final IndexReaderContext context = searcher.getTopReaderContext();
final TermStatistics termStats[] = new TermStatistics[terms.size()];
int i = 0;
for (Term term : terms) {
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/ReaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/ReaderUtil.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/ReaderUtil.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/ReaderUtil.java Mon Jan 30 10:46:30 2012
@@ -21,13 +21,13 @@ import java.util.ArrayList;
import java.util.List;
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.IndexReaderContext;
/**
* Common util methods for dealing with {@link IndexReader}s.
@@ -126,7 +126,7 @@ public final class ReaderUtil {
* <code>null</code> the given context must be an instance of
* {@link AtomicReaderContext}
*/
- public static AtomicReaderContext[] leaves(ReaderContext context) {
+ public static AtomicReaderContext[] leaves(IndexReaderContext context) {
assert context != null && context.isTopLevel : "context must be non-null & top-level";
final AtomicReaderContext[] leaves = context.leaves();
if (leaves == null) {
@@ -139,7 +139,7 @@ public final class ReaderUtil {
* Walks up the reader tree and return the given context's top level reader
* context, or in other words the reader tree's root context.
*/
- public static ReaderContext getTopLevelContext(ReaderContext context) {
+ public static IndexReaderContext getTopLevelContext(IndexReaderContext context) {
while (context.parent != null) {
context = context.parent;
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/TermContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/TermContext.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/TermContext.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/TermContext.java Mon Jan 30 10:46:30 2012
@@ -20,10 +20,10 @@ package org.apache.lucene.util;
import java.io.IOException;
import java.util.Arrays;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermState;
import org.apache.lucene.index.Terms;
@@ -39,7 +39,7 @@ import org.apache.lucene.index.TermsEnum
* @lucene.experimental
*/
public final class TermContext {
- public final ReaderContext topReaderContext; // for asserting!
+ public final IndexReaderContext topReaderContext; // for asserting!
private final TermState[] states;
private int docFreq;
private long totalTermFreq;
@@ -47,9 +47,9 @@ public final class TermContext {
//public static boolean DEBUG = BlockTreeTermsWriter.DEBUG;
/**
- * Creates an empty {@link TermContext} from a {@link ReaderContext}
+ * Creates an empty {@link TermContext} from a {@link IndexReaderContext}
*/
- public TermContext(ReaderContext context) {
+ public TermContext(IndexReaderContext context) {
assert context != null && context.isTopLevel;
topReaderContext = context;
docFreq = 0;
@@ -66,20 +66,20 @@ public final class TermContext {
* Creates a {@link TermContext} with an initial {@link TermState},
* {@link IndexReader} pair.
*/
- public TermContext(ReaderContext context, TermState state, int ord, int docFreq, long totalTermFreq) {
+ public TermContext(IndexReaderContext context, TermState state, int ord, int docFreq, long totalTermFreq) {
this(context);
register(state, ord, docFreq, totalTermFreq);
}
/**
- * Creates a {@link TermContext} from a top-level {@link ReaderContext} and the
+ * Creates a {@link TermContext} from a top-level {@link IndexReaderContext} and the
* given {@link Term}. This method will lookup the given term in all context's leaf readers
* and register each of the readers containing the term in the returned {@link TermContext}
* using the leaf reader's ordinal.
* <p>
* Note: the given context must be a top-level context.
*/
- public static TermContext build(ReaderContext context, Term term, boolean cache)
+ public static TermContext build(IndexReaderContext context, Term term, boolean cache)
throws IOException {
assert context != null && context.isTopLevel;
final String field = term.field();
@@ -116,7 +116,7 @@ public final class TermContext {
/**
* Registers and associates a {@link TermState} with an leaf ordinal. The leaf ordinal
- * should be derived from a {@link ReaderContext}'s leaf ord.
+ * should be derived from a {@link IndexReaderContext}'s leaf ord.
*/
public void register(TermState state, final int ord, final int docFreq, final long totalTermFreq) {
assert state != null : "state must not be null";
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java Mon Jan 30 10:46:30 2012
@@ -21,9 +21,9 @@ import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.util.Bits;
/**
@@ -38,7 +38,7 @@ public class AssertingIndexSearcher exte
this.random = new Random(random.nextLong());
}
- public AssertingIndexSearcher(Random random, ReaderContext context) {
+ public AssertingIndexSearcher(Random random, IndexReaderContext context) {
super(context);
this.random = new Random(random.nextLong());
}
@@ -48,7 +48,7 @@ public class AssertingIndexSearcher exte
this.random = new Random(random.nextLong());
}
- public AssertingIndexSearcher(Random random, ReaderContext context, ExecutorService ex) {
+ public AssertingIndexSearcher(Random random, IndexReaderContext context, ExecutorService ex) {
super(context, ex);
this.random = new Random(random.nextLong());
}
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java Mon Jan 30 10:46:30 2012
@@ -25,8 +25,8 @@ import java.util.Random;
import junit.framework.Assert;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java Mon Jan 30 10:46:30 2012
@@ -25,9 +25,9 @@ import junit.framework.Assert;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MultiReader;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java Mon Jan 30 10:46:30 2012
@@ -25,8 +25,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
@@ -66,7 +64,7 @@ public class TestDocsAndPositions extend
int num = atLeast(13);
for (int i = 0; i < num; i++) {
BytesRef bytes = new BytesRef("1");
- ReaderContext topReaderContext = reader.getTopReaderContext();
+ IndexReaderContext topReaderContext = reader.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
for (AtomicReaderContext atomicReaderContext : leaves) {
DocsAndPositionsEnum docsAndPosEnum = getDocsAndPositions(
@@ -142,7 +140,7 @@ public class TestDocsAndPositions extend
int num = atLeast(13);
for (int i = 0; i < num; i++) {
BytesRef bytes = new BytesRef("" + term);
- ReaderContext topReaderContext = reader.getTopReaderContext();
+ IndexReaderContext topReaderContext = reader.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
for (AtomicReaderContext atomicReaderContext : leaves) {
DocsAndPositionsEnum docsAndPosEnum = getDocsAndPositions(
@@ -218,7 +216,7 @@ public class TestDocsAndPositions extend
int num = atLeast(13);
for (int i = 0; i < num; i++) {
BytesRef bytes = new BytesRef("" + term);
- ReaderContext topReaderContext = reader.getTopReaderContext();
+ IndexReaderContext topReaderContext = reader.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
for (AtomicReaderContext context : leaves) {
int maxDoc = context.reader().maxDoc();
@@ -297,7 +295,7 @@ public class TestDocsAndPositions extend
for (int i = 0; i < num; i++) {
BytesRef bytes = new BytesRef("even");
- ReaderContext topReaderContext = reader.getTopReaderContext();
+ IndexReaderContext topReaderContext = reader.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
for (AtomicReaderContext atomicReaderContext : leaves) {
DocsAndPositionsEnum docsAndPosEnum = getDocsAndPositions(
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitTf.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitTf.java Mon Jan 30 10:46:30 2012
@@ -28,7 +28,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.*;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.similarities.Similarity;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java Mon Jan 30 10:46:30 2012
@@ -28,8 +28,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.DocValuesField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.IndexReader.ReaderContext;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.DocValues.Source;
import org.apache.lucene.index.DocValues.Type;
import org.apache.lucene.store.Directory;
@@ -120,7 +118,7 @@ public class TestTypePromotion extends L
throws CorruptIndexException, IOException {
DirectoryReader reader = DirectoryReader.open(dir);
assertEquals(1, reader.getSequentialSubReaders().length);
- ReaderContext topReaderContext = reader.getTopReaderContext();
+ IndexReaderContext topReaderContext = reader.getTopReaderContext();
AtomicReaderContext[] children = topReaderContext.leaves();
assertEquals(1, children.length);
DocValues docValues = children[0].reader().docValues("promote");
@@ -335,7 +333,7 @@ public class TestTypePromotion extends L
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
assertEquals(1, reader.getSequentialSubReaders().length);
- ReaderContext topReaderContext = reader.getTopReaderContext();
+ IndexReaderContext topReaderContext = reader.getTopReaderContext();
AtomicReaderContext[] children = topReaderContext.leaves();
DocValues docValues = children[0].reader().docValues("promote");
assertNotNull(docValues);
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java Mon Jan 30 10:46:30 2012
@@ -20,8 +20,8 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Comparator;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java Mon Jan 30 10:46:30 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.SimilarityProvider;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MockFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MockFilter.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MockFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MockFilter.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.util.DocIdBitSet;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java Mon Jan 30 10:46:30 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/SingleDocTestFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/SingleDocTestFilter.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/SingleDocTestFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/SingleDocTestFilter.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.FixedBitSet;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java Mon Jan 30 10:46:30 2012
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.util.LuceneTestCase;
import java.io.IOException;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Mon Jan 30 10:46:30 2012
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java Mon Jan 30 10:46:30 2012
@@ -19,8 +19,8 @@ package org.apache.lucene.search;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Mon Jan 30 10:46:30 2012
@@ -22,8 +22,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.FieldInvertState;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocBoost.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocBoost.java Mon Jan 30 10:46:30 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.*;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java Mon Jan 30 10:46:30 2012
@@ -26,8 +26,8 @@ import junit.framework.Assert;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java Mon Jan 30 10:46:30 2012
@@ -24,10 +24,10 @@ import org.apache.lucene.document.DocVal
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues.Source;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Norm;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java Mon Jan 30 10:46:30 2012
@@ -21,7 +21,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
import org.apache.lucene.store.*;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java Mon Jan 30 10:46:30 2012
@@ -22,7 +22,7 @@ import java.util.BitSet;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java Mon Jan 30 10:46:30 2012
@@ -23,8 +23,8 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Mon Jan 30 10:46:30 2012
@@ -22,8 +22,8 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Mon Jan 30 10:46:30 2012
@@ -21,7 +21,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.NumericField;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Mon Jan 30 10:46:30 2012
@@ -21,7 +21,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.NumericField;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java Mon Jan 30 10:46:30 2012
@@ -19,9 +19,9 @@ package org.apache.lucene.search;
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java Mon Jan 30 10:46:30 2012
@@ -7,8 +7,8 @@ import org.apache.lucene.util.LuceneTest
import java.util.BitSet;
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSimilarity.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSimilarity.java Mon Jan 30 10:46:30 2012
@@ -21,9 +21,9 @@ import org.apache.lucene.util.LuceneTest
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Mon Jan 30 10:46:30 2012
@@ -26,8 +26,8 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSort.java Mon Jan 30 10:46:30 2012
@@ -32,8 +32,8 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.DocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexableField;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java Mon Jan 30 10:46:30 2012
@@ -23,7 +23,6 @@ import java.util.*;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.*;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.Scorer.ChildScorer;
import org.apache.lucene.store.*;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java Mon Jan 30 10:46:30 2012
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java Mon Jan 30 10:46:30 2012
@@ -23,8 +23,8 @@ import java.util.BitSet;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.TimeLimitingCollector.TimeExceededException;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java Mon Jan 30 10:46:30 2012
@@ -20,8 +20,8 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java Mon Jan 30 10:46:30 2012
@@ -25,10 +25,11 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.NumericField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.CompositeReader;
+import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.CompositeReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -38,11 +39,11 @@ import org.apache.lucene.util._TestUtil;
public class TestTopDocsMerge extends LuceneTestCase {
private static class ShardSearcher extends IndexSearcher {
- private final AtomicReader.AtomicReaderContext[] ctx;
+ private final AtomicReaderContext[] ctx;
- public ShardSearcher(AtomicReader.AtomicReaderContext ctx, CompositeReader.CompositeReaderContext parent) {
+ public ShardSearcher(AtomicReaderContext ctx, CompositeReaderContext parent) {
super(parent);
- this.ctx = new AtomicReader.AtomicReaderContext[] {ctx};
+ this.ctx = new AtomicReaderContext[] {ctx};
}
public void search(Weight weight, Collector collector) throws IOException {
@@ -118,18 +119,18 @@ public class TestTopDocsMerge extends Lu
// NOTE: sometimes reader has just one segment, which is
// important to test
final IndexSearcher searcher = newSearcher(reader);
- final IndexReader.ReaderContext ctx = searcher.getTopReaderContext();
+ final IndexReaderContext ctx = searcher.getTopReaderContext();
final ShardSearcher[] subSearchers;
final int[] docStarts;
- if (ctx instanceof AtomicReader.AtomicReaderContext) {
+ if (ctx instanceof AtomicReaderContext) {
subSearchers = new ShardSearcher[1];
docStarts = new int[1];
- subSearchers[0] = new ShardSearcher((AtomicReader.AtomicReaderContext) ctx, null);
+ subSearchers[0] = new ShardSearcher((AtomicReaderContext) ctx, null);
docStarts[0] = 0;
} else {
- final CompositeReader.CompositeReaderContext compCTX = (CompositeReader.CompositeReaderContext) ctx;
+ final CompositeReaderContext compCTX = (CompositeReaderContext) ctx;
subSearchers = new ShardSearcher[compCTX.leaves().length];
docStarts = new int[compCTX.leaves().length];
int docBase = 0;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java Mon Jan 30 10:46:30 2012
@@ -27,7 +27,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java Mon Jan 30 10:46:30 2012
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Map;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java Mon Jan 30 10:46:30 2012
@@ -24,10 +24,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.TreeSet;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocsEnum;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.util.TermContext;
@@ -53,7 +53,7 @@ public class MultiSpansWrapper extends S
}
- public static Spans wrap(ReaderContext topLevelReaderContext, SpanQuery query) throws IOException {
+ public static Spans wrap(IndexReaderContext topLevelReaderContext, SpanQuery query) throws IOException {
Map<Term,TermContext> termContexts = new HashMap<Term,TermContext>();
TreeSet<Term> terms = new TreeSet<Term>();
query.extractTerms(terms);
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Mon Jan 30 10:46:30 2012
@@ -20,10 +20,10 @@ package org.apache.lucene.search.spans;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.CheckHits;
import org.apache.lucene.search.Explanation;
@@ -166,7 +166,7 @@ public class TestNearSpansOrdered extend
public void testSpanNearScorerSkipTo1() throws Exception {
SpanNearQuery q = makeQuery();
Weight w = searcher.createNormalizedWeight(q);
- ReaderContext topReaderContext = searcher.getTopReaderContext();
+ IndexReaderContext topReaderContext = searcher.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
Scorer s = w.scorer(leaves[0], true, false, leaves[0].reader().getLiveDocs());
assertEquals(1, s.advance(1));
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Mon Jan 30 10:46:30 2012
@@ -29,12 +29,12 @@ import org.apache.lucene.search.similari
import org.apache.lucene.search.similarities.SimilarityProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
@@ -405,7 +405,7 @@ public class TestSpans extends LuceneTes
public void testSpanScorerZeroSloppyFreq() throws Exception {
boolean ordered = true;
int slop = 1;
- ReaderContext topReaderContext = searcher.getTopReaderContext();
+ IndexReaderContext topReaderContext = searcher.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
int subIndex = ReaderUtil.subIndex(11, leaves);
for (int i = 0; i < leaves.length; i++) {
Modified: lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java Mon Jan 30 10:46:30 2012
@@ -3,8 +3,8 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
import java.util.List;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
Modified: lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java Mon Jan 30 10:46:30 2012
@@ -2,8 +2,8 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.groupin
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.*;
import java.io.IOException;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractSecondPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractSecondPassGroupingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractSecondPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractSecondPassGroupingCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.groupin
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.*;
import java.io.IOException;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java Mon Jan 30 10:46:30 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search.groupin
import java.io.IOException;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter; // javadocs
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.DocIdSetIterator;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.groupin
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocValues.Type; // javadocs
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.groupin
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocValues.Type; // javadocs
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.groupin
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocValues.Type; // javadocs
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVSecondPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVSecondPassGroupingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVSecondPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVSecondPassGroupingCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.groupin
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocValues.Type; // javadocs
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.groupin
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.groupin
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.groupin
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;