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 [3/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/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.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/term/TermAllGroupHeadsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.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.search.*;
import org.apache.lucene.search.grouping.AbstractAllGroupHeadsCollector;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.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.search.FieldCache;
import org.apache.lucene.search.grouping.AbstractAllGroupsCollector;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.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.FieldCache;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.grouping.AbstractFirstPassGroupingCollector;
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermSecondPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermSecondPassGroupingCollector.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermSecondPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermSecondPassGroupingCollector.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.FieldCache;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.grouping.AbstractSecondPassGroupingCollector;
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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -20,12 +20,12 @@ package org.apache.lucene.search.groupin
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.*;
import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
-import org.apache.lucene.index.CompositeReader;
+import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.CompositeReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.DocValues.Type;
@@ -629,12 +629,12 @@ public class TestGrouping extends Lucene
List<AtomicReader> subReaders = new ArrayList<AtomicReader>();
ReaderUtil.gatherSubReaders(subReaders, s.getIndexReader());
subSearchers = new ShardSearcher[subReaders.size()];
- final IndexReader.ReaderContext ctx = s.getTopReaderContext();
+ final IndexReaderContext ctx = s.getTopReaderContext();
if (ctx instanceof AtomicReaderContext) {
assert subSearchers.length == 1;
subSearchers[0] = new ShardSearcher((AtomicReaderContext) ctx, ctx);
} else {
- final CompositeReader.CompositeReaderContext compCTX = (CompositeReader.CompositeReaderContext) ctx;
+ final CompositeReaderContext compCTX = (CompositeReaderContext) ctx;
for(int searcherIDX=0;searcherIDX<subSearchers.length;searcherIDX++) {
subSearchers[searcherIDX] = new ShardSearcher(compCTX.leaves()[searcherIDX], compCTX);
}
@@ -1315,7 +1315,7 @@ public class TestGrouping extends Lucene
private static class ShardSearcher extends IndexSearcher {
private final AtomicReaderContext[] ctx;
- public ShardSearcher(AtomicReaderContext ctx, IndexReader.ReaderContext parent) {
+ public ShardSearcher(AtomicReaderContext ctx, IndexReaderContext parent) {
super(parent);
this.ctx = new AtomicReaderContext[] {ctx};
}
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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.join;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Set;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -24,7 +24,7 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Queue;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Set;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 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.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -23,7 +23,6 @@ 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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Iterator;
import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.BitsFilteredDocIdSet;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.DocIdSet;
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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.queries;
*/
import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.BitsFilteredDocIdSet;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries;
import java.io.IOException;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.util.Set;
import java.util.Arrays;
+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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -18,7 +18,6 @@ package org.apache.lucene.queries;
*/
import org.apache.lucene.index.*;
-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;
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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -18,8 +18,8 @@ package org.apache.lucene.queries.functi
*/
import org.apache.lucene.search.*;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.queries.functi
* 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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.queries.functi
* 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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -21,8 +21,8 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.ValueSourceScorer;
import org.apache.lucene.search.FieldCache;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -18,7 +18,6 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.*;
-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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,8 +17,8 @@
package org.apache.lucene.queries.function.valuesource;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -20,8 +20,8 @@ package org.apache.lucene.queries.functi
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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -16,7 +16,7 @@
*/
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,8 +17,8 @@
package org.apache.lucene.queries.function.valuesource;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
-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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -16,7 +16,7 @@
*/
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -19,9 +19,9 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues.Source;
import org.apache.lucene.index.DocValues.Type;
-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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -18,9 +18,9 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.IndexReader;
-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;
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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -18,9 +18,9 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.IndexReader;
-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;
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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -18,7 +18,6 @@ package org.apache.lucene.queries.functi
*/
import org.apache.lucene.index.*;
-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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -18,7 +18,6 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.*;
-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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -22,7 +22,7 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -21,8 +21,8 @@ import java.util.HashSet;
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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -28,7 +28,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.xm
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -19,8 +19,8 @@ package org.apache.lucene.queryparser.su
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.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 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.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.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=1237596&r1=1237595&r2=1237596&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 Mon Jan 30 10:46:30 2012
@@ -18,8 +18,8 @@ package org.apache.lucene.queryparser.xm
*/
import org.apache.lucene.index.AtomicReader;
+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.SlowCompositeReaderWrapper;
import org.apache.lucene.search.Filter;
Modified: lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Mon Jan 30 10:46:30 2012
@@ -20,7 +20,7 @@ package org.apache.solr.handler.componen
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.*;
@@ -582,7 +582,7 @@ public class QueryComponent extends Sear
SortField[] sortFields = sort==null ? new SortField[]{SortField.FIELD_SCORE} : sort.getSort();
NamedList<List> sortVals = new NamedList<List>(); // order is important for the sort fields
Field field = new StringField("dummy", ""); // a dummy Field
- ReaderContext topReaderContext = searcher.getTopReaderContext();
+ IndexReaderContext topReaderContext = searcher.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
AtomicReaderContext currentLeaf = null;
if (leaves.length==1) {
Modified: lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java Mon Jan 30 10:46:30 2012
@@ -30,9 +30,9 @@ import java.util.WeakHashMap;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
@@ -78,7 +78,7 @@ public class FileFloatSource extends Val
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final int off = readerContext.docBase;
- ReaderContext topLevelContext = ReaderUtil.getTopLevelContext(readerContext);
+ IndexReaderContext topLevelContext = ReaderUtil.getTopLevelContext(readerContext);
final float[] arr = getCachedFloats(topLevelContext.reader);
return new FloatDocValues(this) {
Modified: lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestDocSet.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestDocSet.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestDocSet.java Mon Jan 30 10:46:30 2012
@@ -26,8 +26,8 @@ import org.apache.lucene.index.FilterInd
import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.MultiReader;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter;
@@ -418,7 +418,7 @@ public class TestDocSet extends LuceneTe
}
public void doFilterTest(IndexReader reader) throws IOException {
- ReaderContext topLevelContext = reader.getTopReaderContext();
+ IndexReaderContext topLevelContext = reader.getTopReaderContext();
OpenBitSet bs = getRandomSet(reader.maxDoc(), rand.nextInt(reader.maxDoc()+1));
DocSet a = new BitDocSet(bs);
DocSet b = getIntDocSet(bs);
Modified: lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java?rev=1237596&r1=1237595&r2=1237596&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java Mon Jan 30 10:46:30 2012
@@ -17,7 +17,7 @@
package org.apache.solr.search;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.util.ReaderUtil;
@@ -49,7 +49,7 @@ public class TestIndexSearcher extends S
ValueSource vs = sf.getType().getValueSource(sf, null);
Map context = ValueSource.newContext(sqr.getSearcher());
vs.createWeight(context, sqr.getSearcher());
- ReaderContext topReaderContext = sqr.getSearcher().getTopReaderContext();
+ IndexReaderContext topReaderContext = sqr.getSearcher().getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
int idx = ReaderUtil.subIndex(doc, leaves);
AtomicReaderContext leaf = leaves[idx];
@@ -64,7 +64,7 @@ public class TestIndexSearcher extends S
assertU(commit());
SolrQueryRequest sr1 = req("q","foo");
- ReaderContext rCtx1 = sr1.getSearcher().getTopReaderContext();
+ IndexReaderContext rCtx1 = sr1.getSearcher().getTopReaderContext();
String sval1 = getStringVal(sr1, "v_s1",0);
assertEquals("string1", sval1);
@@ -74,7 +74,7 @@ public class TestIndexSearcher extends S
assertU(commit());
SolrQueryRequest sr2 = req("q","foo");
- ReaderContext rCtx2 = sr2.getSearcher().getTopReaderContext();
+ IndexReaderContext rCtx2 = sr2.getSearcher().getTopReaderContext();
// make sure the readers share the first segment
// Didn't work w/ older versions of lucene2.9 going from segment -> multi
@@ -85,7 +85,7 @@ public class TestIndexSearcher extends S
assertU(commit());
SolrQueryRequest sr3 = req("q","foo");
- ReaderContext rCtx3 = sr3.getSearcher().getTopReaderContext();
+ IndexReaderContext rCtx3 = sr3.getSearcher().getTopReaderContext();
// make sure the readers share segments
// assertEquals(r1.getLeafReaders()[0], r3.getLeafReaders()[0]);
assertEquals(ReaderUtil.leaves(rCtx2)[0].reader, ReaderUtil.leaves(rCtx3)[0].reader);
@@ -100,7 +100,7 @@ public class TestIndexSearcher extends S
assertU(commit());
SolrQueryRequest sr4 = req("q","foo");
- ReaderContext rCtx4 = sr4.getSearcher().getTopReaderContext();
+ IndexReaderContext rCtx4 = sr4.getSearcher().getTopReaderContext();
// force an index change so the registered searcher won't be the one we are testing (and
// then we should be able to test the refCount going all the way to 0
@@ -117,12 +117,12 @@ public class TestIndexSearcher extends S
SolrQueryRequest sr5 = req("q","foo");
- ReaderContext rCtx5 = sr5.getSearcher().getTopReaderContext();
+ IndexReaderContext rCtx5 = sr5.getSearcher().getTopReaderContext();
assertU(delI("1"));
assertU(commit());
SolrQueryRequest sr6 = req("q","foo");
- ReaderContext rCtx6 = sr6.getSearcher().getTopReaderContext();
+ IndexReaderContext rCtx6 = sr6.getSearcher().getTopReaderContext();
assertEquals(1, ReaderUtil.leaves(rCtx6)[0].reader.numDocs()); // only a single doc left in the first segment
assertTrue( !ReaderUtil.leaves(rCtx5)[0].reader.equals(ReaderUtil.leaves(rCtx6)[0].reader) ); // readers now different