You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/01/29 17:00:34 UTC
svn commit: r1237320 - in
/lucene/dev/branches/lucene2858/modules/queries/src:
java/org/apache/lucene/queries/ java/org/apache/lucene/queries/function/
java/org/apache/lucene/queries/function/docvalues/
java/org/apache/lucene/queries/function/valuesour...
Author: rmuir
Date: Sun Jan 29 16:00:32 2012
New Revision: 1237320
URL: http://svn.apache.org/viewvc?rev=1237320&view=rev
Log:
LUCENE-2858: fix queries module
Modified:
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/BooleanFilter.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/ChainedFilter.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicIndexReader.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 IndexReader reader = context.reader;
+ final AtomicIndexReader 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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.queries;
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicIndexReader.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 {
- IndexReader reader = context.reader;
+ AtomicIndexReader 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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries;
import java.io.IOException;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -22,7 +22,7 @@ import java.util.Set;
import java.util.Arrays;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.queries;
*/
import org.apache.lucene.index.*;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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 {
- IndexReader reader = context.reader;
+ AtomicIndexReader 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=1237320&r1=1237319&r2=1237320&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 16:00:32 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.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.queries.functi
*/
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.search.*;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.util.Bits;
@@ -96,7 +96,7 @@ public class FunctionQuery extends Query
@Override
public Explanation explain(AtomicReaderContext context, int doc) throws IOException {
- return ((AllScorer)scorer(context, true, true, context.reader.getLiveDocs())).explain(doc);
+ return ((AllScorer)scorer(context, true, true, context.reader().getLiveDocs())).explain(doc);
}
}
@@ -113,7 +113,7 @@ public class FunctionQuery extends Query
super(w);
this.weight = w;
this.qWeight = qWeight;
- this.reader = context.reader;
+ this.reader = context.reader();
this.maxDoc = reader.maxDoc();
this.liveDocs = acceptDocs;
vals = func.getValues(weight.context, context);
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.queries.functi
*/
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 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.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.UnicodeUtil;
@@ -43,7 +43,7 @@ public abstract class StringIndexDocValu
public StringIndexDocValues(ValueSource vs, AtomicReaderContext context, String field) throws IOException {
try {
- termsIndex = FieldCache.DEFAULT.getTermsIndex(context.reader, field);
+ termsIndex = FieldCache.DEFAULT.getTermsIndex(context.reader(), field);
} catch (RuntimeException e) {
throw new StringIndexException(field, e);
}
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.search.FieldCache;
@@ -51,7 +51,7 @@ public class ByteFieldSource extends Fie
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final byte[] arr = cache.getBytes(readerContext.reader, field, parser, false);
+ final byte[] arr = cache.getBytes(readerContext.reader(), field, parser, false);
return new FunctionValues() {
@Override
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
import org.apache.lucene.queries.function.ValueSource; //javadoc
@@ -35,7 +35,7 @@ public class BytesRefFieldSource extends
}
@Override
- public FunctionValues getValues(Map context, IndexReader.AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
return new StringIndexDocValues(this, readerContext, field) {
@Override
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSourceScorer;
@@ -57,8 +57,8 @@ public class DoubleFieldSource extends F
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final double[] arr = cache.getDoubles(readerContext.reader, field, parser, true);
- final Bits valid = cache.getDocsWithField(readerContext.reader, field);
+ final double[] arr = cache.getDoubles(readerContext.reader(), field, parser, true);
+ final Bits valid = cache.getDocsWithField(readerContext.reader(), field);
return new DoubleDocValues(this) {
@Override
public double doubleVal(int doc) {
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.FieldCache;
@@ -55,8 +55,8 @@ public class FloatFieldSource extends Fi
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final float[] arr = cache.getFloats(readerContext.reader, field, parser, true);
- final Bits valid = cache.getDocsWithField(readerContext.reader, field);
+ final float[] arr = cache.getFloats(readerContext.reader(), field, parser, true);
+ final Bits valid = cache.getDocsWithField(readerContext.reader(), field);
return new FloatDocValues(this) {
@Override
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -18,7 +18,7 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -18,7 +18,7 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSourceScorer;
@@ -57,8 +57,8 @@ public class IntFieldSource extends Fiel
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final int[] arr = cache.getInts(readerContext.reader, field, parser, true);
- final Bits valid = cache.getDocsWithField(readerContext.reader, field);
+ final int[] arr = cache.getInts(readerContext.reader(), field, parser, true);
+ final Bits valid = cache.getDocsWithField(readerContext.reader(), field);
return new IntDocValues(this) {
final MutableValueInt val = new MutableValueInt();
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.Map;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.FieldCache.DocTerms;
@@ -52,8 +52,8 @@ public class JoinDocFreqValueSource exte
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException
{
- final DocTerms terms = cache.getTerms(readerContext.reader, field, true );
- final IndexReader top = ReaderUtil.getTopLevelContext(readerContext).reader;
+ final DocTerms terms = cache.getTerms(readerContext.reader(), field, true );
+ final IndexReader top = ReaderUtil.getTopLevelContext(readerContext).reader();
return new IntDocValues(this) {
BytesRef ref = new BytesRef();
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSourceScorer;
@@ -66,8 +66,8 @@ public class LongFieldSource extends Fie
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final long[] arr = cache.getLongs(readerContext.reader, field, parser, true);
- final Bits valid = cache.getDocsWithField(readerContext.reader, field);
+ final long[] arr = cache.getLongs(readerContext.reader(), field, parser, true);
+ final Bits valid = cache.getDocsWithField(readerContext.reader(), field);
return new LongDocValues(this) {
@Override
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -16,7 +16,7 @@
*/
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -18,7 +18,7 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
@@ -57,7 +57,7 @@ public class NormValueSource extends Val
throw new UnsupportedOperationException("requires a TFIDFSimilarity (such as DefaultSimilarity)");
}
final TFIDFSimilarity similarity = (TFIDFSimilarity) sim;
- DocValues dv = readerContext.reader.normValues(field);
+ DocValues dv = readerContext.reader().normValues(field);
if (dv == null) {
return new ConstDoubleDocValues(0.0, this);
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -16,7 +16,7 @@
*/
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.util.ReaderUtil;
@@ -37,7 +37,7 @@ public class NumDocsValueSource extends
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
// Searcher has no numdocs so we must use the reader instead
- return new ConstIntDocValues(ReaderUtil.getTopLevelContext(readerContext).reader.numDocs(), this);
+ return new ConstIntDocValues(ReaderUtil.getTopLevelContext(readerContext).reader().numDocs(), this);
}
@Override
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=1237320&r1=1237319&r2=1237320&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 16:00:32 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.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -43,7 +43,7 @@ public class NumericIndexDocValueSource
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final Source source = readerContext.reader.docValues(field)
+ final Source source = readerContext.reader().docValues(field)
.getSource();
Type type = source.type();
switch (type) {
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,9 +17,11 @@
package org.apache.lucene.queries.function.valuesource;
+import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.CompositeIndexReader;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.index.SlowMultiReaderWrapper;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
@@ -66,8 +68,11 @@ public class OrdFieldSource extends Valu
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final int off = readerContext.docBase;
- final IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader;
- final FieldCache.DocTermsIndex sindex = FieldCache.DEFAULT.getTermsIndex(new SlowMultiReaderWrapper(topReader), field);
+ final IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader();
+ final AtomicIndexReader r = topReader instanceof CompositeIndexReader
+ ? new SlowCompositeReaderWrapper((CompositeIndexReader)topReader)
+ : (AtomicIndexReader) topReader;
+ final FieldCache.DocTermsIndex sindex = FieldCache.DEFAULT.getTermsIndex(r, field);
return new IntDocValues(this) {
protected String toTerm(String readableValue) {
return 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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
@@ -96,7 +96,7 @@ class QueryDocValues extends FloatDocVal
super(vs);
this.readerContext = readerContext;
- this.acceptDocs = readerContext.reader.getLiveDocs();
+ this.acceptDocs = readerContext.reader().getLiveDocs();
this.defVal = vs.defVal;
this.q = vs.q;
this.fcontext = fcontext;
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,9 +17,11 @@
package org.apache.lucene.queries.function.valuesource;
+import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.CompositeIndexReader;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.index.SlowMultiReaderWrapper;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
@@ -65,10 +67,13 @@ public class ReverseOrdFieldSource exten
// TODO: this is trappy? perhaps this query instead should make you pass a slow reader yourself?
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader;
+ final IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader();
+ final AtomicIndexReader r = topReader instanceof CompositeIndexReader
+ ? new SlowCompositeReaderWrapper((CompositeIndexReader)topReader)
+ : (AtomicIndexReader) topReader;
final int off = readerContext.docBase;
- final FieldCache.DocTermsIndex sindex = FieldCache.DEFAULT.getTermsIndex(new SlowMultiReaderWrapper(topReader), field);
+ final FieldCache.DocTermsIndex sindex = FieldCache.DEFAULT.getTermsIndex(r, field);
final int end = sindex.numOrd();
return new IntDocValues(this) {
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
@@ -66,7 +66,7 @@ public class ScaleFloatFunction extends
float maxVal = Float.NEGATIVE_INFINITY;
for (AtomicReaderContext leaf : leaves) {
- int maxDoc = leaf.reader.maxDoc();
+ int maxDoc = leaf.reader().maxDoc();
FunctionValues vals = source.getValues(context, leaf);
for (int i=0; i<maxDoc; i++) {
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.search.FieldCache;
@@ -48,7 +48,7 @@ public class ShortFieldSource extends Fi
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final short[] arr = cache.getShorts(readerContext.reader, field, parser, false);
+ final short[] arr = cache.getShorts(readerContext.reader(), field, parser, false);
return new FunctionValues() {
@Override
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,8 +17,8 @@
package org.apache.lucene.queries.function.valuesource;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Terms;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -50,15 +50,15 @@ public class SumTotalTermFreqValueSource
}
@Override
- public FunctionValues getValues(Map context, IndexReader.AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
return (FunctionValues)context.get(this);
}
@Override
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
long sumTotalTermFreq = 0;
- for (IndexReader.AtomicReaderContext readerContext : searcher.getTopReaderContext().leaves()) {
- Fields fields = readerContext.reader.fields();
+ for (AtomicReaderContext readerContext : searcher.getTopReaderContext().leaves()) {
+ Fields fields = readerContext.reader().fields();
if (fields == null) continue;
Terms terms = fields.terms(indexedField);
if (terms == null) continue;
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.queries.functi
*/
import org.apache.lucene.index.*;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.DocIdSetIterator;
@@ -42,7 +42,7 @@ public class TFValueSource extends TermF
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- Fields fields = readerContext.reader.fields();
+ Fields fields = readerContext.reader().fields();
final Terms terms = fields.terms(field);
final Similarity sim = ((IndexSearcher)context.get("searcher")).getSimilarityProvider().get(field);
if (!(sim instanceof TFIDFSimilarity)) {
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -18,7 +18,7 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.DocIdSetIterator;
@@ -39,7 +39,7 @@ public class TermFreqValueSource extends
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- Fields fields = readerContext.reader.fields();
+ Fields fields = readerContext.reader().fields();
final Terms terms = fields.terms(field);
return new IntDocValues(this) {
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -17,7 +17,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.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.LongDocValues;
@@ -54,15 +54,15 @@ public class TotalTermFreqValueSource ex
}
@Override
- public FunctionValues getValues(Map context, IndexReader.AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
return (FunctionValues)context.get(this);
}
@Override
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
long totalTermFreq = 0;
- for (IndexReader.AtomicReaderContext readerContext : searcher.getTopReaderContext().leaves()) {
- totalTermFreq += readerContext.reader.totalTermFreq(indexedField, indexedBytes);
+ for (AtomicReaderContext readerContext : searcher.getTopReaderContext().leaves()) {
+ totalTermFreq += readerContext.reader().totalTermFreq(indexedField, indexedBytes);
}
final long ttf = Math.max(-1, totalTermFreq); // we may have added up -1s if not supported
context.put(this, new LongDocValues(this) {
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.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/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1237320&r1=1237319&r2=1237320&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Sun Jan 29 16:00:32 2012
@@ -25,6 +25,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@@ -34,7 +35,6 @@ import org.apache.lucene.search.similari
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.PriorityQueue;
-import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.util.UnicodeUtil;
@@ -570,7 +570,7 @@ public final class MoreLikeThis {
public Query like(int docNum) throws IOException {
if (fieldNames == null) {
// gather list of valid fields from lucene
- Collection<String> fields = ReaderUtil.getIndexedFields(ir);
+ Collection<String> fields = MultiFields.getIndexedFields(ir);
fieldNames = fields.toArray(new String[fields.size()]);
}
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -21,17 +21,16 @@ 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.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.index.SlowMultiReaderWrapper;
+import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.TermRangeFilter;
import org.apache.lucene.search.DocIdSet;
-import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.store.Directory;
@@ -43,7 +42,7 @@ import java.io.IOException;
public class BooleanFilterTest extends LuceneTestCase {
private Directory directory;
- private IndexReader reader;
+ private AtomicIndexReader reader;
@Override
public void setUp() throws Exception {
@@ -57,7 +56,7 @@ public class BooleanFilterTest extends L
addDoc(writer, "guest", "020", "20050101", "Y");
addDoc(writer, "admin", "020", "20050101", "Maybe");
addDoc(writer, "admin guest", "030", "20050101", "N");
- reader = new SlowMultiReaderWrapper(writer.getReader());
+ reader = new SlowCompositeReaderWrapper(writer.getReader());
writer.close();
}
@@ -97,7 +96,7 @@ public class BooleanFilterTest extends L
return new Filter() {
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
- return new FixedBitSet(context.reader.maxDoc());
+ return new FixedBitSet(context.reader().maxDoc());
}
};
}
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -22,10 +22,10 @@ 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.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.index.SlowMultiReaderWrapper;
+import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Filter;
import org.apache.lucene.store.Directory;
@@ -62,27 +62,26 @@ public class TermsFilterTest extends Luc
doc.add(newField(fieldName, "" + term, StringField.TYPE_STORED));
w.addDocument(doc);
}
- IndexReader reader = new SlowMultiReaderWrapper(w.getReader());
- assertTrue(reader.getTopReaderContext().isAtomic);
+ IndexReader reader = new SlowCompositeReaderWrapper(w.getReader());
+ assertTrue(reader.getTopReaderContext() instanceof AtomicReaderContext);
AtomicReaderContext context = (AtomicReaderContext) reader.getTopReaderContext();
- assertTrue(context.isAtomic);
w.close();
TermsFilter tf = new TermsFilter();
tf.addTerm(new Term(fieldName, "19"));
- FixedBitSet bits = (FixedBitSet) tf.getDocIdSet(context, context.reader.getLiveDocs());
+ FixedBitSet bits = (FixedBitSet) tf.getDocIdSet(context, context.reader().getLiveDocs());
assertEquals("Must match nothing", 0, bits.cardinality());
tf.addTerm(new Term(fieldName, "20"));
- bits = (FixedBitSet) tf.getDocIdSet(context, context.reader.getLiveDocs());
+ bits = (FixedBitSet) tf.getDocIdSet(context, context.reader().getLiveDocs());
assertEquals("Must match 1", 1, bits.cardinality());
tf.addTerm(new Term(fieldName, "10"));
- bits = (FixedBitSet) tf.getDocIdSet(context, context.reader.getLiveDocs());
+ bits = (FixedBitSet) tf.getDocIdSet(context, context.reader().getLiveDocs());
assertEquals("Must match 2", 2, bits.cardinality());
tf.addTerm(new Term(fieldName, "00"));
- bits = (FixedBitSet) tf.getDocIdSet(context, context.reader.getLiveDocs());
+ bits = (FixedBitSet) tf.getDocIdSet(context, context.reader().getLiveDocs());
assertEquals("Must match 2", 2, bits.cardinality());
reader.close();
@@ -112,8 +111,8 @@ public class TermsFilterTest extends Luc
tf.addTerm(new Term(fieldName, "content1"));
MultiReader multi = new MultiReader(reader1, reader2);
- for (IndexReader.AtomicReaderContext context : ReaderUtil.leaves(multi.getTopReaderContext())) {
- FixedBitSet bits = (FixedBitSet) tf.getDocIdSet(context, context.reader.getLiveDocs());
+ for (AtomicReaderContext context : ReaderUtil.leaves(multi.getTopReaderContext())) {
+ FixedBitSet bits = (FixedBitSet) tf.getDocIdSet(context, context.reader().getLiveDocs());
assertTrue("Must be >= 0", bits.cardinality() >= 0);
}
multi.close();
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=1237320&r1=1237319&r2=1237320&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 16:00:32 2012
@@ -28,7 +28,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
@@ -174,11 +174,11 @@ public class TestCustomScoreQuery extend
@Override
protected CustomScoreProvider getCustomScoreProvider(AtomicReaderContext context) throws IOException {
- final int[] values = FieldCache.DEFAULT.getInts(context.reader, INT_FIELD, false);
+ final int[] values = FieldCache.DEFAULT.getInts(context.reader(), INT_FIELD, false);
return new CustomScoreProvider(context) {
@Override
public float customScore(int doc, float subScore, float valSrcScore) throws IOException {
- assertTrue(doc <= context.reader.maxDoc());
+ assertTrue(doc <= context.reader().maxDoc());
return values[doc];
}
};
Modified: lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java?rev=1237320&r1=1237319&r2=1237320&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java (original)
+++ lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java Sun Jan 29 16:00:32 2012
@@ -19,11 +19,9 @@ package org.apache.lucene.queries.functi
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.valuesource.OrdFieldSource;
import org.apache.lucene.queries.function.valuesource.ReverseOrdFieldSource;
import org.apache.lucene.search.*;
-import org.apache.lucene.util.ReaderUtil;
import org.junit.BeforeClass;
import org.junit.Test;