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 03:20:45 UTC
svn commit: r1627188 [8/13] - in /lucene/dev/branches/branch_5x: ./
dev-tools/ lucene/ lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/
lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/...
Modified: lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Wed Sep 24 01:20:36 2014
@@ -21,7 +21,6 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +40,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
@@ -73,10 +72,8 @@ import org.apache.lucene.util.ByteBlockP
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LineFileDocs;
-import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.RecyclingByteBlockAllocator;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.Version;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -162,7 +159,7 @@ public class MemoryIndexTest extends Bas
memory.addField("foo", fooField.toString(), analyzer);
memory.addField("term", termField.toString(), analyzer);
- AtomicReader reader = (AtomicReader) memory.createSearcher().getIndexReader();
+ LeafReader reader = (LeafReader) memory.createSearcher().getIndexReader();
DirectoryReader competitor = DirectoryReader.open(ramdir);
duellReaders(competitor, reader);
IOUtils.close(reader, competitor);
@@ -170,9 +167,9 @@ public class MemoryIndexTest extends Bas
ramdir.close();
}
- private void duellReaders(CompositeReader other, AtomicReader memIndexReader)
+ private void duellReaders(CompositeReader other, LeafReader memIndexReader)
throws IOException {
- AtomicReader competitor = SlowCompositeReaderWrapper.wrap(other);
+ LeafReader competitor = SlowCompositeReaderWrapper.wrap(other);
Fields memFields = memIndexReader.fields();
for (String field : competitor.fields()) {
Terms memTerms = memFields.terms(field);
@@ -315,7 +312,7 @@ public class MemoryIndexTest extends Bas
Analyzer analyzer = new MockAnalyzer(random());
MemoryIndex memory = new MemoryIndex(random().nextBoolean(), random().nextInt(50) * 1024 * 1024);
memory.addField("foo", "bar", analyzer);
- AtomicReader reader = (AtomicReader) memory.createSearcher().getIndexReader();
+ LeafReader reader = (LeafReader) memory.createSearcher().getIndexReader();
DocsEnum disi = TestUtil.docs(random(), reader, "foo", new BytesRef("bar"), null, null, DocsEnum.FLAG_NONE);
int docid = disi.docID();
assertEquals(-1, docid);
@@ -345,7 +342,7 @@ public class MemoryIndexTest extends Bas
MemoryIndex memory = new MemoryIndex(true, random().nextInt(50) * 1024 * 1024);
for (int i = 0; i < numIters; i++) { // check reuse
memory.addField("foo", "bar", analyzer);
- AtomicReader reader = (AtomicReader) memory.createSearcher().getIndexReader();
+ LeafReader reader = (LeafReader) memory.createSearcher().getIndexReader();
assertEquals(1, reader.terms("foo").getSumTotalTermFreq());
DocsAndPositionsEnum disi = reader.termPositionsEnum(new Term("foo", "bar"));
int docid = disi.docID();
@@ -396,7 +393,7 @@ public class MemoryIndexTest extends Bas
MockAnalyzer mockAnalyzer = new MockAnalyzer(random());
mindex.addField("field", "the quick brown fox", mockAnalyzer);
mindex.addField("field", "jumps over the", mockAnalyzer);
- AtomicReader reader = (AtomicReader) mindex.createSearcher().getIndexReader();
+ LeafReader reader = (LeafReader) mindex.createSearcher().getIndexReader();
assertEquals(7, reader.terms("field").getSumTotalTermFreq());
PhraseQuery query = new PhraseQuery();
query.add(new Term("field", "fox"));
@@ -415,7 +412,7 @@ public class MemoryIndexTest extends Bas
MemoryIndex mindex = new MemoryIndex(random().nextBoolean(), random().nextInt(50) * 1024 * 1024);
MockAnalyzer mockAnalyzer = new MockAnalyzer(random());
mindex.addField("field", "the quick brown fox", mockAnalyzer);
- AtomicReader reader = (AtomicReader) mindex.createSearcher().getIndexReader();
+ LeafReader reader = (LeafReader) mindex.createSearcher().getIndexReader();
assertNull(reader.getNumericDocValues("not-in-index"));
assertNull(reader.getNormValues("not-in-index"));
assertNull(reader.termDocsEnum(new Term("not-in-index", "foo")));
@@ -449,7 +446,7 @@ public class MemoryIndexTest extends Bas
memory.addField(field.name(), ((Field)field).stringValue(), mockAnalyzer);
}
DirectoryReader competitor = DirectoryReader.open(dir);
- AtomicReader memIndexReader= (AtomicReader) memory.createSearcher().getIndexReader();
+ LeafReader memIndexReader= (LeafReader) memory.createSearcher().getIndexReader();
duellReaders(competitor, memIndexReader);
IOUtils.close(competitor, memIndexReader);
memory.reset();
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Wed Sep 24 01:20:36 2014
@@ -101,7 +101,7 @@ public class MultiPassIndexSplitter {
.setOpenMode(OpenMode.CREATE));
System.err.println("Writing part " + (i + 1) + " ...");
// pass the subreaders directly, as our wrapper's numDocs/hasDeletetions are not up-to-date
- final List<? extends FakeDeleteAtomicIndexReader> sr = input.getSequentialSubReaders();
+ final List<? extends FakeDeleteLeafIndexReader> sr = input.getSequentialSubReaders();
w.addIndexes(sr.toArray(new IndexReader[sr.size()])); // TODO: maybe take List<IR> here?
w.close();
}
@@ -176,18 +176,18 @@ public class MultiPassIndexSplitter {
/**
* This class emulates deletions on the underlying index.
*/
- private static final class FakeDeleteIndexReader extends BaseCompositeReader<FakeDeleteAtomicIndexReader> {
+ private static final class FakeDeleteIndexReader extends BaseCompositeReader<FakeDeleteLeafIndexReader> {
public FakeDeleteIndexReader(IndexReader reader) {
super(initSubReaders(reader));
}
- private static FakeDeleteAtomicIndexReader[] initSubReaders(IndexReader reader) {
- final List<AtomicReaderContext> leaves = reader.leaves();
- final FakeDeleteAtomicIndexReader[] subs = new FakeDeleteAtomicIndexReader[leaves.size()];
+ private static FakeDeleteLeafIndexReader[] initSubReaders(IndexReader reader) {
+ final List<LeafReaderContext> leaves = reader.leaves();
+ final FakeDeleteLeafIndexReader[] subs = new FakeDeleteLeafIndexReader[leaves.size()];
int i = 0;
- for (final AtomicReaderContext ctx : leaves) {
- subs[i++] = new FakeDeleteAtomicIndexReader(ctx.reader());
+ for (final LeafReaderContext ctx : leaves) {
+ subs[i++] = new FakeDeleteLeafIndexReader(ctx.reader());
}
return subs;
}
@@ -198,7 +198,7 @@ public class MultiPassIndexSplitter {
}
public void undeleteAll() {
- for (FakeDeleteAtomicIndexReader r : getSequentialSubReaders()) {
+ for (FakeDeleteLeafIndexReader r : getSequentialSubReaders()) {
r.undeleteAll();
}
}
@@ -210,10 +210,10 @@ public class MultiPassIndexSplitter {
// as we pass the subreaders directly to IW.addIndexes().
}
- private static final class FakeDeleteAtomicIndexReader extends FilterAtomicReader {
+ private static final class FakeDeleteLeafIndexReader extends FilterLeafReader {
FixedBitSet liveDocs;
- public FakeDeleteAtomicIndexReader(AtomicReader reader) {
+ public FakeDeleteLeafIndexReader(LeafReader reader) {
super(reader);
undeleteAll(); // initialize main bitset
}
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java Wed Sep 24 01:20:36 2014
@@ -101,11 +101,11 @@ public class PKIndexSplitter {
boolean success = false;
final IndexWriter w = new IndexWriter(target, config);
try {
- final List<AtomicReaderContext> leaves = reader.leaves();
+ final List<LeafReaderContext> leaves = reader.leaves();
final IndexReader[] subReaders = new IndexReader[leaves.size()];
int i = 0;
- for (final AtomicReaderContext ctx : leaves) {
- subReaders[i++] = new DocumentFilteredAtomicIndexReader(ctx, preserveFilter, negateFilter);
+ for (final LeafReaderContext ctx : leaves) {
+ subReaders[i++] = new DocumentFilteredLeafIndexReader(ctx, preserveFilter, negateFilter);
}
w.addIndexes(subReaders);
success = true;
@@ -118,11 +118,11 @@ public class PKIndexSplitter {
}
}
- private static class DocumentFilteredAtomicIndexReader extends FilterAtomicReader {
+ private static class DocumentFilteredLeafIndexReader extends FilterLeafReader {
final Bits liveDocs;
final int numDocs;
- public DocumentFilteredAtomicIndexReader(AtomicReaderContext context, Filter preserveFilter, boolean negateFilter) throws IOException {
+ public DocumentFilteredLeafIndexReader(LeafReaderContext context, Filter preserveFilter, boolean negateFilter) throws IOException {
super(context.reader());
final int maxDoc = in.maxDoc();
final FixedBitSet bits = new FixedBitSet(maxDoc);
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/BlockJoinComparatorSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/BlockJoinComparatorSource.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/BlockJoinComparatorSource.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/BlockJoinComparatorSource.java Wed Sep 24 01:20:36 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.index.sorter;
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.FieldComparatorSource;
@@ -143,7 +143,7 @@ public class BlockJoinComparatorSource e
}
@Override
- public FieldComparator<Integer> setNextReader(AtomicReaderContext context) throws IOException {
+ public FieldComparator<Integer> setNextReader(LeafReaderContext context) throws IOException {
final DocIdSet parents = parentsFilter.getDocIdSet(context, null);
if (parents == null) {
throw new IllegalStateException("AtomicReader " + context.reader() + " contains no parents!");
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/EarlyTerminatingSortingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/EarlyTerminatingSortingCollector.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/EarlyTerminatingSortingCollector.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/EarlyTerminatingSortingCollector.java Wed Sep 24 01:20:36 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.index.sorter;
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.CollectionTerminatedException;
@@ -92,7 +92,7 @@ public class EarlyTerminatingSortingColl
}
@Override
- public LeafCollector getLeafCollector(AtomicReaderContext context) throws IOException {
+ public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
if (SortingMergePolicy.isSorted(context.reader(), sort)) {
// segment is sorted, can early-terminate
return new FilterLeafCollector(super.getLeafCollector(context)) {
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/Sorter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/Sorter.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/Sorter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/Sorter.java Wed Sep 24 01:20:36 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.index.sorter;
import java.io.IOException;
import java.util.Comparator;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Scorer;
@@ -61,8 +61,8 @@ final class Sorter {
abstract int newToOld(int docID);
/** Return the number of documents in this map. This must be equal to the
- * {@link AtomicReader#maxDoc() number of documents} of the
- * {@link AtomicReader} which is sorted. */
+ * {@link org.apache.lucene.index.LeafReader#maxDoc() number of documents} of the
+ * {@link org.apache.lucene.index.LeafReader} which is sorted. */
abstract int size();
}
@@ -211,7 +211,7 @@ final class Sorter {
* <b>NOTE:</b> deleted documents are expected to appear in the mapping as
* well, they will however be marked as deleted in the sorted view.
*/
- DocMap sort(AtomicReader reader) throws IOException {
+ DocMap sort(LeafReader reader) throws IOException {
SortField fields[] = sort.getSort();
final int reverseMul[] = new int[fields.length];
final FieldComparator<?> comparators[] = new FieldComparator[fields.length];
Copied: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingLeafReader.java (from r1627177, lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingLeafReader.java?p2=lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingLeafReader.java&p1=lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java&r1=1627177&r2=1627188&rev=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingLeafReader.java Wed Sep 24 01:20:36 2014
@@ -20,14 +20,14 @@ package org.apache.lucene.index.sorter;
import java.io.IOException;
import java.util.Arrays;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.FilterLeafReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.FilterAtomicReader;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.index.SortedNumericDocValues;
@@ -50,7 +50,7 @@ import org.apache.lucene.util.TimSorter;
import org.apache.lucene.util.automaton.CompiledAutomaton;
/**
- * An {@link AtomicReader} which supports sorting documents by a given
+ * An {@link org.apache.lucene.index.LeafReader} which supports sorting documents by a given
* {@link Sort}. You can use this class to sort an index as follows:
*
* <pre class="prettyprint">
@@ -65,7 +65,7 @@ import org.apache.lucene.util.automaton.
*
* @lucene.experimental
*/
-public class SortingAtomicReader extends FilterAtomicReader {
+public class SortingLeafReader extends FilterLeafReader {
private static class SortingFields extends FilterFields {
@@ -739,12 +739,12 @@ public class SortingAtomicReader extends
/** Return a sorted view of <code>reader</code> according to the order
* defined by <code>sort</code>. If the reader is already sorted, this
* method might return the reader as-is. */
- public static AtomicReader wrap(AtomicReader reader, Sort sort) throws IOException {
+ public static LeafReader wrap(LeafReader reader, Sort sort) throws IOException {
return wrap(reader, new Sorter(sort).sort(reader));
}
- /** Expert: same as {@link #wrap(AtomicReader, Sort)} but operates directly on a {@link Sorter.DocMap}. */
- static AtomicReader wrap(AtomicReader reader, Sorter.DocMap docMap) {
+ /** Expert: same as {@link #wrap(org.apache.lucene.index.LeafReader, Sort)} but operates directly on a {@link Sorter.DocMap}. */
+ static LeafReader wrap(LeafReader reader, Sorter.DocMap docMap) {
if (docMap == null) {
// the reader is already sorter
return reader;
@@ -753,12 +753,12 @@ public class SortingAtomicReader extends
throw new IllegalArgumentException("reader.maxDoc() should be equal to docMap.size(), got" + reader.maxDoc() + " != " + docMap.size());
}
assert Sorter.isConsistent(docMap);
- return new SortingAtomicReader(reader, docMap);
+ return new SortingLeafReader(reader, docMap);
}
final Sorter.DocMap docMap; // pkg-protected to avoid synthetic accessor methods
- private SortingAtomicReader(final AtomicReader in, final Sorter.DocMap docMap) {
+ private SortingLeafReader(final LeafReader in, final Sorter.DocMap docMap) {
super(in);
this.docMap = docMap;
}
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingMergePolicy.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingMergePolicy.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingMergePolicy.java Wed Sep 24 01:20:36 2014
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.lucene.analysis.Analyzer; // javadocs
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.MergePolicy;
@@ -64,27 +64,27 @@ public final class SortingMergePolicy ex
class SortingOneMerge extends OneMerge {
- List<AtomicReader> unsortedReaders;
+ List<LeafReader> unsortedReaders;
Sorter.DocMap docMap;
- AtomicReader sortedView;
+ LeafReader sortedView;
SortingOneMerge(List<SegmentCommitInfo> segments) {
super(segments);
}
@Override
- public List<AtomicReader> getMergeReaders() throws IOException {
+ public List<LeafReader> getMergeReaders() throws IOException {
if (unsortedReaders == null) {
unsortedReaders = super.getMergeReaders();
- final AtomicReader atomicView;
+ final LeafReader atomicView;
if (unsortedReaders.size() == 1) {
atomicView = unsortedReaders.get(0);
} else {
- final IndexReader multiReader = new MultiReader(unsortedReaders.toArray(new AtomicReader[unsortedReaders.size()]));
+ final IndexReader multiReader = new MultiReader(unsortedReaders.toArray(new LeafReader[unsortedReaders.size()]));
atomicView = SlowCompositeReaderWrapper.wrap(multiReader);
}
docMap = sorter.sort(atomicView);
- sortedView = SortingAtomicReader.wrap(atomicView, docMap);
+ sortedView = SortingLeafReader.wrap(atomicView, docMap);
}
// a null doc map means that the readers are already sorted
return docMap == null ? unsortedReaders : Collections.singletonList(sortedView);
@@ -97,10 +97,10 @@ public final class SortingMergePolicy ex
super.setInfo(info);
}
- private PackedLongValues getDeletes(List<AtomicReader> readers) {
+ private PackedLongValues getDeletes(List<LeafReader> readers) {
PackedLongValues.Builder deletes = PackedLongValues.monotonicBuilder(PackedInts.COMPACT);
int deleteCount = 0;
- for (AtomicReader reader : readers) {
+ for (LeafReader reader : readers) {
final int maxDoc = reader.maxDoc();
final Bits liveDocs = reader.getLiveDocs();
for (int i = 0; i < maxDoc; ++i) {
@@ -151,7 +151,7 @@ public final class SortingMergePolicy ex
}
/** Returns {@code true} if the given {@code reader} is sorted by the specified {@code sort}. */
- public static boolean isSorted(AtomicReader reader, Sort sort) {
+ public static boolean isSorted(LeafReader reader, Sort sort) {
if (reader instanceof SegmentReader) {
final SegmentReader segReader = (SegmentReader) reader;
final Map<String, String> diagnostics = segReader.getSegmentInfo().info.getDiagnostics();
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java Wed Sep 24 01:20:36 2014
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.lucene.codecs.PostingsFormat; // javadocs
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
@@ -188,21 +188,21 @@ public class DocTermOrds implements Acco
}
/** Inverts all terms */
- public DocTermOrds(AtomicReader reader, Bits liveDocs, String field) throws IOException {
+ public DocTermOrds(LeafReader reader, Bits liveDocs, String field) throws IOException {
this(reader, liveDocs, field, null, Integer.MAX_VALUE);
}
// TODO: instead of all these ctors and options, take termsenum!
/** Inverts only terms starting w/ prefix */
- public DocTermOrds(AtomicReader reader, Bits liveDocs, String field, BytesRef termPrefix) throws IOException {
+ public DocTermOrds(LeafReader reader, Bits liveDocs, String field, BytesRef termPrefix) throws IOException {
this(reader, liveDocs, field, termPrefix, Integer.MAX_VALUE);
}
/** Inverts only terms starting w/ prefix, and only terms
* whose docFreq (not taking deletions into account) is
* <= maxTermDocFreq */
- public DocTermOrds(AtomicReader reader, Bits liveDocs, String field, BytesRef termPrefix, int maxTermDocFreq) throws IOException {
+ public DocTermOrds(LeafReader reader, Bits liveDocs, String field, BytesRef termPrefix, int maxTermDocFreq) throws IOException {
this(reader, liveDocs, field, termPrefix, maxTermDocFreq, DEFAULT_INDEX_INTERVAL_BITS);
}
@@ -210,7 +210,7 @@ public class DocTermOrds implements Acco
* whose docFreq (not taking deletions into account) is
* <= maxTermDocFreq, with a custom indexing interval
* (default is every 128nd term). */
- public DocTermOrds(AtomicReader reader, Bits liveDocs, String field, BytesRef termPrefix, int maxTermDocFreq, int indexIntervalBits) throws IOException {
+ public DocTermOrds(LeafReader reader, Bits liveDocs, String field, BytesRef termPrefix, int maxTermDocFreq, int indexIntervalBits) throws IOException {
this(field, maxTermDocFreq, indexIntervalBits);
uninvert(reader, liveDocs, termPrefix);
}
@@ -236,7 +236,7 @@ public class DocTermOrds implements Acco
*
* <p><b>NOTE</b>: you must pass the same reader that was
* used when creating this class */
- public TermsEnum getOrdTermsEnum(AtomicReader reader) throws IOException {
+ public TermsEnum getOrdTermsEnum(LeafReader reader) throws IOException {
if (indexedTermsArray == null) {
//System.out.println("GET normal enum");
final Fields fields = reader.fields();
@@ -273,14 +273,14 @@ public class DocTermOrds implements Acco
protected void visitTerm(TermsEnum te, int termNum) throws IOException {
}
- /** Invoked during {@link #uninvert(AtomicReader,Bits,BytesRef)}
+ /** Invoked during {@link #uninvert(org.apache.lucene.index.LeafReader,Bits,BytesRef)}
* to record the document frequency for each uninverted
* term. */
protected void setActualDocFreq(int termNum, int df) throws IOException {
}
/** Call this only once (if you subclass!) */
- protected void uninvert(final AtomicReader reader, Bits liveDocs, final BytesRef termPrefix) throws IOException {
+ protected void uninvert(final LeafReader reader, Bits liveDocs, final BytesRef termPrefix) throws IOException {
final FieldInfo info = reader.getFieldInfos().fieldInfo(field);
if (info != null && info.hasDocValues()) {
throw new IllegalStateException("Type mismatch: " + field + " was indexed as " + info.getDocValuesType());
@@ -622,7 +622,7 @@ public class DocTermOrds implements Acco
private BytesRef term;
private long ord = -indexInterval-1; // force "real" seek
- public OrdWrappedTermsEnum(AtomicReader reader) throws IOException {
+ public OrdWrappedTermsEnum(LeafReader reader) throws IOException {
assert indexedTermsArray != null;
termsEnum = reader.fields().terms(field).iterator(null);
}
@@ -777,7 +777,7 @@ public class DocTermOrds implements Acco
}
/** Returns a SortedSetDocValues view of this instance */
- public SortedSetDocValues iterator(AtomicReader reader) throws IOException {
+ public SortedSetDocValues iterator(LeafReader reader) throws IOException {
if (isEmpty()) {
return DocValues.emptySortedSet();
} else {
@@ -786,7 +786,7 @@ public class DocTermOrds implements Acco
}
private class Iterator extends SortedSetDocValues {
- final AtomicReader reader;
+ final LeafReader reader;
final TermsEnum te; // used internally for lookupOrd() and lookupTerm()
// currently we read 5 at a time (using the logic of the old iterator)
final int buffer[] = new int[5];
@@ -797,7 +797,7 @@ public class DocTermOrds implements Acco
private int upto;
private byte[] arr;
- Iterator(AtomicReader reader) throws IOException {
+ Iterator(LeafReader reader) throws IOException {
this.reader = reader;
this.te = termsEnum();
}
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java Wed Sep 24 01:20:36 2014
@@ -27,7 +27,7 @@ import org.apache.lucene.document.FloatF
import org.apache.lucene.document.IntField;
import org.apache.lucene.document.LongField;
import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.IndexReader; // javadocs
import org.apache.lucene.index.NumericDocValues;
@@ -184,12 +184,12 @@ interface FieldCache {
* <code>reader.maxDoc()</code>, with turned on bits for each docid that
* does have a value for this field.
*/
- public Bits getDocsWithField(AtomicReader reader, String field) throws IOException;
+ public Bits getDocsWithField(LeafReader reader, String field) throws IOException;
/**
* Returns a {@link NumericDocValues} over the values found in documents in the given
* field. If the field was indexed as {@link NumericDocValuesField}, it simply
- * uses {@link AtomicReader#getNumericDocValues(String)} to read the values.
+ * uses {@link org.apache.lucene.index.LeafReader#getNumericDocValues(String)} to read the values.
* Otherwise, it checks the internal cache for an appropriate entry, and if
* none is found, reads the terms in <code>field</code> as longs and returns
* an array of size <code>reader.maxDoc()</code> of the value each document
@@ -210,7 +210,7 @@ interface FieldCache {
* @throws IOException
* If any error occurs.
*/
- public NumericDocValues getNumerics(AtomicReader reader, String field, Parser parser, boolean setDocsWithField) throws IOException;
+ public NumericDocValues getNumerics(LeafReader reader, String field, Parser parser, boolean setDocsWithField) throws IOException;
/** Checks the internal cache for an appropriate entry, and if none
* is found, reads the term values in <code>field</code>
@@ -223,14 +223,14 @@ interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public BinaryDocValues getTerms(AtomicReader reader, String field, boolean setDocsWithField) throws IOException;
+ public BinaryDocValues getTerms(LeafReader reader, String field, boolean setDocsWithField) throws IOException;
- /** Expert: just like {@link #getTerms(AtomicReader,String,boolean)},
+ /** Expert: just like {@link #getTerms(org.apache.lucene.index.LeafReader,String,boolean)},
* but you can specify whether more RAM should be consumed in exchange for
* faster lookups (default is "true"). Note that the
* first call for a given reader and field "wins",
* subsequent calls will share the same cache entry. */
- public BinaryDocValues getTerms(AtomicReader reader, String field, boolean setDocsWithField, float acceptableOverheadRatio) throws IOException;
+ public BinaryDocValues getTerms(LeafReader reader, String field, boolean setDocsWithField, float acceptableOverheadRatio) throws IOException;
/** Checks the internal cache for an appropriate entry, and if none
* is found, reads the term values in <code>field</code>
@@ -242,15 +242,15 @@ interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public SortedDocValues getTermsIndex(AtomicReader reader, String field) throws IOException;
+ public SortedDocValues getTermsIndex(LeafReader reader, String field) throws IOException;
/** Expert: just like {@link
- * #getTermsIndex(AtomicReader,String)}, but you can specify
+ * #getTermsIndex(org.apache.lucene.index.LeafReader,String)}, but you can specify
* whether more RAM should be consumed in exchange for
* faster lookups (default is "true"). Note that the
* first call for a given reader and field "wins",
* subsequent calls will share the same cache entry. */
- public SortedDocValues getTermsIndex(AtomicReader reader, String field, float acceptableOverheadRatio) throws IOException;
+ public SortedDocValues getTermsIndex(LeafReader reader, String field, float acceptableOverheadRatio) throws IOException;
/** Can be passed to {@link #getDocTermOrds} to filter for 32-bit numeric terms */
public static final BytesRef INT32_TERM_PREFIX = new BytesRef(new byte[] { NumericUtils.SHIFT_START_INT });
@@ -270,7 +270,7 @@ interface FieldCache {
* @return a {@link DocTermOrds} instance
* @throws IOException If any error occurs.
*/
- public SortedSetDocValues getDocTermOrds(AtomicReader reader, String field, BytesRef prefix) throws IOException;
+ public SortedSetDocValues getDocTermOrds(LeafReader reader, String field, BytesRef prefix) throws IOException;
/**
* EXPERT: A unique Identifier/Description for each item in the FieldCache.
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java Wed Sep 24 01:20:36 2014
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocsEnum;
@@ -114,7 +114,7 @@ class FieldCacheImpl implements FieldCac
}
};
- private void initReader(AtomicReader reader) {
+ private void initReader(LeafReader reader) {
reader.addCoreClosedListener(purgeCore);
}
@@ -129,7 +129,7 @@ class FieldCacheImpl implements FieldCac
final Map<Object,Map<CacheKey,Accountable>> readerCache = new WeakHashMap<>();
- protected abstract Accountable createValue(AtomicReader reader, CacheKey key, boolean setDocsWithField)
+ protected abstract Accountable createValue(LeafReader reader, CacheKey key, boolean setDocsWithField)
throws IOException;
/** Remove this reader from the cache, if present. */
@@ -141,7 +141,7 @@ class FieldCacheImpl implements FieldCac
/** Sets the key to the value for the provided reader;
* if the key is already set then this doesn't change it. */
- public void put(AtomicReader reader, CacheKey key, Accountable value) {
+ public void put(LeafReader reader, CacheKey key, Accountable value) {
final Object readerKey = reader.getCoreCacheKey();
synchronized (readerCache) {
Map<CacheKey,Accountable> innerCache = readerCache.get(readerKey);
@@ -160,7 +160,7 @@ class FieldCacheImpl implements FieldCac
}
}
- public Object get(AtomicReader reader, CacheKey key, boolean setDocsWithField) throws IOException {
+ public Object get(LeafReader reader, CacheKey key, boolean setDocsWithField) throws IOException {
Map<CacheKey,Accountable> innerCache;
Accountable value;
final Object readerKey = reader.getCoreCacheKey();
@@ -261,7 +261,7 @@ class FieldCacheImpl implements FieldCac
public Bits docsWithField;
- public void uninvert(AtomicReader reader, String field, boolean setDocsWithField) throws IOException {
+ public void uninvert(LeafReader reader, String field, boolean setDocsWithField) throws IOException {
final int maxDoc = reader.maxDoc();
Terms terms = reader.terms(field);
if (terms != null) {
@@ -310,7 +310,7 @@ class FieldCacheImpl implements FieldCac
}
// null Bits means no docs matched
- void setDocsWithField(AtomicReader reader, String field, Bits docsWithField) {
+ void setDocsWithField(LeafReader reader, String field, Bits docsWithField) {
final int maxDoc = reader.maxDoc();
final Bits bits;
if (docsWithField == null) {
@@ -351,7 +351,7 @@ class FieldCacheImpl implements FieldCac
public long minValue;
}
- public Bits getDocsWithField(AtomicReader reader, String field) throws IOException {
+ public Bits getDocsWithField(LeafReader reader, String field) throws IOException {
final FieldInfo fieldInfo = reader.getFieldInfos().fieldInfo(field);
if (fieldInfo == null) {
// field does not exist or has no value
@@ -394,7 +394,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected BitsEntry createValue(AtomicReader reader, CacheKey key, boolean setDocsWithField /* ignored */)
+ protected BitsEntry createValue(LeafReader reader, CacheKey key, boolean setDocsWithField /* ignored */)
throws IOException {
final String field = key.field;
final int maxDoc = reader.maxDoc();
@@ -446,7 +446,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- public NumericDocValues getNumerics(AtomicReader reader, String field, Parser parser, boolean setDocsWithField) throws IOException {
+ public NumericDocValues getNumerics(LeafReader reader, String field, Parser parser, boolean setDocsWithField) throws IOException {
if (parser == null) {
throw new NullPointerException();
}
@@ -499,7 +499,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Accountable createValue(final AtomicReader reader, CacheKey key, boolean setDocsWithField)
+ protected Accountable createValue(final LeafReader reader, CacheKey key, boolean setDocsWithField)
throws IOException {
final Parser parser = (Parser) key.custom;
@@ -620,11 +620,11 @@ class FieldCacheImpl implements FieldCac
}
}
- public SortedDocValues getTermsIndex(AtomicReader reader, String field) throws IOException {
+ public SortedDocValues getTermsIndex(LeafReader reader, String field) throws IOException {
return getTermsIndex(reader, field, PackedInts.FAST);
}
- public SortedDocValues getTermsIndex(AtomicReader reader, String field, float acceptableOverheadRatio) throws IOException {
+ public SortedDocValues getTermsIndex(LeafReader reader, String field, float acceptableOverheadRatio) throws IOException {
SortedDocValues valuesIn = reader.getSortedDocValues(field);
if (valuesIn != null) {
// Not cached here by FieldCacheImpl (cached instead
@@ -652,7 +652,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Accountable createValue(AtomicReader reader, CacheKey key, boolean setDocsWithField /* ignored */)
+ protected Accountable createValue(LeafReader reader, CacheKey key, boolean setDocsWithField /* ignored */)
throws IOException {
final int maxDoc = reader.maxDoc();
@@ -764,11 +764,11 @@ class FieldCacheImpl implements FieldCac
// TODO: this if DocTermsIndex was already created, we
// should share it...
- public BinaryDocValues getTerms(AtomicReader reader, String field, boolean setDocsWithField) throws IOException {
+ public BinaryDocValues getTerms(LeafReader reader, String field, boolean setDocsWithField) throws IOException {
return getTerms(reader, field, setDocsWithField, PackedInts.FAST);
}
- public BinaryDocValues getTerms(AtomicReader reader, String field, boolean setDocsWithField, float acceptableOverheadRatio) throws IOException {
+ public BinaryDocValues getTerms(LeafReader reader, String field, boolean setDocsWithField, float acceptableOverheadRatio) throws IOException {
BinaryDocValues valuesIn = reader.getBinaryDocValues(field);
if (valuesIn == null) {
valuesIn = reader.getSortedDocValues(field);
@@ -799,7 +799,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Accountable createValue(AtomicReader reader, CacheKey key, boolean setDocsWithField)
+ protected Accountable createValue(LeafReader reader, CacheKey key, boolean setDocsWithField)
throws IOException {
// TODO: would be nice to first check if DocTermsIndex
@@ -889,7 +889,7 @@ class FieldCacheImpl implements FieldCac
// TODO: this if DocTermsIndex was already created, we
// should share it...
- public SortedSetDocValues getDocTermOrds(AtomicReader reader, String field, BytesRef prefix) throws IOException {
+ public SortedSetDocValues getDocTermOrds(LeafReader reader, String field, BytesRef prefix) throws IOException {
// not a general purpose filtering mechanism...
assert prefix == null || prefix == INT32_TERM_PREFIX || prefix == INT64_TERM_PREFIX;
@@ -937,7 +937,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Accountable createValue(AtomicReader reader, CacheKey key, boolean setDocsWithField /* ignored */)
+ protected Accountable createValue(LeafReader reader, CacheKey key, boolean setDocsWithField /* ignored */)
throws IOException {
BytesRef prefix = (BytesRef) key.custom;
return new DocTermOrds(reader, null, key.field, prefix);
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java Wed Sep 24 01:20:36 2014
@@ -30,20 +30,18 @@ import org.apache.lucene.document.Numeri
import org.apache.lucene.document.SortedDocValuesField; // javadocs
import org.apache.lucene.document.SortedSetDocValuesField; // javadocs
import org.apache.lucene.document.StringField; // javadocs
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.FilterLeafReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.FilterAtomicReader;
import org.apache.lucene.index.FilterDirectoryReader;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.uninverting.FieldCache.CacheEntry;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.NumericUtils;
/**
* A FilterReader that exposes <i>indexed</i> values as if they also had
@@ -52,11 +50,11 @@ import org.apache.lucene.util.NumericUti
* This is accomplished by "inverting the inverted index" or "uninversion".
* <p>
* The uninversion process happens lazily: upon the first request for the
- * field's docvalues (e.g. via {@link AtomicReader#getNumericDocValues(String)}
+ * field's docvalues (e.g. via {@link org.apache.lucene.index.LeafReader#getNumericDocValues(String)}
* or similar), it will create the docvalues on-the-fly if needed and cache it,
* based on the core cache key of the wrapped AtomicReader.
*/
-public class UninvertingReader extends FilterAtomicReader {
+public class UninvertingReader extends FilterLeafReader {
/**
* Specifies the type of uninversion to apply for the field.
@@ -156,7 +154,7 @@ public class UninvertingReader extends F
public UninvertingDirectoryReader(DirectoryReader in, final Map<String,Type> mapping) {
super(in, new FilterDirectoryReader.SubReaderWrapper() {
@Override
- public AtomicReader wrap(AtomicReader reader) {
+ public LeafReader wrap(LeafReader reader) {
return new UninvertingReader(reader, mapping);
}
});
@@ -180,7 +178,7 @@ public class UninvertingReader extends F
*
* @lucene.internal
*/
- public UninvertingReader(AtomicReader in, Map<String,Type> mapping) {
+ public UninvertingReader(LeafReader in, Map<String,Type> mapping) {
super(in);
this.mapping = mapping;
ArrayList<FieldInfo> filteredInfos = new ArrayList<>();
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java Wed Sep 24 01:20:36 2014
@@ -68,7 +68,7 @@ public class IndexSortingTest extends So
Directory target = newDirectory();
IndexWriter writer = new IndexWriter(target, newIndexWriterConfig(null));
- reader = SortingAtomicReader.wrap(reader, sorter);
+ reader = SortingLeafReader.wrap(reader, sorter);
writer.addIndexes(reader);
writer.close();
reader.close();
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java Wed Sep 24 01:20:36 2014
@@ -40,8 +40,8 @@ import org.apache.lucene.document.Sorted
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.LeafReader;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
@@ -59,8 +59,8 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.TermsEnum.SeekStatus;
-import org.apache.lucene.index.sorter.SortingAtomicReader.SortingDocsAndPositionsEnum;
-import org.apache.lucene.index.sorter.SortingAtomicReader.SortingDocsEnum;
+import org.apache.lucene.index.sorter.SortingLeafReader.SortingDocsAndPositionsEnum;
+import org.apache.lucene.index.sorter.SortingLeafReader.SortingDocsEnum;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.TermStatistics;
@@ -100,7 +100,7 @@ public abstract class SorterTestBase ext
}
@Override
- public SimScorer simScorer(SimWeight weight, AtomicReaderContext context) throws IOException {
+ public SimScorer simScorer(SimWeight weight, LeafReaderContext context) throws IOException {
return in.simScorer(weight, context);
}
@@ -167,7 +167,7 @@ public abstract class SorterTestBase ext
}
protected static Directory dir;
- protected static AtomicReader reader;
+ protected static LeafReader reader;
protected static Integer[] sortedValues;
private static Document doc(final int id, PositionsTokenStream positions) {
Copied: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SortingLeafReaderTest.java (from r1627177, lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SortingAtomicReaderTest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SortingLeafReaderTest.java?p2=lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SortingLeafReaderTest.java&p1=lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SortingAtomicReaderTest.java&r1=1627177&r2=1627188&rev=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SortingAtomicReaderTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/SortingLeafReaderTest.java Wed Sep 24 01:20:36 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.TestUtil;
import org.junit.BeforeClass;
-public class SortingAtomicReaderTest extends SorterTestBase {
+public class SortingLeafReaderTest extends SorterTestBase {
@BeforeClass
public static void beforeClassSortingAtomicReaderTest() throws Exception {
@@ -47,7 +47,7 @@ public class SortingAtomicReaderTest ext
}
// sort the index by id (as integer, in NUMERIC_DV_FIELD)
- reader = SortingAtomicReader.wrap(reader, sort);
+ reader = SortingLeafReader.wrap(reader, sort);
if (VERBOSE) {
System.out.print("mapped-deleted-docs: ");
@@ -65,7 +65,7 @@ public class SortingAtomicReaderTest ext
public void testBadSort() throws Exception {
try {
- SortingAtomicReader.wrap(reader, Sort.RELEVANCE);
+ SortingLeafReader.wrap(reader, Sort.RELEVANCE);
fail("Didn't get expected exception");
} catch (IllegalArgumentException e) {
assertEquals("Cannot sort an index with a Sort that refers to the relevance score", e.getMessage());
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java Wed Sep 24 01:20:36 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.NumericDocValues;
@@ -53,7 +53,7 @@ public class TestBlockJoinSorter extends
}
@Override
- protected DocIdSet cacheImpl(DocIdSetIterator iterator, AtomicReader reader)
+ protected DocIdSet cacheImpl(DocIdSetIterator iterator, LeafReader reader)
throws IOException {
final FixedBitSet cached = new FixedBitSet(reader.maxDoc());
cached.or(iterator);
@@ -88,7 +88,7 @@ public class TestBlockJoinSorter extends
final DirectoryReader indexReader = writer.getReader();
writer.close();
- final AtomicReader reader = getOnlySegmentReader(indexReader);
+ final LeafReader reader = getOnlySegmentReader(indexReader);
final Filter parentsFilter = new FixedBitSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("parent", "true"))));
final FixedBitSet parentBits = (FixedBitSet) parentsFilter.getDocIdSet(reader.getContext(), null);
final NumericDocValues parentValues = reader.getNumericDocValues("parent_val");
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java Wed Sep 24 01:20:36 2014
@@ -29,7 +29,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.StringField;
-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;
@@ -167,7 +167,7 @@ public class TestEarlyTermination extend
Sort different = new Sort(new SortField("ndv2", SortField.Type.LONG));
searcher.search(query, new EarlyTerminatingSortingCollector(collector2, different, numHits) {
@Override
- public LeafCollector getLeafCollector(AtomicReaderContext context) throws IOException {
+ public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
final LeafCollector ret = super.getLeafCollector(context);
assertTrue("segment should not be recognized as sorted as different sorter was used", ret.getClass() == in.getLeafCollector(context).getClass());
return ret;
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java Wed Sep 24 01:20:36 2014
@@ -29,7 +29,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.StringField;
-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.IndexWriterConfig;
@@ -158,7 +158,7 @@ public class TestSortingMergePolicy exte
super.tearDown();
}
- private static void assertSorted(AtomicReader reader) throws IOException {
+ private static void assertSorted(LeafReader reader) throws IOException {
final NumericDocValues ndv = reader.getNumericDocValues("ndv");
for (int i = 1; i < reader.maxDoc(); ++i) {
assertTrue("ndv(" + (i-1) + ")=" + ndv.get(i-1) + ",ndv(" + i + ")=" + ndv.get(i), ndv.get(i-1) <= ndv.get(i));
@@ -166,8 +166,8 @@ public class TestSortingMergePolicy exte
}
public void testSortingMP() throws IOException {
- final AtomicReader sortedReader1 = SortingAtomicReader.wrap(SlowCompositeReaderWrapper.wrap(reader), sort);
- final AtomicReader sortedReader2 = SlowCompositeReaderWrapper.wrap(sortedReader);
+ final LeafReader sortedReader1 = SortingLeafReader.wrap(SlowCompositeReaderWrapper.wrap(reader), sort);
+ final LeafReader sortedReader2 = SlowCompositeReaderWrapper.wrap(sortedReader);
assertSorted(sortedReader1);
assertSorted(sortedReader2);
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java Wed Sep 24 01:20:36 2014
@@ -33,8 +33,8 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
import org.apache.lucene.document.LongField;
import org.apache.lucene.document.StringField;
-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.DirectoryReader;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
@@ -82,7 +82,7 @@ public class TestDocTermOrds extends Luc
final IndexReader r = w.getReader();
w.close();
- final AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
+ final LeafReader ar = SlowCompositeReaderWrapper.wrap(r);
final DocTermOrds dto = new DocTermOrds(ar, ar.getLiveDocs(), "field");
SortedSetDocValues iter = dto.iterator(ar);
@@ -173,7 +173,7 @@ public class TestDocTermOrds extends Luc
System.out.println("TEST: reader=" + r);
}
- for(AtomicReaderContext ctx : r.leaves()) {
+ for(LeafReaderContext ctx : r.leaves()) {
if (VERBOSE) {
System.out.println("\nTEST: sub=" + ctx.reader());
}
@@ -185,7 +185,7 @@ public class TestDocTermOrds extends Luc
if (VERBOSE) {
System.out.println("TEST: top reader");
}
- AtomicReader slowR = SlowCompositeReaderWrapper.wrap(r);
+ LeafReader slowR = SlowCompositeReaderWrapper.wrap(r);
verify(slowR, idToOrds, termsArray, null);
FieldCache.DEFAULT.purgeByCacheKey(slowR.getCoreCacheKey());
@@ -270,7 +270,7 @@ public class TestDocTermOrds extends Luc
System.out.println("TEST: reader=" + r);
}
- AtomicReader slowR = SlowCompositeReaderWrapper.wrap(r);
+ LeafReader slowR = SlowCompositeReaderWrapper.wrap(r);
for(String prefix : prefixesArray) {
final BytesRef prefixRef = prefix == null ? null : new BytesRef(prefix);
@@ -292,7 +292,7 @@ public class TestDocTermOrds extends Luc
idToOrdsPrefix[id] = newOrdsArray;
}
- for(AtomicReaderContext ctx : r.leaves()) {
+ for(LeafReaderContext ctx : r.leaves()) {
if (VERBOSE) {
System.out.println("\nTEST: sub=" + ctx.reader());
}
@@ -313,7 +313,7 @@ public class TestDocTermOrds extends Luc
dir.close();
}
- private void verify(AtomicReader r, int[][] idToOrds, BytesRef[] termsArray, BytesRef prefixRef) throws Exception {
+ private void verify(LeafReader r, int[][] idToOrds, BytesRef[] termsArray, BytesRef prefixRef) throws Exception {
final DocTermOrds dto = new DocTermOrds(r, r.getLiveDocs(),
"field",
@@ -442,7 +442,7 @@ public class TestDocTermOrds extends Luc
iw.close();
DirectoryReader ir = DirectoryReader.open(dir);
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
SortedSetDocValues v = FieldCache.DEFAULT.getDocTermOrds(ar, "foo", FieldCache.INT32_TERM_PREFIX);
assertEquals(2, v.getValueCount());
@@ -483,7 +483,7 @@ public class TestDocTermOrds extends Luc
iw.close();
DirectoryReader ir = DirectoryReader.open(dir);
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
SortedSetDocValues v = FieldCache.DEFAULT.getDocTermOrds(ar, "foo", FieldCache.INT64_TERM_PREFIX);
assertEquals(2, v.getValueCount());
@@ -532,7 +532,7 @@ public class TestDocTermOrds extends Luc
DirectoryReader ireader = iwriter.getReader();
iwriter.close();
- AtomicReader ar = getOnlySegmentReader(ireader);
+ LeafReader ar = getOnlySegmentReader(ireader);
SortedSetDocValues dv = FieldCache.DEFAULT.getDocTermOrds(ar, "field", null);
assertEquals(3, dv.getValueCount());
@@ -617,7 +617,7 @@ public class TestDocTermOrds extends Luc
iw.close();
DirectoryReader ir = DirectoryReader.open(dir);
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
SortedSetDocValues v = FieldCache.DEFAULT.getDocTermOrds(ar, "foo", null);
assertNotNull(DocValues.unwrapSingleton(v)); // actually a single-valued field
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java Wed Sep 24 01:20:36 2014
@@ -40,7 +40,7 @@ import org.apache.lucene.document.Numeri
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.document.StoredField;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -64,7 +64,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
public class TestFieldCache extends LuceneTestCase {
- private static AtomicReader reader;
+ private static LeafReader reader;
private static int NUM_DOCS;
private static int NUM_ORDS;
private static String[] unicodeStrings;
@@ -292,7 +292,7 @@ public class TestFieldCache extends Luce
IndexWriter writer= new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setMaxBufferedDocs(500));
writer.close();
IndexReader r = DirectoryReader.open(dir);
- AtomicReader reader = SlowCompositeReaderWrapper.wrap(r);
+ LeafReader reader = SlowCompositeReaderWrapper.wrap(r);
FieldCache.DEFAULT.getTerms(reader, "foobar", true);
FieldCache.DEFAULT.getTermsIndex(reader, "foobar");
FieldCache.DEFAULT.purgeByCacheKey(reader.getCoreCacheKey());
@@ -435,7 +435,7 @@ public class TestFieldCache extends Luce
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
iw.close();
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
// Binary type: can be retrieved via getTerms()
try {
@@ -565,7 +565,7 @@ public class TestFieldCache extends Luce
DirectoryReader ir = iw.getReader();
iw.close();
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
final FieldCache cache = FieldCache.DEFAULT;
cache.purgeAllCaches();
@@ -623,7 +623,7 @@ public class TestFieldCache extends Luce
DirectoryReader ir = iw.getReader();
iw.close();
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
final FieldCache cache = FieldCache.DEFAULT;
cache.purgeAllCaches();
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java Wed Sep 24 01:20:36 2014
@@ -21,7 +21,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
-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.NumericDocValues;
@@ -49,7 +49,7 @@ public class TestFieldCacheReopen extend
// Open reader1
DirectoryReader r = DirectoryReader.open(dir);
- AtomicReader r1 = getOnlySegmentReader(r);
+ LeafReader r1 = getOnlySegmentReader(r);
final NumericDocValues ints = FieldCache.DEFAULT.getNumerics(r1, "number", FieldCache.NUMERIC_UTILS_INT_PARSER, false);
assertEquals(17, ints.get(0));
@@ -61,7 +61,7 @@ public class TestFieldCacheReopen extend
DirectoryReader r2 = DirectoryReader.openIfChanged(r);
assertNotNull(r2);
r.close();
- AtomicReader sub0 = r2.leaves().get(0).reader();
+ LeafReader sub0 = r2.leaves().get(0).reader();
final NumericDocValues ints2 = FieldCache.DEFAULT.getNumerics(sub0, "number", FieldCache.NUMERIC_UTILS_INT_PARSER, false);
r2.close();
assertTrue(ints == ints2);
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java Wed Sep 24 01:20:36 2014
@@ -25,7 +25,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FloatField;
import org.apache.lucene.document.IntField;
import org.apache.lucene.document.LongField;
-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.MultiReader;
@@ -37,10 +37,10 @@ import org.apache.lucene.util.LuceneTest
public class TestFieldCacheSanityChecker extends LuceneTestCase {
- protected AtomicReader readerA;
- protected AtomicReader readerB;
- protected AtomicReader readerX;
- protected AtomicReader readerAclone;
+ protected LeafReader readerA;
+ protected LeafReader readerB;
+ protected LeafReader readerX;
+ protected LeafReader readerAclone;
protected Directory dirA, dirB;
private static final int NUM_DOCS = 1000;
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java Wed Sep 24 01:20:36 2014
@@ -32,7 +32,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
import org.apache.lucene.document.StringField;
-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;
@@ -277,7 +277,7 @@ public class TestFieldCacheSortRandom ex
}
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
final int maxDoc = context.reader().maxDoc();
final NumericDocValues idSource = DocValues.getNumeric(context.reader(), "id");
assertNotNull(idSource);
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java Wed Sep 24 01:20:36 2014
@@ -32,8 +32,8 @@ import org.apache.lucene.document.Numeri
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.document.StringField;
-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.BinaryDocValues;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValues;
@@ -190,7 +190,7 @@ public class TestFieldCacheVsDocValues e
}
w.close();
- AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
+ LeafReader ar = SlowCompositeReaderWrapper.wrap(r);
BinaryDocValues s = FieldCache.DEFAULT.getTerms(ar, "field", false);
for(int docID=0;docID<docBytes.size();docID++) {
@@ -263,7 +263,7 @@ public class TestFieldCacheVsDocValues e
DirectoryReader r = DirectoryReader.open(w, true);
w.close();
- AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
+ LeafReader ar = SlowCompositeReaderWrapper.wrap(r);
BinaryDocValues s = FieldCache.DEFAULT.getTerms(ar, "field", false);
for(int docID=0;docID<docBytes.size();docID++) {
@@ -319,8 +319,8 @@ public class TestFieldCacheVsDocValues e
// compare
DirectoryReader ir = DirectoryReader.open(dir);
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
SortedDocValues expected = FieldCache.DEFAULT.getTermsIndex(r, "indexed");
SortedDocValues actual = r.getSortedDocValues("dv");
assertEquals(r.maxDoc(), expected, actual);
@@ -377,8 +377,8 @@ public class TestFieldCacheVsDocValues e
// compare per-segment
DirectoryReader ir = writer.getReader();
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
SortedSetDocValues expected = FieldCache.DEFAULT.getDocTermOrds(r, "indexed", null);
SortedSetDocValues actual = r.getSortedSetDocValues("dv");
assertEquals(r.maxDoc(), expected, actual);
@@ -389,7 +389,7 @@ public class TestFieldCacheVsDocValues e
// now compare again after the merge
ir = writer.getReader();
- AtomicReader ar = getOnlySegmentReader(ir);
+ LeafReader ar = getOnlySegmentReader(ir);
SortedSetDocValues expected = FieldCache.DEFAULT.getDocTermOrds(ar, "indexed", null);
SortedSetDocValues actual = ar.getSortedSetDocValues("dv");
assertEquals(ir.maxDoc(), expected, actual);
@@ -446,8 +446,8 @@ public class TestFieldCacheVsDocValues e
// compare
DirectoryReader ir = DirectoryReader.open(dir);
- for (AtomicReaderContext context : ir.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : ir.leaves()) {
+ LeafReader r = context.reader();
Bits expected = FieldCache.DEFAULT.getDocsWithField(r, "indexed");
Bits actual = FieldCache.DEFAULT.getDocsWithField(r, "dv");
assertEquals(expected, actual);
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java Wed Sep 24 01:20:36 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.document.Binary
import org.apache.lucene.document.Document;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -72,7 +72,7 @@ public class TestFieldCacheWithThreads e
w.close();
assertEquals(1, r.leaves().size());
- final AtomicReader ar = r.leaves().get(0).reader();
+ final LeafReader ar = r.leaves().get(0).reader();
int numThreads = TestUtil.nextInt(random(), 2, 5);
List<Thread> threads = new ArrayList<>();
@@ -181,7 +181,7 @@ public class TestFieldCacheWithThreads e
final DirectoryReader r = writer.getReader();
writer.close();
- final AtomicReader sr = getOnlySegmentReader(r);
+ final LeafReader sr = getOnlySegmentReader(r);
final long END_TIME = System.currentTimeMillis() + (TEST_NIGHTLY ? 30 : 1);
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java Wed Sep 24 01:20:36 2014
@@ -24,7 +24,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
import org.apache.lucene.document.LongField;
-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.SortedSetDocValues;
@@ -55,7 +55,7 @@ public class TestUninvertingReader exten
DirectoryReader ir = UninvertingReader.wrap(DirectoryReader.open(dir),
Collections.singletonMap("foo", Type.SORTED_SET_INTEGER));
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
SortedSetDocValues v = ar.getSortedSetDocValues("foo");
assertEquals(2, v.getValueCount());
@@ -96,7 +96,7 @@ public class TestUninvertingReader exten
DirectoryReader ir = UninvertingReader.wrap(DirectoryReader.open(dir),
Collections.singletonMap("foo", Type.SORTED_SET_FLOAT));
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
SortedSetDocValues v = ar.getSortedSetDocValues("foo");
assertEquals(2, v.getValueCount());
@@ -138,7 +138,7 @@ public class TestUninvertingReader exten
DirectoryReader ir = UninvertingReader.wrap(DirectoryReader.open(dir),
Collections.singletonMap("foo", Type.SORTED_SET_LONG));
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
SortedSetDocValues v = ar.getSortedSetDocValues("foo");
assertEquals(2, v.getValueCount());
@@ -179,7 +179,7 @@ public class TestUninvertingReader exten
DirectoryReader ir = UninvertingReader.wrap(DirectoryReader.open(dir),
Collections.singletonMap("foo", Type.SORTED_SET_DOUBLE));
- AtomicReader ar = ir.leaves().get(0).reader();
+ LeafReader ar = ir.leaves().get(0).reader();
SortedSetDocValues v = ar.getSortedSetDocValues("foo");
assertEquals(2, v.getValueCount());
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/BooleanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/BooleanFilter.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/BooleanFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/BooleanFilter.java Wed Sep 24 01:20:36 2014
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
-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.search.BitsFilteredDocIdSet;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.DocIdSet;
@@ -50,9 +50,9 @@ public class BooleanFilter extends Filte
* of the filters that have been added.
*/
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
FixedBitSet res = null;
- final AtomicReader reader = context.reader();
+ final LeafReader reader = context.reader();
boolean hasShouldClauses = false;
for (final FilterClause fc : clauses) {
@@ -101,7 +101,7 @@ public class BooleanFilter extends Filte
return BitsFilteredDocIdSet.wrap(res, acceptDocs);
}
- private static DocIdSetIterator getDISI(Filter filter, AtomicReaderContext context)
+ private static DocIdSetIterator getDISI(Filter filter, LeafReaderContext context)
throws IOException {
// we dont pass acceptDocs, we will filter at the end using an additional filter
final DocIdSet set = filter.getDocIdSet(context, null);
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java Wed Sep 24 01:20:36 2014
@@ -19,8 +19,8 @@ package org.apache.lucene.queries;
import java.io.IOException;
-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.search.BitsFilteredDocIdSet;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
@@ -98,7 +98,7 @@ public class ChainedFilter extends Filte
* {@link Filter#getDocIdSet}.
*/
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
int[] index = new int[1]; // use array as reference to modifiable int;
index[0] = 0; // an object attribute would not be thread safe.
if (logic != -1) {
@@ -110,7 +110,7 @@ public class ChainedFilter extends Filte
return BitsFilteredDocIdSet.wrap(getDocIdSet(context, DEFAULT, index), acceptDocs);
}
- private DocIdSetIterator getDISI(Filter filter, AtomicReaderContext context)
+ private DocIdSetIterator getDISI(Filter filter, LeafReaderContext context)
throws IOException {
// we dont pass acceptDocs, we will filter at the end using an additional filter
DocIdSet docIdSet = filter.getDocIdSet(context, null);
@@ -126,9 +126,9 @@ public class ChainedFilter extends Filte
}
}
- private FixedBitSet initialResult(AtomicReaderContext context, int logic, int[] index)
+ private FixedBitSet initialResult(LeafReaderContext context, int logic, int[] index)
throws IOException {
- AtomicReader reader = context.reader();
+ LeafReader reader = context.reader();
FixedBitSet result = new FixedBitSet(reader.maxDoc());
if (logic == AND) {
result.or(getDISI(chain[index[0]], context));
@@ -148,7 +148,7 @@ public class ChainedFilter extends Filte
* @param logic Logical operation
* @return DocIdSet
*/
- private DocIdSet getDocIdSet(AtomicReaderContext context, int logic, int[] index)
+ private DocIdSet getDocIdSet(LeafReaderContext context, int logic, int[] index)
throws IOException {
FixedBitSet result = initialResult(context, logic, index);
for (; index[0] < chain.length; index[0]++) {
@@ -165,7 +165,7 @@ public class ChainedFilter extends Filte
* @param logic Logical operation
* @return DocIdSet
*/
- private DocIdSet getDocIdSet(AtomicReaderContext context, int[] logic, int[] index)
+ private DocIdSet getDocIdSet(LeafReaderContext context, int[] logic, int[] index)
throws IOException {
if (logic.length != chain.length) {
throw new IllegalArgumentException("Invalid number of elements in logic array");
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java Wed Sep 24 01:20:36 2014
@@ -16,7 +16,7 @@ package org.apache.lucene.queries;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
@@ -153,7 +153,7 @@ public class CommonTermsQuery extends Qu
tq.setBoost(getBoost());
return tq;
}
- final List<AtomicReaderContext> leaves = reader.leaves();
+ final List<LeafReaderContext> leaves = reader.leaves();
final int maxDoc = reader.maxDoc();
final TermContext[] contextArray = new TermContext[terms.size()];
final Term[] queryTerms = this.terms.toArray(new Term[0]);
@@ -234,10 +234,10 @@ public class CommonTermsQuery extends Qu
}
public void collectTermContext(IndexReader reader,
- List<AtomicReaderContext> leaves, TermContext[] contextArray,
+ List<LeafReaderContext> leaves, TermContext[] contextArray,
Term[] queryTerms) throws IOException {
TermsEnum termsEnum = null;
- for (AtomicReaderContext context : leaves) {
+ for (LeafReaderContext context : leaves) {
final Fields fields = context.reader().fields();
if (fields == null) {
// reader has no fields
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java?rev=1627188&r1=1627187&r2=1627188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java Wed Sep 24 01:20:36 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.queries;
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader; // for javadocs
import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.search.Explanation;
@@ -38,12 +38,12 @@ import org.apache.lucene.search.Explanat
*/
public class CustomScoreProvider {
- protected final AtomicReaderContext context;
+ protected final LeafReaderContext context;
/**
* Creates a new instance of the provider class for the given {@link IndexReader}.
*/
- public CustomScoreProvider(AtomicReaderContext context) {
+ public CustomScoreProvider(LeafReaderContext context) {
this.context = context;
}