You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/09/24 01:52:04 UTC
svn commit: r1627178 [9/12] - in /lucene/dev/trunk: lucene/
lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/
lucene/backward-codecs/src/test/org/apache/lucene/index/
lucene/classification/src/java/org/apache/lucene/classification/ luc...
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java Tue Sep 23 23:51:55 2014
@@ -20,20 +20,17 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.queries.function.FunctionValues;
-import org.apache.lucene.queries.function.ValueSourceScorer;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.mutable.MutableValue;
import org.apache.lucene.util.mutable.MutableValueInt;
/**
- * Obtains int field values from {@link AtomicReader#getNumericDocValues} and makes those
+ * Obtains int field values from {@link org.apache.lucene.index.LeafReader#getNumericDocValues} and makes those
* values available as other numeric types, casting as needed.
*/
public class IntFieldSource extends FieldCacheSource {
@@ -49,7 +46,7 @@ public class IntFieldSource extends Fiel
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final NumericDocValues arr = DocValues.getNumeric(readerContext.reader(), field);
final Bits valid = DocValues.getDocsWithField(readerContext.reader(), field);
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ 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.LeafReaderContext;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
@@ -54,7 +54,7 @@ public class JoinDocFreqValueSource exte
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException
{
final BinaryDocValues terms = DocValues.getBinary(readerContext.reader(), field);
final IndexReader top = ReaderUtil.getTopLevelContext(readerContext).reader();
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
@@ -51,7 +51,7 @@ public class LinearFloatFunction extends
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues vals = source.getValues(context, readerContext);
return new FloatDocValues(this) {
@Override
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java Tue Sep 23 23:51:55 2014
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.StrDocValues;
@@ -46,7 +46,7 @@ public class LiteralValueSource extends
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
return new StrDocValues(this) {
@Override
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java Tue Sep 23 23:51:55 2014
@@ -20,8 +20,7 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.queries.function.FunctionValues;
@@ -31,7 +30,7 @@ import org.apache.lucene.util.mutable.Mu
import org.apache.lucene.util.mutable.MutableValueLong;
/**
- * Obtains long field values from {@link AtomicReader#getNumericDocValues} and makes those
+ * Obtains long field values from {@link org.apache.lucene.index.LeafReader#getNumericDocValues} and makes those
* values available as other numeric types, casting as needed.
*/
public class LongFieldSource extends FieldCacheSource {
@@ -58,7 +57,7 @@ public class LongFieldSource extends Fie
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final NumericDocValues arr = DocValues.getNumeric(readerContext.reader(), field);
final Bits valid = DocValues.getDocsWithField(readerContext.reader(), field);
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java Tue Sep 23 23:51:55 2014
@@ -16,7 +16,7 @@
*/
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader; // javadocs
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -46,7 +46,7 @@ public class MaxDocValueSource extends V
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
IndexSearcher searcher = (IndexSearcher)context.get("searcher");
return new ConstIntDocValues(searcher.getIndexReader().maxDoc(), this);
}
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
@@ -43,7 +43,7 @@ public abstract class MultiBoolFunction
protected abstract boolean func(int doc, FunctionValues[] vals);
@Override
- public BoolDocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public BoolDocValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues[] vals = new FunctionValues[sources.size()];
int i=0;
for (ValueSource source : sources) {
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java Tue Sep 23 23:51:55 2014
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
@@ -59,7 +59,7 @@ public abstract class MultiFloatFunction
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues[] valsArr = new FunctionValues[sources.length];
for (int i=0; i<sources.length; i++) {
valsArr[i] = sources[i].getValues(context, readerContext);
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java Tue Sep 23 23:51:55 2014
@@ -16,14 +16,12 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.util.BytesRef;
import java.io.IOException;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -61,7 +59,7 @@ public abstract class MultiFunction exte
return sb.toString();
}
- public static FunctionValues[] valsArr(List<ValueSource> sources, Map fcontext, AtomicReaderContext readerContext) throws IOException {
+ public static FunctionValues[] valsArr(List<ValueSource> sources, Map fcontext, LeafReaderContext readerContext) throws IOException {
final FunctionValues[] valsArr = new FunctionValues[sources.size()];
int i=0;
for (ValueSource source : sources) {
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -56,7 +56,7 @@ public class NormValueSource extends Val
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
IndexSearcher searcher = (IndexSearcher)context.get("searcher");
final TFIDFSimilarity similarity = IDFValueSource.asTFIDF(searcher.getSimilarity(), field);
if (similarity == null) {
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java Tue Sep 23 23:51:55 2014
@@ -16,7 +16,7 @@
*/
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.queries.function.FunctionValues;
@@ -41,7 +41,7 @@ public class NumDocsValueSource extends
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
// Searcher has no numdocs so we must use the reader instead
return new ConstIntDocValues(ReaderUtil.getTopLevelContext(readerContext).reader().numDocs(), this);
}
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -51,7 +51,7 @@ public class QueryValueSource extends Va
}
@Override
- public FunctionValues getValues(Map fcontext, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map fcontext, LeafReaderContext readerContext) throws IOException {
return new QueryDocValues(this, readerContext, fcontext);
}
@@ -76,7 +76,7 @@ public class QueryValueSource extends Va
class QueryDocValues extends FloatDocValues {
- final AtomicReaderContext readerContext;
+ final LeafReaderContext readerContext;
final Bits acceptDocs;
final Weight weight;
final float defVal;
@@ -92,7 +92,7 @@ class QueryDocValues extends FloatDocVal
int lastDocRequested=Integer.MAX_VALUE;
- public QueryDocValues(QueryValueSource vs, AtomicReaderContext readerContext, Map fcontext) throws IOException {
+ public QueryDocValues(QueryValueSource vs, LeafReaderContext readerContext, Map fcontext) throws IOException {
super(vs);
this.readerContext = readerContext;
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
@@ -59,7 +59,7 @@ public class RangeMapFloatFunction exten
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues vals = source.getValues(context, readerContext);
final FunctionValues targets = target.getValues(context, readerContext);
final FunctionValues defaults = (this.defaultVal == null) ? null : defaultVal.getValues(context, readerContext);
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
@@ -61,7 +61,7 @@ public class ReciprocalFloatFunction ext
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues vals = source.getValues(context, readerContext);
return new FloatDocValues(this) {
@Override
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -60,13 +60,13 @@ public class ScaleFloatFunction extends
float maxVal;
}
- private ScaleInfo createScaleInfo(Map context, AtomicReaderContext readerContext) throws IOException {
- final List<AtomicReaderContext> leaves = ReaderUtil.getTopLevelContext(readerContext).leaves();
+ private ScaleInfo createScaleInfo(Map context, LeafReaderContext readerContext) throws IOException {
+ final List<LeafReaderContext> leaves = ReaderUtil.getTopLevelContext(readerContext).leaves();
float minVal = Float.POSITIVE_INFINITY;
float maxVal = Float.NEGATIVE_INFINITY;
- for (AtomicReaderContext leaf : leaves) {
+ for (LeafReaderContext leaf : leaves) {
int maxDoc = leaf.reader().maxDoc();
FunctionValues vals = source.getValues(context, leaf);
for (int i=0; i<maxDoc; i++) {
@@ -99,7 +99,7 @@ public class ScaleFloatFunction extends
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
ScaleInfo scaleInfo = (ScaleInfo)context.get(ScaleFloatFunction.this);
if (scaleInfo == null) {
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
@@ -45,7 +45,7 @@ public abstract class SimpleBoolFunction
protected abstract boolean func(int doc, FunctionValues vals);
@Override
- public BoolDocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public BoolDocValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues vals = source.getValues(context, readerContext);
return new BoolDocValues(this) {
@Override
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
@@ -35,7 +35,7 @@ import java.util.Map;
protected abstract float func(int doc, FunctionValues vals);
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues vals = source.getValues(context, readerContext);
return new FloatDocValues(this) {
@Override
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SortedSetFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SortedSetFieldSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SortedSetFieldSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SortedSetFieldSource.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ 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.LeafReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.index.SortedSetDocValues;
@@ -49,7 +49,7 @@ public class SortedSetFieldSource extend
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
SortedSetDocValues sortedSet = DocValues.getSortedSet(readerContext.reader(), field);
SortedDocValues view = SortedSetSelector.wrap(sortedSet, selector);
return new DocTermsIndexDocValues(this, view) {
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java Tue Sep 23 23:51:55 2014
@@ -17,14 +17,13 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.Terms;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.LongDocValues;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.util.BytesRef;
import java.io.IOException;
import java.util.Map;
@@ -53,14 +52,14 @@ public class SumTotalTermFreqValueSource
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
return (FunctionValues)context.get(this);
}
@Override
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
long sumTotalTermFreq = 0;
- for (AtomicReaderContext readerContext : searcher.getTopReaderContext().leaves()) {
+ for (LeafReaderContext readerContext : searcher.getTopReaderContext().leaves()) {
Fields fields = readerContext.reader().fields();
if (fields == null) continue;
Terms terms = fields.terms(indexedField);
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java Tue Sep 23 23:51:55 2014
@@ -46,7 +46,7 @@ public class TFValueSource extends TermF
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
Fields fields = readerContext.reader().fields();
final Terms terms = fields.terms(indexedField);
IndexSearcher searcher = (IndexSearcher)context.get("searcher");
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java Tue Sep 23 23:51:55 2014
@@ -44,7 +44,7 @@ public class TermFreqValueSource extends
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
Fields fields = readerContext.reader().fields();
final Terms terms = fields.terms(indexedField);
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.queries.function.valuesource;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -58,14 +58,14 @@ public class TotalTermFreqValueSource ex
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
return (FunctionValues)context.get(this);
}
@Override
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
long totalTermFreq = 0;
- for (AtomicReaderContext readerContext : searcher.getTopReaderContext().leaves()) {
+ for (LeafReaderContext readerContext : searcher.getTopReaderContext().leaves()) {
long val = readerContext.reader().totalTermFreq(new Term(indexedField, indexedBytes));
if (val == -1) {
totalTermFreq = -1;
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java Tue Sep 23 23:51:55 2014
@@ -16,7 +16,7 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.IndexSearcher;
@@ -53,7 +53,7 @@ public class VectorValueSource extends M
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
int size = sources.size();
// special-case x,y and lat,lon since it's so common
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java Tue Sep 23 23:51:55 2014
@@ -21,8 +21,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
@@ -42,7 +42,7 @@ import java.io.IOException;
public class BooleanFilterTest extends LuceneTestCase {
private Directory directory;
- private AtomicReader reader;
+ private LeafReader reader;
@Override
public void setUp() throws Exception {
@@ -92,7 +92,7 @@ public class BooleanFilterTest extends L
private Filter getEmptyFilter() {
return new Filter() {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return new FixedBitSet(context.reader().maxDoc());
}
};
@@ -101,7 +101,7 @@ public class BooleanFilterTest extends L
private Filter getNullDISFilter() {
return new Filter() {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return null;
}
};
@@ -110,7 +110,7 @@ public class BooleanFilterTest extends L
private Filter getNullDISIFilter() {
return new Filter() {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return DocIdSet.EMPTY;
}
};
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java Tue Sep 23 23:51:55 2014
@@ -28,7 +28,7 @@ import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -407,7 +407,7 @@ public class CommonTermsQueryTest extend
RandomIndexWriter w = new RandomIndexWriter(random(), dir, analyzer);
createRandomIndex(atLeast(50), w, random().nextLong());
DirectoryReader reader = w.getReader();
- AtomicReader wrapper = SlowCompositeReaderWrapper.wrap(reader);
+ LeafReader wrapper = SlowCompositeReaderWrapper.wrap(reader);
String field = "body";
Terms terms = wrapper.terms(field);
PriorityQueue<TermAndFreq> lowFreqQueue = new PriorityQueue<CommonTermsQueryTest.TermAndFreq>(
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java Tue Sep 23 23:51:55 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.queries;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
@@ -60,8 +60,8 @@ public class TermFilterTest extends Luce
doc.add(newStringField(fieldName, "value1", Field.Store.NO));
w.addDocument(doc);
IndexReader reader = SlowCompositeReaderWrapper.wrap(w.getReader());
- assertTrue(reader.getContext() instanceof AtomicReaderContext);
- AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
+ assertTrue(reader.getContext() instanceof LeafReaderContext);
+ LeafReaderContext context = (LeafReaderContext) reader.getContext();
w.close();
DocIdSet idSet = termFilter(fieldName, "value1").getDocIdSet(context, context.reader().getLiveDocs());
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java Tue Sep 23 23:51:55 2014
@@ -28,7 +28,7 @@ import java.util.Set;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -75,8 +75,8 @@ public class TermsFilterTest extends Luc
w.addDocument(doc);
}
IndexReader reader = SlowCompositeReaderWrapper.wrap(w.getReader());
- assertTrue(reader.getContext() instanceof AtomicReaderContext);
- AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
+ assertTrue(reader.getContext() instanceof LeafReaderContext);
+ LeafReaderContext context = (LeafReaderContext) reader.getContext();
w.close();
List<Term> terms = new ArrayList<>();
@@ -121,7 +121,7 @@ public class TermsFilterTest extends Luc
TermsFilter tf = new TermsFilter(new Term(fieldName, "content1"));
MultiReader multi = new MultiReader(reader1, reader2);
- for (AtomicReaderContext context : multi.leaves()) {
+ for (LeafReaderContext context : multi.leaves()) {
DocIdSet docIdSet = tf.getDocIdSet(context, context.reader().getLiveDocs());
if (context.reader().docFreq(new Term(fieldName, "content1")) == 0) {
assertNull(docIdSet);
@@ -160,7 +160,7 @@ public class TermsFilterTest extends Luc
- AtomicReaderContext context = reader.leaves().get(0);
+ LeafReaderContext context = reader.leaves().get(0);
TermsFilter tf = new TermsFilter(terms);
FixedBitSet bits = (FixedBitSet) tf.getDocIdSet(context, context.reader().getLiveDocs());
@@ -196,7 +196,7 @@ public class TermsFilterTest extends Luc
IndexReader reader = w.getReader();
w.close();
assertEquals(1, reader.leaves().size());
- AtomicReaderContext context = reader.leaves().get(0);
+ LeafReaderContext context = reader.leaves().get(0);
TermsFilter tf = new TermsFilter(new ArrayList<>(terms));
FixedBitSet bits = (FixedBitSet) tf.getDocIdSet(context, context.reader().getLiveDocs());
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java Tue Sep 23 23:51:55 2014
@@ -17,6 +17,7 @@ package org.apache.lucene.queries;
* limitations under the License.
*/
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.FunctionTestSetup;
import org.apache.lucene.queries.function.ValueSource;
@@ -36,7 +37,6 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
@@ -85,7 +85,7 @@ public class TestCustomScoreQuery extend
}
@Override
- protected CustomScoreProvider getCustomScoreProvider(AtomicReaderContext context) {
+ protected CustomScoreProvider getCustomScoreProvider(LeafReaderContext context) {
return new CustomScoreProvider(context) {
@Override
public float customScore(int doc, float subQueryScore, float valSrcScore) {
@@ -120,7 +120,7 @@ public class TestCustomScoreQuery extend
}
@Override
- protected CustomScoreProvider getCustomScoreProvider(AtomicReaderContext context) {
+ protected CustomScoreProvider getCustomScoreProvider(LeafReaderContext context) {
return new CustomScoreProvider(context) {
@Override
public float customScore(int doc, float subQueryScore, float valSrcScores[]) {
@@ -159,7 +159,7 @@ public class TestCustomScoreQuery extend
private final class CustomExternalQuery extends CustomScoreQuery {
@Override
- protected CustomScoreProvider getCustomScoreProvider(AtomicReaderContext context) throws IOException {
+ protected CustomScoreProvider getCustomScoreProvider(LeafReaderContext context) throws IOException {
final NumericDocValues values = DocValues.getNumeric(context.reader(), INT_FIELD);
return new CustomScoreProvider(context) {
@Override
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java Tue Sep 23 23:51:55 2014
@@ -25,7 +25,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInfo.DocValuesType;
import org.apache.lucene.index.IndexWriterConfig;
@@ -94,7 +94,7 @@ public class TestDocValuesFieldSources e
iw.close();
DirectoryReader rd = DirectoryReader.open(d);
- for (AtomicReaderContext leave : rd.leaves()) {
+ for (LeafReaderContext leave : rd.leaves()) {
final FunctionValues ids = new LongFieldSource("id").getValues(null, leave);
final ValueSource vs;
switch (type) {
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java Tue Sep 23 23:51:55 2014
@@ -22,7 +22,7 @@ import java.util.Collections;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.queries.function.valuesource.SortedSetFieldSource;
@@ -47,7 +47,7 @@ public class TestSortedSetFieldSource ex
writer.close();
DirectoryReader ir = DirectoryReader.open(dir);
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
ValueSource vs = new SortedSetFieldSource("value");
FunctionValues values = vs.getValues(Collections.emptyMap(), ar.getContext());
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.xm
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.NumericRangeFilter;
@@ -155,7 +155,7 @@ public class NumericRangeFilterBuilder i
static class NoMatchFilter extends Filter {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
return null;
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java Tue Sep 23 23:51:55 2014
@@ -19,12 +19,10 @@ package org.apache.lucene.queryparser.su
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SimpleCollector;
@@ -79,7 +77,7 @@ public class BooleanQueryTst {
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
docBase = context.docBase;
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java Tue Sep 23 23:51:55 2014
@@ -24,7 +24,7 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -197,7 +197,7 @@ public class TestParser extends LuceneTe
}
public void testDuplicateFilterQueryXML() throws ParserException, IOException {
- List<AtomicReaderContext> leaves = searcher.getTopReaderContext().leaves();
+ List<LeafReaderContext> leaves = searcher.getTopReaderContext().leaves();
Assume.assumeTrue(leaves.size() == 1);
Query q = parse("DuplicateFilterQuery.xml");
int h = searcher.search(q, null, 1000).totalHits;
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.xm
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
@@ -65,7 +65,7 @@ public class TestNumericRangeFilterBuild
IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(null));
writer.commit();
try {
- AtomicReader reader = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(ramDir));
+ LeafReader reader = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(ramDir));
try {
assertNull(filter.getDocIdSet(reader.getContext(), reader.getLiveDocs()));
}
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java Tue Sep 23 23:51:55 2014
@@ -79,7 +79,7 @@ public class DuplicateFilter extends Fil
}
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
if (processingMode == ProcessingMode.PM_FAST_INVALIDATION) {
return fastBits(context.reader(), acceptDocs);
} else {
@@ -87,7 +87,7 @@ public class DuplicateFilter extends Fil
}
}
- private FixedBitSet correctBits(AtomicReader reader, Bits acceptDocs) throws IOException {
+ private FixedBitSet correctBits(LeafReader reader, Bits acceptDocs) throws IOException {
FixedBitSet bits = new FixedBitSet(reader.maxDoc()); //assume all are INvalid
Terms terms = reader.fields().terms(fieldName);
@@ -124,7 +124,7 @@ public class DuplicateFilter extends Fil
return bits;
}
- private FixedBitSet fastBits(AtomicReader reader, Bits acceptDocs) throws IOException {
+ private FixedBitSet fastBits(LeafReader reader, Bits acceptDocs) throws IOException {
FixedBitSet bits = new FixedBitSet(reader.maxDoc());
bits.set(0, reader.maxDoc()); //assume all are valid
Terms terms = reader.fields().terms(fieldName);
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.sandbox.querie
import java.io.IOException;
import java.text.Collator;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.search.FieldComparator;
@@ -93,7 +93,7 @@ public final class SlowCollatedStringCom
}
@Override
- public FieldComparator<String> setNextReader(AtomicReaderContext context) throws IOException {
+ public FieldComparator<String> setNextReader(LeafReaderContext context) throws IOException {
currentDocTerms = DocValues.getBinary(context.reader(), field);
docsWithField = DocValues.getDocsWithField(context.reader(), field);
return this;
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java Tue Sep 23 23:51:55 2014
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.ReaderUtil;
@@ -372,7 +372,7 @@ public class TermAutomatonQuery extends
}
@Override
- public Scorer scorer(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
// Initialize the enums; null for a given slot means that term didn't appear in this reader
EnumAndScorer[] enums = new EnumAndScorer[idToTerm.size()];
@@ -395,7 +395,7 @@ public class TermAutomatonQuery extends
}
@Override
- public Explanation explain(AtomicReaderContext context, int doc) throws IOException {
+ public Explanation explain(LeafReaderContext context, int doc) throws IOException {
// TODO
return null;
}
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,6 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.search.TermAutomatonQuery.EnumAndScorer;
import org.apache.lucene.search.TermAutomatonQuery.TermAutomatonWeight;
import org.apache.lucene.search.similarities.Similarity;
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java Tue Sep 23 23:51:55 2014
@@ -38,7 +38,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StoredField;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
@@ -51,7 +51,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.automaton.Automata;
import org.apache.lucene.util.automaton.Automaton;
-import org.apache.lucene.util.automaton.Operations;
import org.apache.lucene.util.automaton.Transition;
public class TestTermAutomatonQuery extends LuceneTestCase {
@@ -627,7 +626,7 @@ public class TestTermAutomatonQuery exte
}
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
int maxDoc = context.reader().maxDoc();
FixedBitSet bits = new FixedBitSet(maxDoc);
Random random = new Random(seed ^ context.docBase);
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java Tue Sep 23 23:51:55 2014
@@ -18,7 +18,7 @@ package org.apache.lucene.spatial.bbox;
*/
import com.spatial4j.core.shape.Rectangle;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
@@ -60,7 +60,7 @@ public abstract class BBoxSimilarityValu
protected abstract String similarityDescription();
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues shapeValues = bboxValueSource.getValues(context, readerContext);
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java Tue Sep 23 23:51:55 2014
@@ -26,7 +26,6 @@ import org.apache.lucene.document.Double
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.ValueSource;
@@ -43,7 +42,6 @@ import org.apache.lucene.spatial.query.S
import org.apache.lucene.spatial.query.SpatialOperation;
import org.apache.lucene.spatial.query.UnsupportedSpatialOperation;
import org.apache.lucene.spatial.util.DistanceToShapeValueSource;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.NumericUtils;
@@ -71,7 +69,7 @@ import org.apache.lucene.util.NumericUti
* The {@link #makeOverlapRatioValueSource(com.spatial4j.core.shape.Rectangle, double)}
* works by calculating the query bbox overlap percentage against the indexed
* shape overlap percentage. The indexed shape's coordinates are retrieved from
- * {@link AtomicReader#getNumericDocValues}.
+ * {@link org.apache.lucene.index.LeafReader#getNumericDocValues}.
*
* @lucene.experimental
*/
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxValueSource.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxValueSource.java Tue Sep 23 23:51:55 2014
@@ -18,8 +18,8 @@ package org.apache.lucene.spatial.bbox;
*/
import com.spatial4j.core.shape.Rectangle;
-import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.queries.function.FunctionValues;
@@ -50,8 +50,8 @@ class BBoxValueSource extends ValueSourc
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- AtomicReader reader = readerContext.reader();
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
+ LeafReader reader = readerContext.reader();
final NumericDocValues minX = DocValues.getNumeric(reader, strategy.field_minX);
final NumericDocValues minY = DocValues.getNumeric(reader, strategy.field_minY);
final NumericDocValues maxX = DocValues.getNumeric(reader, strategy.field_maxX);
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java Tue Sep 23 23:51:55 2014
@@ -18,8 +18,8 @@ package org.apache.lucene.spatial.prefix
*/
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@@ -76,16 +76,16 @@ public abstract class AbstractPrefixTree
* traversing a {@link TermsEnum}. */
public abstract class BaseTermsEnumTraverser {
- protected final AtomicReaderContext context;
+ protected final LeafReaderContext context;
protected Bits acceptDocs;
protected final int maxDoc;
protected TermsEnum termsEnum;//remember to check for null in getDocIdSet
protected DocsEnum docsEnum;
- public BaseTermsEnumTraverser(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public BaseTermsEnumTraverser(LeafReaderContext context, Bits acceptDocs) throws IOException {
this.context = context;
- AtomicReader reader = context.reader();
+ LeafReader reader = context.reader();
this.acceptDocs = acceptDocs;
this.maxDoc = reader.maxDoc();
Terms terms = reader.terms(fieldName);
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeFilter.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeFilter.java Tue Sep 23 23:51:55 2014
@@ -18,7 +18,7 @@ package org.apache.lucene.spatial.prefix
*/
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.spatial.prefix.tree.Cell;
@@ -35,7 +35,7 @@ import java.util.Iterator;
* visitor design patterns for subclasses to guide the traversal and collect
* matching documents.
* <p/>
- * Subclasses implement {@link #getDocIdSet(org.apache.lucene.index.AtomicReaderContext,
+ * Subclasses implement {@link #getDocIdSet(org.apache.lucene.index.LeafReaderContext,
* org.apache.lucene.util.Bits)} by instantiating a custom {@link
* VisitorTemplate} subclass (i.e. an anonymous inner class) and implement the
* required methods.
@@ -81,7 +81,7 @@ public abstract class AbstractVisitingPr
* other operations on a {@link SpatialPrefixTree} indexed field. An instance
* of this class is not designed to be re-used across AtomicReaderContext
* instances so simply create a new one for each call to, say a {@link
- * org.apache.lucene.search.Filter#getDocIdSet(org.apache.lucene.index.AtomicReaderContext, org.apache.lucene.util.Bits)}.
+ * org.apache.lucene.search.Filter#getDocIdSet(org.apache.lucene.index.LeafReaderContext, org.apache.lucene.util.Bits)}.
* The {@link #getDocIdSet()} method here starts the work. It first checks
* that there are indexed terms; if not it quickly returns null. Then it calls
* {@link #start()} so a subclass can set up a return value, like an
@@ -132,7 +132,7 @@ public abstract class AbstractVisitingPr
private BytesRef thisTerm;//the result of termsEnum.term()
- public VisitorTemplate(AtomicReaderContext context, Bits acceptDocs,
+ public VisitorTemplate(LeafReaderContext context, Bits acceptDocs,
boolean hasIndexedLeaves) throws IOException {
super(context, acceptDocs);
this.hasIndexedLeaves = hasIndexedLeaves;
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.spatial.prefix
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.SpatialRelation;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
@@ -75,13 +75,13 @@ public class ContainsPrefixTreeFilter ex
}
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
return new ContainsVisitor(context, acceptDocs).visit(grid.getWorldCell(), acceptDocs);
}
private class ContainsVisitor extends BaseTermsEnumTraverser {
- public ContainsVisitor(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public ContainsVisitor(LeafReaderContext context, Bits acceptDocs) throws IOException {
super(context, acceptDocs);
}
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeFilter.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeFilter.java Tue Sep 23 23:51:55 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.spatial.prefix
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.SpatialRelation;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.spatial.prefix.tree.Cell;
import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
@@ -51,7 +51,7 @@ public class IntersectsPrefixTreeFilter
}
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
/* Possible optimizations (in IN ADDITION TO THOSE LISTED IN VISITORTEMPLATE):
* If docFreq is 1 (or < than some small threshold), then check to see if we've already
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeFilter.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeFilter.java Tue Sep 23 23:51:55 2014
@@ -24,7 +24,7 @@ import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.SpatialRelation;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.spatial.prefix.tree.Cell;
import org.apache.lucene.spatial.prefix.tree.CellIterator;
@@ -119,7 +119,7 @@ public class WithinPrefixTreeFilter exte
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
return new VisitorTemplate(context, acceptDocs, true) {
private FixedBitSet inside;
private FixedBitSet outside;
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java Tue Sep 23 23:51:55 2014
@@ -24,7 +24,7 @@ import com.spatial4j.core.shape.Shape;
import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -143,7 +143,7 @@ public class SerializedDVStrategy extend
}
@Override
- public DocIdSet getDocIdSet(final AtomicReaderContext context, final Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(final LeafReaderContext context, final Bits acceptDocs) throws IOException {
return new DocIdSet() {
@Override
public DocIdSetIterator iterator() throws IOException {
@@ -213,7 +213,7 @@ public class SerializedDVStrategy extend
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final BinaryDocValues docValues = readerContext.reader().getBinaryDocValues(fieldName);
return new FunctionValues() {
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@
package org.apache.lucene.spatial.util;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -47,7 +47,7 @@ public class CachingDoubleValueSource ex
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final int base = readerContext.docBase;
final FunctionValues vals = source.getValues(context,readerContext);
return new FunctionValues() {
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/DistanceToShapeValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/DistanceToShapeValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/DistanceToShapeValueSource.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/DistanceToShapeValueSource.java Tue Sep 23 23:51:55 2014
@@ -21,7 +21,7 @@ import com.spatial4j.core.context.Spatia
import com.spatial4j.core.distance.DistanceCalculator;
import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
@@ -68,7 +68,7 @@ public class DistanceToShapeValueSource
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues shapeValues = shapeValueSource.getValues(context, readerContext);
return new DoubleDocValues(this) {
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeAreaValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeAreaValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeAreaValueSource.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeAreaValueSource.java Tue Sep 23 23:51:55 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.spatial.util;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
@@ -59,7 +59,7 @@ public class ShapeAreaValueSource extend
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues shapeValues = shapeValueSource.getValues(context, readerContext);
return new DoubleDocValues(this) {
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheDistanceValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheDistanceValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheDistanceValueSource.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheDistanceValueSource.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.spatial.util;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.distance.DistanceCalculator;
import com.spatial4j.core.shape.Point;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -57,7 +57,7 @@ public class ShapeFieldCacheDistanceValu
}
@Override
- public FunctionValues getValues(Map context, final AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, final LeafReaderContext readerContext) throws IOException {
return new FunctionValues() {
private final ShapeFieldCache<Point> cache =
provider.getCache(readerContext.reader());
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java Tue Sep 23 23:51:55 2014
@@ -27,7 +27,7 @@ import java.util.WeakHashMap;
import java.util.logging.Logger;
/**
- * Provides access to a {@link ShapeFieldCache} for a given {@link AtomicReader}.
+ * Provides access to a {@link ShapeFieldCache} for a given {@link org.apache.lucene.index.LeafReader}.
*
* If a Cache does not exist for the Reader, then it is built by iterating over
* the all terms for a given field, reconstructing the Shape from them, and adding
@@ -51,7 +51,7 @@ public abstract class ShapeFieldCachePro
protected abstract T readShape( BytesRef term );
- public synchronized ShapeFieldCache<T> getCache(AtomicReader reader) throws IOException {
+ public synchronized ShapeFieldCache<T> getCache(LeafReader reader) throws IOException {
ShapeFieldCache<T> idx = sidx.get(reader);
if (idx != null) {
return idx;
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapePredicateValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapePredicateValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapePredicateValueSource.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapePredicateValueSource.java Tue Sep 23 23:51:55 2014
@@ -18,7 +18,7 @@ package org.apache.lucene.spatial.util;
*/
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
@@ -64,7 +64,7 @@ public class ShapePredicateValueSource e
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues shapeValues = shapeValuesource.getValues(context, readerContext);
return new BoolDocValues(this) {