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 [10/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/ lu...
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.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;
import org.apache.lucene.search.DocIdSet;
@@ -52,7 +52,7 @@ public class ValueSourceFilter extends F
}
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
final FunctionValues values = source.getValues( null, context );
return new FilteredDocIdSet(startingFilter.getDocIdSet(context, acceptDocs)) {
@Override
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java Tue Sep 23 23:51:55 2014
@@ -19,8 +19,8 @@ package org.apache.lucene.spatial.vector
import com.spatial4j.core.distance.DistanceCalculator;
import com.spatial4j.core.shape.Point;
-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;
@@ -63,8 +63,8 @@ public class DistanceValueSource extends
* Returns the FunctionValues used by the function query.
*/
@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 ptX = DocValues.getNumeric(reader, strategy.getFieldNameX());
final NumericDocValues ptY = DocValues.getNumeric(reader, strategy.getFieldNameY());
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java Tue Sep 23 23:51:55 2014
@@ -27,7 +27,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.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;
@@ -496,7 +496,7 @@ public class SpellChecker implements jav
final IndexReader reader = searcher.getIndexReader();
if (reader.maxDoc() > 0) {
- for (final AtomicReaderContext ctx : reader.leaves()) {
+ for (final LeafReaderContext ctx : reader.leaves()) {
Terms terms = ctx.reader().terms(F_WORD);
if (terms != null)
termsEnums.add(terms.iterator(null));
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java Tue Sep 23 23:51:55 2014
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
-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.index.StoredDocument;
@@ -110,7 +110,7 @@ public class DocumentValueSourceDictiona
private FunctionValues currentWeightValues;
/** leaves of the reader */
- private final List<AtomicReaderContext> leaves;
+ private final List<LeafReaderContext> leaves;
/** starting docIds of all the leaves */
private final int[] starts;
/** current leave index */
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java Tue Sep 23 23:51:55 2014
@@ -42,12 +42,13 @@ import org.apache.lucene.document.Numeri
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.FilterLeafReader;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.FilterAtomicReader;
+import org.apache.lucene.index.FilterLeafReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MultiDocValues;
@@ -544,7 +545,7 @@ public class AnalyzingInfixSuggester ext
// This will just be null if app didn't pass payloads to build():
// TODO: maybe just stored fields? they compress...
BinaryDocValues payloadsDV = MultiDocValues.getBinaryValues(searcher.getIndexReader(), "payloads");
- List<AtomicReaderContext> leaves = searcher.getIndexReader().leaves();
+ List<LeafReaderContext> leaves = searcher.getIndexReader().leaves();
List<LookupResult> results = new ArrayList<>();
for (int i=0;i<hits.scoreDocs.length;i++) {
FieldDoc fd = (FieldDoc) hits.scoreDocs[i];
@@ -708,8 +709,8 @@ public class AnalyzingInfixSuggester ext
if (searcherMgr != null) {
IndexSearcher searcher = searcherMgr.acquire();
try {
- for (AtomicReaderContext context : searcher.getIndexReader().leaves()) {
- AtomicReader reader = FilterAtomicReader.unwrap(context.reader());
+ for (LeafReaderContext context : searcher.getIndexReader().leaves()) {
+ LeafReader reader = FilterLeafReader.unwrap(context.reader());
if (reader instanceof SegmentReader) {
mem += ((SegmentReader) context.reader()).ramBytesUsed();
}
@@ -731,8 +732,8 @@ public class AnalyzingInfixSuggester ext
if (searcherMgr != null) {
IndexSearcher searcher = searcherMgr.acquire();
try {
- for (AtomicReaderContext context : searcher.getIndexReader().leaves()) {
- AtomicReader reader = FilterAtomicReader.unwrap(context.reader());
+ for (LeafReaderContext context : searcher.getIndexReader().leaves()) {
+ LeafReader reader = FilterLeafReader.unwrap(context.reader());
if (reader instanceof SegmentReader) {
resources.add(Accountables.namedAccountable("segment", (SegmentReader)reader));
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java Tue Sep 23 23:51:55 2014
@@ -23,7 +23,7 @@ import java.util.Iterator;
import org.apache.lucene.codecs.DocValuesConsumer;
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.DocValuesProducer;
-import org.apache.lucene.index.AssertingAtomicReader;
+import org.apache.lucene.index.AssertingLeafReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.NumericDocValues;
@@ -33,8 +33,8 @@ import org.apache.lucene.index.SegmentWr
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.index.SortedNumericDocValues;
import org.apache.lucene.index.SortedSetDocValues;
-import org.apache.lucene.index.AssertingAtomicReader.AssertingRandomAccessOrds;
-import org.apache.lucene.index.AssertingAtomicReader.AssertingSortedSetDocValues;
+import org.apache.lucene.index.AssertingLeafReader.AssertingRandomAccessOrds;
+import org.apache.lucene.index.AssertingLeafReader.AssertingSortedSetDocValues;
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
@@ -228,7 +228,7 @@ public class AssertingDocValuesFormat ex
assert field.getDocValuesType() == FieldInfo.DocValuesType.NUMERIC;
NumericDocValues values = in.getNumeric(field);
assert values != null;
- return new AssertingAtomicReader.AssertingNumericDocValues(values, maxDoc);
+ return new AssertingLeafReader.AssertingNumericDocValues(values, maxDoc);
}
@Override
@@ -236,7 +236,7 @@ public class AssertingDocValuesFormat ex
assert field.getDocValuesType() == FieldInfo.DocValuesType.BINARY;
BinaryDocValues values = in.getBinary(field);
assert values != null;
- return new AssertingAtomicReader.AssertingBinaryDocValues(values, maxDoc);
+ return new AssertingLeafReader.AssertingBinaryDocValues(values, maxDoc);
}
@Override
@@ -244,7 +244,7 @@ public class AssertingDocValuesFormat ex
assert field.getDocValuesType() == FieldInfo.DocValuesType.SORTED;
SortedDocValues values = in.getSorted(field);
assert values != null;
- return new AssertingAtomicReader.AssertingSortedDocValues(values, maxDoc);
+ return new AssertingLeafReader.AssertingSortedDocValues(values, maxDoc);
}
@Override
@@ -252,7 +252,7 @@ public class AssertingDocValuesFormat ex
assert field.getDocValuesType() == FieldInfo.DocValuesType.SORTED_NUMERIC;
SortedNumericDocValues values = in.getSortedNumeric(field);
assert values != null;
- return new AssertingAtomicReader.AssertingSortedNumericDocValues(values, maxDoc);
+ return new AssertingLeafReader.AssertingSortedNumericDocValues(values, maxDoc);
}
@Override
@@ -273,7 +273,7 @@ public class AssertingDocValuesFormat ex
Bits bits = in.getDocsWithField(field);
assert bits != null;
assert bits.length() == maxDoc;
- return new AssertingAtomicReader.AssertingBits(bits);
+ return new AssertingLeafReader.AssertingBits(bits);
}
@Override
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java Tue Sep 23 23:51:55 2014
@@ -22,8 +22,7 @@ import java.io.IOException;
import org.apache.lucene.codecs.NormsConsumer;
import org.apache.lucene.codecs.NormsFormat;
import org.apache.lucene.codecs.NormsProducer;
-import org.apache.lucene.codecs.lucene49.Lucene49NormsFormat;
-import org.apache.lucene.index.AssertingAtomicReader;
+import org.apache.lucene.index.AssertingLeafReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SegmentReadState;
@@ -97,7 +96,7 @@ public class AssertingNormsFormat extend
assert field.getNormType() == FieldInfo.DocValuesType.NUMERIC;
NumericDocValues values = in.getNorms(field);
assert values != null;
- return new AssertingAtomicReader.AssertingNumericDocValues(values, maxDoc);
+ return new AssertingLeafReader.AssertingNumericDocValues(values, maxDoc);
}
@Override
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java Tue Sep 23 23:51:55 2014
@@ -23,7 +23,7 @@ import java.util.Iterator;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.index.AssertingAtomicReader;
+import org.apache.lucene.index.AssertingLeafReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo;
@@ -83,7 +83,7 @@ public final class AssertingPostingsForm
@Override
public Terms terms(String field) throws IOException {
Terms terms = in.terms(field);
- return terms == null ? null : new AssertingAtomicReader.AssertingTerms(terms);
+ return terms == null ? null : new AssertingLeafReader.AssertingTerms(terms);
}
@Override
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java Tue Sep 23 23:51:55 2014
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.lucene.codecs.TermVectorsFormat;
import org.apache.lucene.codecs.TermVectorsReader;
import org.apache.lucene.codecs.TermVectorsWriter;
-import org.apache.lucene.index.AssertingAtomicReader;
+import org.apache.lucene.index.AssertingLeafReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.Fields;
@@ -68,7 +68,7 @@ public class AssertingTermVectorsFormat
@Override
public Fields get(int doc) throws IOException {
Fields fields = in.get(doc);
- return fields == null ? null : new AssertingAtomicReader.AssertingFields(fields);
+ return fields == null ? null : new AssertingLeafReader.AssertingFields(fields);
}
@Override
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java Tue Sep 23 23:51:55 2014
@@ -22,10 +22,10 @@ import org.apache.lucene.util.Bits;
/**
* Filters the incoming reader and makes all documents appear deleted.
*/
-public class AllDeletedFilterReader extends FilterAtomicReader {
+public class AllDeletedFilterReader extends FilterLeafReader {
final Bits liveDocs;
- public AllDeletedFilterReader(AtomicReader in) {
+ public AllDeletedFilterReader(LeafReader in) {
super(in);
liveDocs = new Bits.MatchNoBits(in.maxDoc());
assert maxDoc() == 0 || hasDeletions();
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java Tue Sep 23 23:51:55 2014
@@ -19,14 +19,14 @@ package org.apache.lucene.index;
/**
* A {@link DirectoryReader} that wraps all its subreaders with
- * {@link AssertingAtomicReader}
+ * {@link AssertingLeafReader}
*/
public class AssertingDirectoryReader extends FilterDirectoryReader {
static class AssertingSubReaderWrapper extends SubReaderWrapper {
@Override
- public AtomicReader wrap(AtomicReader reader) {
- return new AssertingAtomicReader(reader);
+ public LeafReader wrap(LeafReader reader) {
+ return new AssertingLeafReader(reader);
}
}
Copied: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java (from r1627159, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java?p2=lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java&p1=lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java&r1=1627159&r2=1627178&rev=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java Tue Sep 23 23:51:55 2014
@@ -27,12 +27,12 @@ import org.apache.lucene.util.automaton.
*/
/**
- * A {@link FilterAtomicReader} that can be used to apply
+ * A {@link FilterLeafReader} that can be used to apply
* additional checks for tests.
*/
-public class AssertingAtomicReader extends FilterAtomicReader {
+public class AssertingLeafReader extends FilterLeafReader {
- public AssertingAtomicReader(AtomicReader in) {
+ public AssertingLeafReader(LeafReader in) {
super(in);
// check some basic reader sanity
assert in.maxDoc() >= 0;
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java Tue Sep 23 23:51:55 2014
@@ -1121,7 +1121,7 @@ public abstract class BaseDocValuesForma
int ord = docValues.lookupTerm(expected);
assertEquals(i, ord);
}
- AtomicReader slowR = SlowCompositeReaderWrapper.wrap(reader);
+ LeafReader slowR = SlowCompositeReaderWrapper.wrap(reader);
Set<Entry<String, String>> entrySet = docToString.entrySet();
for (Entry<String, String> entry : entrySet) {
@@ -1194,8 +1194,8 @@ public abstract class BaseDocValuesForma
// compare
DirectoryReader ir = DirectoryReader.open(dir);
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
NumericDocValues docValues = r.getNumericDocValues("dv");
for (int i = 0; i < r.maxDoc(); i++) {
long storedValue = Long.parseLong(r.document(i).get("stored"));
@@ -1252,8 +1252,8 @@ public abstract class BaseDocValuesForma
// compare
DirectoryReader ir = DirectoryReader.open(dir);
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
SortedNumericDocValues docValues = DocValues.getSortedNumeric(r, "dv");
for (int i = 0; i < r.maxDoc(); i++) {
String expected[] = r.document(i).getValues("stored");
@@ -1345,8 +1345,8 @@ public abstract class BaseDocValuesForma
// compare
DirectoryReader ir = writer.getReader();
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
BinaryDocValues docValues = r.getBinaryDocValues("dv");
for (int i = 0; i < r.maxDoc(); i++) {
BytesRef binaryValue = r.document(i).getBinaryValue("stored");
@@ -1359,8 +1359,8 @@ public abstract class BaseDocValuesForma
// compare again
writer.forceMerge(1);
ir = writer.getReader();
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
BinaryDocValues docValues = r.getBinaryDocValues("dv");
for (int i = 0; i < r.maxDoc(); i++) {
BytesRef binaryValue = r.document(i).getBinaryValue("stored");
@@ -1428,8 +1428,8 @@ public abstract class BaseDocValuesForma
// compare
DirectoryReader ir = writer.getReader();
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
BinaryDocValues docValues = r.getSortedDocValues("dv");
for (int i = 0; i < r.maxDoc(); i++) {
BytesRef binaryValue = r.document(i).getBinaryValue("stored");
@@ -1442,8 +1442,8 @@ public abstract class BaseDocValuesForma
// compare again
ir = writer.getReader();
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
BinaryDocValues docValues = r.getSortedDocValues("dv");
for (int i = 0; i < r.maxDoc(); i++) {
BytesRef binaryValue = r.document(i).getBinaryValue("stored");
@@ -1959,8 +1959,8 @@ public abstract class BaseDocValuesForma
// compare
DirectoryReader ir = writer.getReader();
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
SortedSetDocValues docValues = r.getSortedSetDocValues("dv");
for (int i = 0; i < r.maxDoc(); i++) {
String stringValues[] = r.document(i).getValues("stored");
@@ -1982,8 +1982,8 @@ public abstract class BaseDocValuesForma
// compare again
ir = writer.getReader();
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
SortedSetDocValues docValues = r.getSortedSetDocValues("dv");
for (int i = 0; i < r.maxDoc(); i++) {
String stringValues[] = r.document(i).getValues("stored");
@@ -2154,7 +2154,7 @@ public abstract class BaseDocValuesForma
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
NumericDocValues dv = ar.getNumericDocValues("dv1");
assertEquals(0, dv.get(0));
assertEquals(0, dv.get(1));
@@ -2184,7 +2184,7 @@ public abstract class BaseDocValuesForma
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
NumericDocValues dv = ar.getNumericDocValues("dv1");
assertEquals(0, dv.get(0));
assertEquals(0, dv.get(1));
@@ -2218,7 +2218,7 @@ public abstract class BaseDocValuesForma
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
NumericDocValues dv = ar.getNumericDocValues("dv1");
assertEquals(0, dv.get(0));
assertEquals(0, dv.get(1));
@@ -2249,7 +2249,7 @@ public abstract class BaseDocValuesForma
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
BinaryDocValues dv = ar.getBinaryDocValues("dv1");
BytesRef ref = dv.get(0);
assertEquals(new BytesRef(), ref);
@@ -2281,7 +2281,7 @@ public abstract class BaseDocValuesForma
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
BinaryDocValues dv = ar.getBinaryDocValues("dv1");
BytesRef ref = dv.get(0);
assertEquals(new BytesRef(), ref);
@@ -2317,7 +2317,7 @@ public abstract class BaseDocValuesForma
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
BinaryDocValues dv = ar.getBinaryDocValues("dv1");
BytesRef ref = dv.get(0);
assertEquals(new BytesRef(), ref);
@@ -2391,8 +2391,8 @@ public abstract class BaseDocValuesForma
public void run() {
try {
startingGun.await();
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
BinaryDocValues binaries = r.getBinaryDocValues("dvBin");
SortedDocValues sorted = r.getSortedDocValues("dvSorted");
NumericDocValues numerics = r.getNumericDocValues("dvNum");
@@ -2505,8 +2505,8 @@ public abstract class BaseDocValuesForma
public void run() {
try {
startingGun.await();
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
BinaryDocValues binaries = r.getBinaryDocValues("dvBin");
Bits binaryBits = r.getDocsWithField("dvBin");
SortedDocValues sorted = r.getSortedDocValues("dvSorted");
@@ -2641,7 +2641,7 @@ public abstract class BaseDocValuesForma
ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
PrintStream infoStream = new PrintStream(bos, false, IOUtils.UTF_8);
startingGun.await();
- for (AtomicReaderContext leaf : r.leaves()) {
+ for (LeafReaderContext leaf : r.leaves()) {
CheckIndex.testDocValues(leaf.reader(), infoStream, true);
}
} catch (Exception e) {
@@ -2688,7 +2688,7 @@ public abstract class BaseDocValuesForma
IndexReader r = w.getReader();
w.close();
- AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
+ LeafReader ar = SlowCompositeReaderWrapper.wrap(r);
BinaryDocValues values = ar.getBinaryDocValues("field");
for(int j=0;j<5;j++) {
BytesRef result = values.get(0);
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java Tue Sep 23 23:51:55 2014
@@ -224,7 +224,7 @@ abstract class BaseIndexFileFormatTestCa
IndexWriter w = new IndexWriter(dir, cfg);
// we need to index enough documents so that constant overhead doesn't dominate
final int numDocs = atLeast(10000);
- AtomicReader reader1 = null;
+ LeafReader reader1 = null;
for (int i = 0; i < numDocs; ++i) {
Document d = new Document();
addRandomFields(d);
@@ -239,9 +239,9 @@ abstract class BaseIndexFileFormatTestCa
w.commit();
w.close();
- AtomicReader reader2 = getOnlySegmentReader(DirectoryReader.open(dir));
+ LeafReader reader2 = getOnlySegmentReader(DirectoryReader.open(dir));
- for (AtomicReader reader : Arrays.asList(reader1, reader2)) {
+ for (LeafReader reader : Arrays.asList(reader1, reader2)) {
new SimpleMergedSegmentWarmer(InfoStream.NO_OUTPUT).warm(reader);
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java Tue Sep 23 23:51:55 2014
@@ -178,8 +178,8 @@ public abstract class BaseNormsFormatTes
// compare
DirectoryReader ir = DirectoryReader.open(dir);
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
NumericDocValues docValues = r.getNormValues("stored");
for (int i = 0; i < r.maxDoc(); i++) {
long storedValue = Long.parseLong(r.document(i).get("stored"));
@@ -192,8 +192,8 @@ public abstract class BaseNormsFormatTes
// compare again
ir = DirectoryReader.open(dir);
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
NumericDocValues docValues = r.getNormValues("stored");
for (int i = 0; i < r.maxDoc(); i++) {
long storedValue = Long.parseLong(r.document(i).get("stored"));
@@ -230,7 +230,7 @@ public abstract class BaseNormsFormatTes
}
@Override
- public SimScorer simScorer(SimWeight weight, AtomicReaderContext context) throws IOException {
+ public SimScorer simScorer(SimWeight weight, LeafReaderContext context) throws IOException {
throw new UnsupportedOperationException();
}
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -1419,7 +1418,7 @@ public abstract class BasePostingsFormat
doc.add(newStringField("", "something", Field.Store.NO));
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
Fields fields = ar.fields();
int fieldCount = fields.size();
// -1 is allowed, if the codec doesn't implement fields.size():
@@ -1444,7 +1443,7 @@ public abstract class BasePostingsFormat
doc.add(newStringField("", "", Field.Store.NO));
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
Fields fields = ar.fields();
int fieldCount = fields.size();
// -1 is allowed, if the codec doesn't implement fields.size():
@@ -1476,7 +1475,7 @@ public abstract class BasePostingsFormat
iw.deleteDocuments(new Term("ghostField", "something")); // delete the only term for the field
iw.forceMerge(1);
DirectoryReader ir = iw.getReader();
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
Fields fields = ar.fields();
// Ghost busting terms dict impls will have
// fields.size() == 0; all others must be == 1:
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java Tue Sep 23 23:51:55 2014
@@ -296,8 +296,8 @@ public abstract class BaseStoredFieldsFo
assertEquals(numDocs, r.numDocs());
- for(AtomicReaderContext ctx : r.leaves()) {
- final AtomicReader sub = ctx.reader();
+ for(LeafReaderContext ctx : r.leaves()) {
+ final LeafReader sub = ctx.reader();
final NumericDocValues ids = DocValues.getNumeric(sub, "id");
for(int docID=0;docID<sub.numDocs();docID++) {
final StoredDocument doc = sub.document(docID);
Copied: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java (from r1627159, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java?p2=lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java&p1=lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java&r1=1627159&r2=1627178&rev=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java Tue Sep 23 23:51:55 2014
@@ -26,16 +26,16 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.FilterIterator;
/**
- * A {@link FilterAtomicReader} that exposes only a subset
+ * A {@link FilterLeafReader} that exposes only a subset
* of fields from the underlying wrapped reader.
*/
-public final class FieldFilterAtomicReader extends FilterAtomicReader {
+public final class FieldFilterLeafReader extends FilterLeafReader {
private final Set<String> fields;
private final boolean negate;
private final FieldInfos fieldInfos;
- public FieldFilterAtomicReader(AtomicReader in, Set<String> fields, boolean negate) {
+ public FieldFilterLeafReader(LeafReader in, Set<String> fields, boolean negate) {
super(in);
this.fields = fields;
this.negate = negate;
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java Tue Sep 23 23:51:55 2014
@@ -138,7 +138,7 @@ public class MockRandomMergePolicy exten
static class MockRandomOneMerge extends OneMerge {
final Random r;
- ArrayList<AtomicReader> readers;
+ ArrayList<LeafReader> readers;
MockRandomOneMerge(List<SegmentCommitInfo> segments, long seed) {
super(segments);
@@ -146,13 +146,13 @@ public class MockRandomMergePolicy exten
}
@Override
- public List<AtomicReader> getMergeReaders() throws IOException {
+ public List<LeafReader> getMergeReaders() throws IOException {
if (readers == null) {
- readers = new ArrayList<AtomicReader>(super.getMergeReaders());
+ readers = new ArrayList<LeafReader>(super.getMergeReaders());
for (int i = 0; i < readers.size(); i++) {
// wrap it (e.g. prevent bulk merge etc)
if (r.nextInt(4) == 0) {
- readers.set(i, new FilterAtomicReader(readers.get(i)));
+ readers.set(i, new FilterLeafReader(readers.get(i)));
}
}
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java Tue Sep 23 23:51:55 2014
@@ -43,12 +43,12 @@ public class PerThreadPKLookup {
public PerThreadPKLookup(IndexReader r, String idFieldName) throws IOException {
- List<AtomicReaderContext> leaves = new ArrayList<>(r.leaves());
+ List<LeafReaderContext> leaves = new ArrayList<>(r.leaves());
// Larger segments are more likely to have the id, so we sort largest to smallest by numDocs:
- Collections.sort(leaves, new Comparator<AtomicReaderContext>() {
+ Collections.sort(leaves, new Comparator<LeafReaderContext>() {
@Override
- public int compare(AtomicReaderContext c1, AtomicReaderContext c2) {
+ public int compare(LeafReaderContext c1, LeafReaderContext c2) {
return c2.reader().numDocs() - c1.reader().numDocs();
}
});
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.*;
@@ -340,7 +339,7 @@ public abstract class ThreadedIndexingAn
// Verify 1) IW is correctly setting
// diagnostics, and 2) segment warming for
// merged segments is actually happening:
- for(final AtomicReaderContext sub : s.getIndexReader().leaves()) {
+ for(final LeafReaderContext sub : s.getIndexReader().leaves()) {
SegmentReader segReader = (SegmentReader) sub.reader();
Map<String,String> diagnostics = segReader.getSegmentInfo().info.getDiagnostics();
assertNotNull(diagnostics);
@@ -466,7 +465,7 @@ public abstract class ThreadedIndexingAn
conf.setMergedSegmentWarmer(new IndexWriter.IndexReaderWarmer() {
@Override
- public void warm(AtomicReader reader) throws IOException {
+ public void warm(LeafReader reader) throws IOException {
if (VERBOSE) {
System.out.println("TEST: now warm merged reader=" + reader);
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Random;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
/** Wraps another Collector and checks that
* acceptsDocsOutOfOrder is respected. */
@@ -41,7 +41,7 @@ public class AssertingCollector extends
}
@Override
- public LeafCollector getLeafCollector(AtomicReaderContext context) throws IOException {
+ public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
return new FilterLeafCollector(super.getLeafCollector(context)) {
int lastCollected = -1;
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java Tue Sep 23 23:51:55 2014
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Random;
import java.util.concurrent.ExecutorService;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.util.TestUtil;
@@ -89,7 +89,7 @@ public class AssertingIndexSearcher exte
}
@Override
- protected void search(List<AtomicReaderContext> leaves, Weight weight, Collector collector) throws IOException {
+ protected void search(List<LeafReaderContext> leaves, Weight weight, Collector collector) throws IOException {
// TODO: shouldn't we AssertingCollector.wrap(collector) here?
super.search(leaves, AssertingWeight.wrap(random, weight), collector);
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java Tue Sep 23 23:51:55 2014
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.Random;
import java.util.WeakHashMap;
-import org.apache.lucene.index.AssertingAtomicReader;
+import org.apache.lucene.index.AssertingLeafReader;
/** Wraps a Scorer with additional checks */
public class AssertingScorer extends Scorer {
@@ -63,13 +63,13 @@ public class AssertingScorer extends Sco
final Random random;
final Scorer in;
- final AssertingAtomicReader.AssertingDocsEnum docsEnumIn;
+ final AssertingLeafReader.AssertingDocsEnum docsEnumIn;
private AssertingScorer(Random random, Scorer in) {
super(in.weight);
this.random = random;
this.in = in;
- this.docsEnumIn = new AssertingAtomicReader.AssertingDocsEnum(in);
+ this.docsEnumIn = new AssertingLeafReader.AssertingDocsEnum(in);
}
public Scorer getIn() {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Random;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.Bits;
class AssertingWeight extends Weight {
@@ -40,7 +40,7 @@ class AssertingWeight extends Weight {
}
@Override
- public Explanation explain(AtomicReaderContext context, int doc) throws IOException {
+ public Explanation explain(LeafReaderContext context, int doc) throws IOException {
return in.explain(context, doc);
}
@@ -60,7 +60,7 @@ class AssertingWeight extends Weight {
}
@Override
- public Scorer scorer(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
// if the caller asks for in-order scoring or if the weight does not support
// out-of order scoring then collection will have to happen in-order.
final Scorer inScorer = in.scorer(context, acceptDocs);
@@ -68,7 +68,7 @@ class AssertingWeight extends Weight {
}
@Override
- public BulkScorer bulkScorer(AtomicReaderContext context, boolean scoreDocsInOrder, Bits acceptDocs) throws IOException {
+ public BulkScorer bulkScorer(LeafReaderContext context, boolean scoreDocsInOrder, Bits acceptDocs) throws IOException {
// if the caller asks for in-order scoring or if the weight does not support
// out-of order scoring then collection will have to happen in-order.
BulkScorer inScorer = in.bulkScorer(context, scoreDocsInOrder, acceptDocs);
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java Tue Sep 23 23:51:55 2014
@@ -25,7 +25,7 @@ import java.util.Random;
import junit.framework.Assert;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.util.LuceneTestCase;
@@ -136,7 +136,7 @@ public class CheckHits {
bag.add(Integer.valueOf(doc + base));
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
base = context.docBase;
}
@Override
@@ -508,7 +508,7 @@ public class CheckHits {
exp.isMatch());
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
base = context.docBase;
}
@Override
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java Tue Sep 23 23:51:55 2014
@@ -26,8 +26,8 @@ import junit.framework.Assert;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.AllDeletedFilterReader;
-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.IndexReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
@@ -218,7 +218,7 @@ public class QueryUtils {
*/
public static void checkSkipTo(final Query q, final IndexSearcher s) throws IOException {
//System.out.println("Checking "+q);
- final List<AtomicReaderContext> readerContextArray = s.getTopReaderContext().leaves();
+ final List<LeafReaderContext> readerContextArray = s.getTopReaderContext().leaves();
if (s.createNormalizedWeight(q).scoresDocsOutOfOrder()) return; // in this case order of skipTo() might differ from that of next().
final int skip_op = 0;
@@ -244,7 +244,7 @@ public class QueryUtils {
// FUTURE: ensure scorer.doc()==-1
final float maxDiff = 1e-5f;
- final AtomicReader lastReader[] = {null};
+ final LeafReader lastReader[] = {null};
s.search(q, new SimpleCollector() {
private Scorer sc;
@@ -263,7 +263,7 @@ public class QueryUtils {
try {
if (scorer == null) {
Weight w = s.createNormalizedWeight(q);
- AtomicReaderContext context = readerContextArray.get(leafPtr);
+ LeafReaderContext context = readerContextArray.get(leafPtr);
scorer = w.scorer(context, context.reader().getLiveDocs());
}
@@ -302,15 +302,15 @@ public class QueryUtils {
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
if (lastReader[0] != null) {
- final AtomicReader previousReader = lastReader[0];
+ final LeafReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader);
indexSearcher.setSimilarity(s.getSimilarity());
Weight w = indexSearcher.createNormalizedWeight(q);
- AtomicReaderContext ctx = (AtomicReaderContext)indexSearcher.getTopReaderContext();
+ LeafReaderContext ctx = (LeafReaderContext)indexSearcher.getTopReaderContext();
Scorer scorer = w.scorer(ctx, ctx.reader().getLiveDocs());
if (scorer != null) {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
@@ -333,11 +333,11 @@ public class QueryUtils {
if (lastReader[0] != null) {
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
- final AtomicReader previousReader = lastReader[0];
+ final LeafReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader, false);
indexSearcher.setSimilarity(s.getSimilarity());
Weight w = indexSearcher.createNormalizedWeight(q);
- AtomicReaderContext ctx = previousReader.getContext();
+ LeafReaderContext ctx = previousReader.getContext();
Scorer scorer = w.scorer(ctx, ctx.reader().getLiveDocs());
if (scorer != null) {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
@@ -352,8 +352,8 @@ public class QueryUtils {
//System.out.println("checkFirstSkipTo: "+q);
final float maxDiff = 1e-3f;
final int lastDoc[] = {-1};
- final AtomicReader lastReader[] = {null};
- final List<AtomicReaderContext> context = s.getTopReaderContext().leaves();
+ final LeafReader lastReader[] = {null};
+ final List<LeafReaderContext> context = s.getTopReaderContext().leaves();
s.search(q,new SimpleCollector() {
private Scorer scorer;
private int leafPtr;
@@ -389,15 +389,15 @@ public class QueryUtils {
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
if (lastReader[0] != null) {
- final AtomicReader previousReader = lastReader[0];
+ final LeafReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader);
indexSearcher.setSimilarity(s.getSimilarity());
Weight w = indexSearcher.createNormalizedWeight(q);
- Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), previousReader.getLiveDocs());
+ Scorer scorer = w.scorer((LeafReaderContext)indexSearcher.getTopReaderContext(), previousReader.getLiveDocs());
if (scorer != null) {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
@@ -418,11 +418,11 @@ public class QueryUtils {
if (lastReader[0] != null) {
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
- final AtomicReader previousReader = lastReader[0];
+ final LeafReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader);
indexSearcher.setSimilarity(s.getSimilarity());
Weight w = indexSearcher.createNormalizedWeight(q);
- Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), previousReader.getLiveDocs());
+ Scorer scorer = w.scorer((LeafReaderContext)indexSearcher.getTopReaderContext(), previousReader.getLiveDocs());
if (scorer != null) {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Tue Sep 23 23:51:55 2014
@@ -61,50 +61,10 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AlcoholicMergePolicy;
-import org.apache.lucene.index.AssertingAtomicReader;
-import org.apache.lucene.index.AssertingDirectoryReader;
-import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.BinaryDocValues;
-import org.apache.lucene.index.CompositeReader;
-import org.apache.lucene.index.ConcurrentMergeScheduler;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldFilterAtomicReader;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.Fields;
+import org.apache.lucene.index.*;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader.ReaderClosedListener;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.LiveIndexWriterConfig;
-import org.apache.lucene.index.LogByteSizeMergePolicy;
-import org.apache.lucene.index.LogDocMergePolicy;
-import org.apache.lucene.index.LogMergePolicy;
-import org.apache.lucene.index.MergePolicy;
-import org.apache.lucene.index.MergeScheduler;
-import org.apache.lucene.index.MockRandomMergePolicy;
-import org.apache.lucene.index.MultiDocValues;
-import org.apache.lucene.index.MultiFields;
-import org.apache.lucene.index.NumericDocValues;
-import org.apache.lucene.index.ParallelAtomicReader;
-import org.apache.lucene.index.ParallelCompositeReader;
-import org.apache.lucene.index.SegmentReader;
-import org.apache.lucene.index.SerialMergeScheduler;
-import org.apache.lucene.index.SimpleMergedSegmentWarmer;
-import org.apache.lucene.index.SlowCompositeReaderWrapper;
-import org.apache.lucene.index.SortedDocValues;
-import org.apache.lucene.index.SortedNumericDocValues;
-import org.apache.lucene.index.SortedSetDocValues;
-import org.apache.lucene.index.StorableField;
-import org.apache.lucene.index.StoredDocument;
-import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum.SeekStatus;
-import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.index.TieredMergePolicy;
import org.apache.lucene.search.AssertingIndexSearcher;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
@@ -746,10 +706,10 @@ public abstract class LuceneTestCase ext
* do tests on that segment's reader. This is an utility method to help them.
*/
public static SegmentReader getOnlySegmentReader(DirectoryReader reader) {
- List<AtomicReaderContext> subReaders = reader.leaves();
+ List<LeafReaderContext> subReaders = reader.leaves();
if (subReaders.size() != 1)
throw new IllegalArgumentException(reader + " has " + subReaders.size() + " segments instead of exactly one");
- final AtomicReader r = subReaders.get(0).reader();
+ final LeafReader r = subReaders.get(0).reader();
assertTrue(r instanceof SegmentReader);
return (SegmentReader) r;
}
@@ -1464,7 +1424,7 @@ public abstract class LuceneTestCase ext
Random random = random();
if (rarely()) {
// TODO: remove this, and fix those tests to wrap before putting slow around:
- final boolean wasOriginallyAtomic = r instanceof AtomicReader;
+ final boolean wasOriginallyAtomic = r instanceof LeafReader;
for (int i = 0, c = random.nextInt(6)+1; i < c; i++) {
switch(random.nextInt(5)) {
case 0:
@@ -1472,8 +1432,8 @@ public abstract class LuceneTestCase ext
break;
case 1:
// will create no FC insanity in atomic case, as ParallelAtomicReader has own cache key:
- r = (r instanceof AtomicReader) ?
- new ParallelAtomicReader((AtomicReader) r) :
+ r = (r instanceof LeafReader) ?
+ new ParallelLeafReader((LeafReader) r) :
new ParallelCompositeReader((CompositeReader) r);
break;
case 2:
@@ -1483,7 +1443,7 @@ public abstract class LuceneTestCase ext
r = new FCInvisibleMultiReader(r);
break;
case 3:
- final AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
+ final LeafReader ar = SlowCompositeReaderWrapper.wrap(r);
final List<String> allFields = new ArrayList<>();
for (FieldInfo fi : ar.getFieldInfos()) {
allFields.add(fi.name);
@@ -1492,17 +1452,17 @@ public abstract class LuceneTestCase ext
final int end = allFields.isEmpty() ? 0 : random.nextInt(allFields.size());
final Set<String> fields = new HashSet<>(allFields.subList(0, end));
// will create no FC insanity as ParallelAtomicReader has own cache key:
- r = new ParallelAtomicReader(
- new FieldFilterAtomicReader(ar, fields, false),
- new FieldFilterAtomicReader(ar, fields, true)
+ r = new ParallelLeafReader(
+ new FieldFilterLeafReader(ar, fields, false),
+ new FieldFilterLeafReader(ar, fields, true)
);
break;
case 4:
// Häckidy-Hick-Hack: a standard Reader will cause FC insanity, so we use
// QueryUtils' reader with a fake cache key, so insanity checker cannot walk
// along our reader:
- if (r instanceof AtomicReader) {
- r = new AssertingAtomicReader((AtomicReader)r);
+ if (r instanceof LeafReader) {
+ r = new AssertingLeafReader((LeafReader)r);
} else if (r instanceof DirectoryReader) {
r = new AssertingDirectoryReader((DirectoryReader)r);
}
@@ -1602,7 +1562,7 @@ public abstract class LuceneTestCase ext
}
// TODO: this whole check is a coverage hack, we should move it to tests for various filterreaders.
// ultimately whatever you do will be checkIndex'd at the end anyway.
- if (random.nextInt(500) == 0 && r instanceof AtomicReader) {
+ if (random.nextInt(500) == 0 && r instanceof LeafReader) {
// TODO: not useful to check DirectoryReader (redundant with checkindex)
// but maybe sometimes run this on the other crazy readers maybeWrapReader creates?
try {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java Tue Sep 23 23:51:55 2014
@@ -60,8 +60,9 @@ import org.apache.lucene.document.IntFie
import org.apache.lucene.document.LongField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.FilterLeafReader;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.CheckIndex;
import org.apache.lucene.index.CheckIndex.Status.DocValuesStatus;
import org.apache.lucene.index.CheckIndex.Status.FieldNormStatus;
@@ -72,7 +73,6 @@ import org.apache.lucene.index.Concurren
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo.DocValuesType;
-import org.apache.lucene.index.FilterAtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexableField;
@@ -238,12 +238,12 @@ public final class TestUtil {
/** This runs the CheckIndex tool on the Reader. If any
* issues are hit, a RuntimeException is thrown */
public static void checkReader(IndexReader reader) throws IOException {
- for (AtomicReaderContext context : reader.leaves()) {
+ for (LeafReaderContext context : reader.leaves()) {
checkReader(context.reader(), true);
}
}
- public static void checkReader(AtomicReader reader, boolean crossCheckTermVectors) throws IOException {
+ public static void checkReader(LeafReader reader, boolean crossCheckTermVectors) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
PrintStream infoStream = new PrintStream(bos, false, IOUtils.UTF_8);
@@ -258,7 +258,7 @@ public final class TestUtil {
System.out.println(bos.toString(IOUtils.UTF_8));
}
- AtomicReader unwrapped = FilterAtomicReader.unwrap(reader);
+ LeafReader unwrapped = FilterLeafReader.unwrap(reader);
if (unwrapped instanceof SegmentReader) {
SegmentReader sr = (SegmentReader) unwrapped;
long bytesUsed = sr.ramBytesUsed();
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java Tue Sep 23 23:51:55 2014
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.solr.analytics.expression.Expression;
import org.apache.solr.analytics.expression.ExpressionFactory;
import org.apache.solr.analytics.request.AnalyticsRequest;
@@ -56,7 +56,7 @@ public class BasicAccumulator extends Va
protected final String[] expressionNames;
protected final String[] expressionStrings;
protected final Set<String> hiddenExpressions;
- protected AtomicReaderContext context = null;
+ protected LeafReaderContext context = null;
public BasicAccumulator(SolrIndexSearcher searcher, DocSet docs, AnalyticsRequest request) throws IOException {
this.searcher = searcher;
@@ -80,7 +80,7 @@ public class BasicAccumulator extends Va
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
this.context = context;
for (StatsCollector counter : statsCollectors) {
counter.setNextReader(context);
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java Tue Sep 23 23:51:55 2014
@@ -31,7 +31,7 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
import org.apache.solr.analytics.accumulator.facet.FacetValueAccumulator;
@@ -70,7 +70,7 @@ public class FacetingAccumulator extends
public static final String MISSING_VALUE = "(MISSING)";
protected boolean basicsAndFieldFacetsComputed;
protected int leafNum;
- protected AtomicReaderContext leaf;
+ protected LeafReaderContext leaf;
protected final AnalyticsRequest analyticsRequest;
protected final Map<String,Map<String,Expression[]>> fieldFacetExpressions;
protected final Map<String,Map<String,Expression[]>> rangeFacetExpressions;
@@ -155,7 +155,7 @@ public class FacetingAccumulator extends
* @throws IOException if there is an error setting the next reader
*/
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
super.doSetNextReader(context);
for( Map<String,StatsCollector[]> valueList : fieldFacetCollectors.values() ){
for (StatsCollector[] statsCollectorList : valueList.values()) {
@@ -174,7 +174,7 @@ public class FacetingAccumulator extends
* @param context The context to read documents from.
* @throws IOException if there is an error setting the next reader
*/
- public void setRangeStatsCollectorReaders(AtomicReaderContext context) throws IOException {
+ public void setRangeStatsCollectorReaders(LeafReaderContext context) throws IOException {
super.getLeafCollector(context);
for( Map<String,StatsCollector[]> rangeList : rangeFacetCollectors.values() ){
for (StatsCollector[] statsCollectorList : rangeList.values()) {
@@ -191,7 +191,7 @@ public class FacetingAccumulator extends
* @param context The context to read documents from.
* @throws IOException if there is an error setting the next reader
*/
- public void setQueryStatsCollectorReaders(AtomicReaderContext context) throws IOException {
+ public void setQueryStatsCollectorReaders(LeafReaderContext context) throws IOException {
super.getLeafCollector(context);
for( Map<String,StatsCollector[]> queryList : queryFacetCollectors.values() ){
for (StatsCollector[] statsCollectorList : queryList.values()) {
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/ValueAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/ValueAccumulator.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/ValueAccumulator.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/ValueAccumulator.java Tue Sep 23 23:51:55 2014
@@ -19,8 +19,6 @@ package org.apache.solr.analytics.accumu
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.SimpleCollector;
import org.apache.solr.common.util.NamedList;
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FacetValueAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FacetValueAccumulator.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FacetValueAccumulator.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FacetValueAccumulator.java Tue Sep 23 23:51:55 2014
@@ -19,7 +19,7 @@ package org.apache.solr.analytics.accumu
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
/**
* Interface that describes the methods needed for an Accumulator to be able to handle
@@ -30,7 +30,7 @@ public interface FacetValueAccumulator {
void collectField(int doc, String facetName, String facetValue) throws IOException;
void collectQuery(int doc, String facetName, String facetValue) throws IOException;
void collectRange(int doc, String facetName, String facetValue) throws IOException;
- void setQueryStatsCollectorReaders(AtomicReaderContext context) throws IOException;
- void setRangeStatsCollectorReaders(AtomicReaderContext context) throws IOException;
+ void setQueryStatsCollectorReaders(LeafReaderContext context) throws IOException;
+ void setRangeStatsCollectorReaders(LeafReaderContext context) throws IOException;
}
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java Tue Sep 23 23:51:55 2014
@@ -19,7 +19,7 @@ package org.apache.solr.analytics.accumu
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.index.SortedSetDocValues;
@@ -80,7 +80,7 @@ public class FieldFacetAccumulator exten
* Move to the next set of documents to add to the field facet.
*/
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
if (multiValued) {
setValues = context.reader().getSortedSetDocValues(name);
} else {
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/QueryFacetAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/QueryFacetAccumulator.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/QueryFacetAccumulator.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/QueryFacetAccumulator.java Tue Sep 23 23:51:55 2014
@@ -19,7 +19,7 @@ package org.apache.solr.analytics.accumu
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.solr.analytics.accumulator.ValueAccumulator;
import org.apache.solr.analytics.statistics.StatsCollector;
import org.apache.solr.common.util.NamedList;
@@ -51,7 +51,7 @@ public class QueryFacetAccumulator exten
* Update the readers of the queryFacet {@link StatsCollector}s in FacetingAccumulator
*/
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
parent.setQueryStatsCollectorReaders(context);
}
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/RangeFacetAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/RangeFacetAccumulator.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/RangeFacetAccumulator.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/RangeFacetAccumulator.java Tue Sep 23 23:51:55 2014
@@ -19,7 +19,7 @@ package org.apache.solr.analytics.accumu
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.solr.analytics.statistics.StatsCollector;
/**
@@ -43,7 +43,7 @@ public class RangeFacetAccumulator exten
* Update the readers of the rangeFacet {@link StatsCollector}s in FacetingAccumulator
*/
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
parent.setRangeStatsCollectorReaders(context);
}
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ package org.apache.solr.analytics.reques
import java.io.IOException;
import java.util.List;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter;
@@ -103,9 +103,9 @@ public class AnalyticsStats {
statsCollector.addQueries(((BasicAccumulator)accumulator).getNumQueries());
// Loop through the documents returned by the query and add to accumulator
- List<AtomicReaderContext> contexts = searcher.getTopReaderContext().leaves();
+ List<LeafReaderContext> contexts = searcher.getTopReaderContext().leaves();
for (int leafNum = 0; leafNum < contexts.size(); leafNum++) {
- AtomicReaderContext context = contexts.get(leafNum);
+ LeafReaderContext context = contexts.get(leafNum);
DocIdSet dis = filter.getDocIdSet(context, null); // solr docsets already exclude any deleted docs
DocIdSetIterator disi = null;
if (dis != null) {
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/AbstractDelegatingStatsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/AbstractDelegatingStatsCollector.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/AbstractDelegatingStatsCollector.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/AbstractDelegatingStatsCollector.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ package org.apache.solr.analytics.statis
import java.io.IOException;
import java.util.Set;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.util.mutable.MutableValue;
@@ -43,7 +43,7 @@ public abstract class AbstractDelegating
this.statsList = delegate.getStatsList();
}
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ public void setNextReader(LeafReaderContext context) throws IOException {
delegate.setNextReader(context);
value = getValue();
function = getFunction();
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MinMaxStatsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MinMaxStatsCollector.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MinMaxStatsCollector.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MinMaxStatsCollector.java Tue Sep 23 23:51:55 2014
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.Locale;
import java.util.Set;
-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.FunctionValues.ValueFiller;
import org.apache.lucene.queries.function.ValueSource;
@@ -46,7 +46,7 @@ public class MinMaxStatsCollector implem
this.statsList = statsList;
}
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ public void setNextReader(LeafReaderContext context) throws IOException {
function = source.getValues(null, context);
valueFiller = function.getValueFiller();
value = valueFiller.getValue();
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollector.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollector.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollector.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ package org.apache.solr.analytics.statis
import java.io.IOException;
import java.util.Set;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.util.mutable.MutableValue;
@@ -40,7 +40,7 @@ public interface StatsCollector {
* @param context The context to read documents from.
* @throws IOException if setting next reader fails
*/
- void setNextReader(AtomicReaderContext context) throws IOException;
+ void setNextReader(LeafReaderContext context) throws IOException;
MutableValue getValue();
FunctionValues getFunction();
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDateSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDateSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDateSource.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDateSource.java Tue Sep 23 23:51:55 2014
@@ -22,7 +22,7 @@ import java.text.ParseException;
import java.util.Date;
import java.util.Map;
-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.docvalues.FloatDocValues;
import org.apache.lucene.util.mutable.MutableValue;
@@ -55,7 +55,7 @@ public class ConstDateSource extends Con
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
return new FloatDocValues(this) {
@Override
public float floatVal(int doc) {
Modified: lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java Tue Sep 23 23:51:55 2014
@@ -20,7 +20,7 @@ package org.apache.solr.analytics.util.v
import java.io.IOException;
import java.util.Map;
-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.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.ConstNumberSource;
@@ -48,7 +48,7 @@ public class ConstDoubleSource extends C
}
@Override
- public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
return new DoubleDocValues(this) {
@Override
public double doubleVal(int doc) {