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 00:51:01 UTC
svn commit: r1237508 [4/4] - 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/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Sun Jan 29 23:50:54 2012
@@ -19,9 +19,9 @@ package org.apache.lucene.search.groupin
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.*;
-import org.apache.lucene.index.AtomicIndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
-import org.apache.lucene.index.CompositeIndexReader;
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.IndexReader;
@@ -626,7 +626,7 @@ public class TestGrouping extends Lucene
public final int[] docStarts;
public ShardState(IndexSearcher s) {
- List<AtomicIndexReader> subReaders = new ArrayList<AtomicIndexReader>();
+ List<AtomicReader> subReaders = new ArrayList<AtomicReader>();
ReaderUtil.gatherSubReaders(subReaders, s.getIndexReader());
subSearchers = new ShardSearcher[subReaders.size()];
final IndexReader.ReaderContext ctx = s.getTopReaderContext();
@@ -634,7 +634,7 @@ public class TestGrouping extends Lucene
assert subSearchers.length == 1;
subSearchers[0] = new ShardSearcher((AtomicReaderContext) ctx, ctx);
} else {
- final CompositeIndexReader.CompositeReaderContext compCTX = (CompositeIndexReader.CompositeReaderContext) ctx;
+ final CompositeReader.CompositeReaderContext compCTX = (CompositeReader.CompositeReaderContext) ctx;
for(int searcherIDX=0;searcherIDX<subSearchers.length;searcherIDX++) {
subSearchers[searcherIDX] = new ShardSearcher(compCTX.leaves()[searcherIDX], compCTX);
}
Modified: lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.join;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.DocTermOrds;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.Collector;
Modified: lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java Sun Jan 29 23:50:54 2012
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Set;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter; // javadocs
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java Sun Jan 29 23:50:54 2012
@@ -24,7 +24,7 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Queue;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter; // javadocs
import org.apache.lucene.search.Collector;
Modified: lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Sun Jan 29 23:50:54 2012
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Set;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter; // javadocs
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Sun Jan 29 23:50:54 2012
@@ -28,7 +28,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LogDocMergePolicy;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Sun Jan 29 23:50:54 2012
@@ -23,7 +23,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/BooleanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/BooleanFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/BooleanFilter.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/BooleanFilter.java Sun Jan 29 23:50:54 2012
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
-import org.apache.lucene.index.AtomicIndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.BitsFilteredDocIdSet;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.DocIdSet;
@@ -52,7 +52,7 @@ public class BooleanFilter extends Filte
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
FixedBitSet res = null;
- final AtomicIndexReader reader = context.reader();
+ final AtomicReader reader = context.reader();
boolean hasShouldClauses = false;
for (final FilterClause fc : clauses) {
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/ChainedFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/ChainedFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/ChainedFilter.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/ChainedFilter.java Sun Jan 29 23:50:54 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.queries;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.BitsFilteredDocIdSet;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
@@ -129,7 +129,7 @@ public class ChainedFilter extends Filte
private OpenBitSetDISI initialResult(AtomicReaderContext context, int logic, int[] index)
throws IOException {
- AtomicIndexReader reader = context.reader();
+ AtomicReader reader = context.reader();
OpenBitSetDISI result;
/**
* First AND operation takes place against a completely false
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader; // for javadocs
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.FieldCache; // for javadocs
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java Sun Jan 29 23:50:54 2012
@@ -22,7 +22,7 @@ import java.util.Set;
import java.util.Arrays;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.ComplexExplanation;
import org.apache.lucene.search.Explanation;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/TermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/TermsFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/TermsFilter.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/TermsFilter.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.queries;
*/
import org.apache.lucene.index.*;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
import org.apache.lucene.util.Bits;
@@ -55,7 +55,7 @@ public class TermsFilter extends Filter
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
- AtomicIndexReader reader = context.reader();
+ AtomicReader reader = context.reader();
FixedBitSet result = new FixedBitSet(reader.maxDoc());
Fields fields = reader.fields();
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
import org.apache.lucene.search.*;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.ToStringUtils;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.queries.functi
*/
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.*;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.queries.functi
*/
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.FieldComparatorSource;
import org.apache.lucene.search.Scorer;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java Sun Jan 29 23:50:54 2012
@@ -22,7 +22,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.ValueSourceScorer;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.UnicodeUtil;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.search.FieldCache;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
import org.apache.lucene.queries.function.ValueSource; //javadoc
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java Sun Jan 29 23:50:54 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSourceScorer;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.FieldCache;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.similarities.Similarity;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.Explanation;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSourceScorer;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java Sun Jan 29 23:50:54 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.Map;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.FieldCache.DocTerms;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java Sun Jan 29 23:50:54 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.StrDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSourceScorer;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java Sun Jan 29 23:50:54 2012
@@ -16,7 +16,7 @@
*/
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java Sun Jan 29 23:50:54 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java Sun Jan 29 23:50:54 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java Sun Jan 29 23:50:54 2012
@@ -16,7 +16,7 @@
*/
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.util.ReaderUtil;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java Sun Jan 29 23:50:54 2012
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.lucene.index.DocValues.Source;
import org.apache.lucene.index.DocValues.Type;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java Sun Jan 29 23:50:54 2012
@@ -17,10 +17,10 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader;
-import org.apache.lucene.index.CompositeIndexReader;
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -69,9 +69,9 @@ public class OrdFieldSource extends Valu
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final int off = readerContext.docBase;
final IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader();
- final AtomicIndexReader r = topReader instanceof CompositeIndexReader
- ? new SlowCompositeReaderWrapper((CompositeIndexReader)topReader)
- : (AtomicIndexReader) topReader;
+ final AtomicReader r = topReader instanceof CompositeReader
+ ? new SlowCompositeReaderWrapper((CompositeReader)topReader)
+ : (AtomicReader) topReader;
final FieldCache.DocTermsIndex sindex = FieldCache.DEFAULT.getTermsIndex(r, field);
return new IntDocValues(this) {
protected String toTerm(String readableValue) {
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java Sun Jan 29 23:50:54 2012
@@ -17,10 +17,10 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader;
-import org.apache.lucene.index.CompositeIndexReader;
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -68,9 +68,9 @@ public class ReverseOrdFieldSource exten
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader();
- final AtomicIndexReader r = topReader instanceof CompositeIndexReader
- ? new SlowCompositeReaderWrapper((CompositeIndexReader)topReader)
- : (AtomicIndexReader) topReader;
+ final AtomicReader r = topReader instanceof CompositeReader
+ ? new SlowCompositeReaderWrapper((CompositeReader)topReader)
+ : (AtomicReader) topReader;
final int off = readerContext.docBase;
final FieldCache.DocTermsIndex sindex = FieldCache.DEFAULT.getTermsIndex(r, field);
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.search.FieldCache;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.Terms;
import org.apache.lucene.queries.function.FunctionValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.queries.functi
*/
import org.apache.lucene.index.*;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.DocIdSetIterator;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.DocIdSetIterator;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.LongDocValues;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java Sun Jan 29 23:50:54 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java Sun Jan 29 23:50:54 2012
@@ -21,8 +21,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicIndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
@@ -42,7 +42,7 @@ import java.io.IOException;
public class BooleanFilterTest extends LuceneTestCase {
private Directory directory;
- private AtomicIndexReader reader;
+ private AtomicReader reader;
@Override
public void setUp() throws Exception {
Modified: lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java Sun Jan 29 23:50:54 2012
@@ -22,7 +22,7 @@ import java.util.HashSet;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
Modified: lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java Sun Jan 29 23:50:54 2012
@@ -28,7 +28,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java (original)
+++ lucene/dev/branches/lucene2858/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.xm
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.NumericRangeFilter;
Modified: lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java (original)
+++ lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queryparser.su
import java.io.IOException;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
Modified: lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (original)
+++ lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java Sun Jan 29 23:50:54 2012
@@ -24,7 +24,7 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.NumericField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java (original)
+++ lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java Sun Jan 29 23:50:54 2012
@@ -17,9 +17,9 @@ package org.apache.lucene.queryparser.xm
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.search.Filter;
@@ -64,7 +64,7 @@ public class TestNumericRangeFilterBuild
IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, null));
writer.commit();
try {
- AtomicIndexReader reader = new SlowCompositeReaderWrapper(IndexReader.open(ramDir));
+ AtomicReader reader = new SlowCompositeReaderWrapper(IndexReader.open(ramDir));
try {
assertNull(filter.getDocIdSet((AtomicReaderContext) reader.getTopReaderContext(), reader.getLiveDocs()));
}
Modified: lucene/dev/branches/lucene2858/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (original)
+++ lucene/dev/branches/lucene2858/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java Sun Jan 29 23:50:54 2012
@@ -28,7 +28,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -499,7 +499,7 @@ public class SpellChecker implements jav
if (reader.maxDoc() > 0) {
new ReaderUtil.Gather(reader) {
@Override
- protected void add(int base, AtomicIndexReader r) throws IOException {
+ protected void add(int base, AtomicReader r) throws IOException {
Terms terms = r.terms(F_WORD);
if (terms != null)
termsEnums.add(terms.iterator(null));