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 [5/12] - in /lucene/dev/trunk: lucene/
lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/
lucene/backward-codecs/src/test/org/apache/lucene/index/
lucene/classification/src/java/org/apache/lucene/classification/ luc...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java Tue Sep 23 23:51:55 2014
@@ -29,7 +29,6 @@ import org.apache.lucene.codecs.FieldsCo
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.FieldInfo.DocValuesType;
import org.apache.lucene.index.FieldInfo.IndexOptions;
@@ -836,7 +835,7 @@ public class TestCodecs extends LuceneTe
Term term = new Term("f", new BytesRef("doc"));
DirectoryReader reader = DirectoryReader.open(dir);
- for (AtomicReaderContext ctx : reader.leaves()) {
+ for (LeafReaderContext ctx : reader.leaves()) {
DocsEnum de = ctx.reader().termDocsEnum(term);
while (de.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
assertEquals("wrong freq for doc " + de.docID(), 1, de.freq());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java Tue Sep 23 23:51:55 2014
@@ -66,7 +66,7 @@ public class TestCustomNorms extends Luc
}
writer.commit();
writer.close();
- AtomicReader open = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
+ LeafReader open = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
NumericDocValues norms = open.getNormValues(floatTestField);
assertNotNull(norms);
for (int i = 0; i < open.maxDoc(); i++) {
@@ -115,7 +115,7 @@ public class TestCustomNorms extends Luc
}
@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/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.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.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
@@ -770,7 +769,7 @@ public void testFilesOpenClose() throws
writer.commit();
DirectoryReader r = DirectoryReader.open(dir);
- AtomicReader r1 = getOnlySegmentReader(r);
+ LeafReader r1 = getOnlySegmentReader(r);
assertEquals(26, r1.terms("field").size());
assertEquals(10, r1.terms("number").size());
writer.addDocument(doc);
@@ -779,7 +778,7 @@ public void testFilesOpenClose() throws
assertNotNull(r2);
r.close();
- for(AtomicReaderContext s : r2.leaves()) {
+ for(LeafReaderContext s : r2.leaves()) {
assertEquals(26, s.reader().terms("field").size());
assertEquals(10, s.reader().terms("number").size());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java Tue Sep 23 23:51:55 2014
@@ -220,7 +220,7 @@ public class TestDoc extends LuceneTestC
TrackingDirectoryWrapper trackingDir = new TrackingDirectoryWrapper(si1.info.dir);
final SegmentInfo si = new SegmentInfo(si1.info.dir, Version.LATEST, merged, -1, false, codec, null);
- SegmentMerger merger = new SegmentMerger(Arrays.<AtomicReader>asList(r1, r2),
+ SegmentMerger merger = new SegmentMerger(Arrays.<LeafReader>asList(r1, r2),
si, InfoStream.getDefault(), trackingDir,
MergeState.CheckAbort.NONE, new FieldInfos.FieldNumbers(), context, true);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java Tue Sep 23 23:51:55 2014
@@ -78,7 +78,7 @@ public class TestDocValuesIndexing exten
w.forceMerge(1);
DirectoryReader r3 = w.getReader();
w.close();
- AtomicReader sr = getOnlySegmentReader(r3);
+ LeafReader sr = getOnlySegmentReader(r3);
assertEquals(2, sr.numDocs());
NumericDocValues docValues = sr.getNumericDocValues("dv");
assertNotNull(docValues);
@@ -203,7 +203,7 @@ public class TestDocValuesIndexing exten
writer.addDocument(doc);
}
DirectoryReader r = writer.getReader();
- AtomicReader slow = SlowCompositeReaderWrapper.wrap(r);
+ LeafReader slow = SlowCompositeReaderWrapper.wrap(r);
FieldInfos fi = slow.getFieldInfos();
FieldInfo dvInfo = fi.fieldInfo("dv");
assertTrue(dvInfo.hasDocValues());
@@ -784,7 +784,7 @@ public class TestDocValuesIndexing exten
DirectoryReader r = writer.getReader();
writer.close();
- AtomicReader subR = r.leaves().get(0).reader();
+ LeafReader subR = r.leaves().get(0).reader();
assertEquals(2, subR.numDocs());
Bits bits = DocValues.getDocsWithField(subR, "dv");
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java Tue Sep 23 23:51:55 2014
@@ -64,14 +64,14 @@ public class TestDocsAndPositions extend
for (int i = 0; i < num; i++) {
BytesRef bytes = new BytesRef("1");
IndexReaderContext topReaderContext = reader.getContext();
- for (AtomicReaderContext atomicReaderContext : topReaderContext.leaves()) {
+ for (LeafReaderContext leafReaderContext : topReaderContext.leaves()) {
DocsAndPositionsEnum docsAndPosEnum = getDocsAndPositions(
- atomicReaderContext.reader(), bytes, null);
+ leafReaderContext.reader(), bytes, null);
assertNotNull(docsAndPosEnum);
- if (atomicReaderContext.reader().maxDoc() == 0) {
+ if (leafReaderContext.reader().maxDoc() == 0) {
continue;
}
- final int advance = docsAndPosEnum.advance(random().nextInt(atomicReaderContext.reader().maxDoc()));
+ final int advance = docsAndPosEnum.advance(random().nextInt(leafReaderContext.reader().maxDoc()));
do {
String msg = "Advanced to: " + advance + " current doc: "
+ docsAndPosEnum.docID(); // TODO: + " usePayloads: " + usePayload;
@@ -90,7 +90,7 @@ public class TestDocsAndPositions extend
directory.close();
}
- public DocsAndPositionsEnum getDocsAndPositions(AtomicReader reader,
+ public DocsAndPositionsEnum getDocsAndPositions(LeafReader reader,
BytesRef bytes, Bits liveDocs) throws IOException {
Terms terms = reader.terms(fieldName);
if (terms != null) {
@@ -147,12 +147,12 @@ public class TestDocsAndPositions extend
for (int i = 0; i < num; i++) {
BytesRef bytes = new BytesRef("" + term);
IndexReaderContext topReaderContext = reader.getContext();
- for (AtomicReaderContext atomicReaderContext : topReaderContext.leaves()) {
+ for (LeafReaderContext leafReaderContext : topReaderContext.leaves()) {
DocsAndPositionsEnum docsAndPosEnum = getDocsAndPositions(
- atomicReaderContext.reader(), bytes, null);
+ leafReaderContext.reader(), bytes, null);
assertNotNull(docsAndPosEnum);
int initDoc = 0;
- int maxDoc = atomicReaderContext.reader().maxDoc();
+ int maxDoc = leafReaderContext.reader().maxDoc();
// initially advance or do next doc
if (random().nextBoolean()) {
initDoc = docsAndPosEnum.nextDoc();
@@ -165,7 +165,7 @@ public class TestDocsAndPositions extend
if (docID == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
- Integer[] pos = positionsInDoc[atomicReaderContext.docBase + docID];
+ Integer[] pos = positionsInDoc[leafReaderContext.docBase + docID];
assertEquals(pos.length, docsAndPosEnum.freq());
// number of positions read should be random - don't read all of them
// allways
@@ -173,7 +173,7 @@ public class TestDocsAndPositions extend
- random().nextInt(pos.length) : pos.length;
for (int j = 0; j < howMany; j++) {
assertEquals("iteration: " + i + " initDoc: " + initDoc + " doc: "
- + docID + " base: " + atomicReaderContext.docBase
+ + docID + " base: " + leafReaderContext.docBase
+ " positions: " + Arrays.toString(pos) /* TODO: + " usePayloads: "
+ usePayload*/, pos[j].intValue(), docsAndPosEnum.nextPosition());
}
@@ -224,7 +224,7 @@ public class TestDocsAndPositions extend
for (int i = 0; i < num; i++) {
BytesRef bytes = new BytesRef("" + term);
IndexReaderContext topReaderContext = reader.getContext();
- for (AtomicReaderContext context : topReaderContext.leaves()) {
+ for (LeafReaderContext context : topReaderContext.leaves()) {
int maxDoc = context.reader().maxDoc();
DocsEnum docsEnum = TestUtil.docs(random(), context.reader(), fieldName, bytes, null, null, DocsEnum.FLAG_FREQS);
if (findNext(freqInDoc, context.docBase, context.docBase + maxDoc) == Integer.MAX_VALUE) {
@@ -302,13 +302,13 @@ public class TestDocsAndPositions extend
BytesRef bytes = new BytesRef("even");
IndexReaderContext topReaderContext = reader.getContext();
- for (AtomicReaderContext atomicReaderContext : topReaderContext.leaves()) {
+ for (LeafReaderContext leafReaderContext : topReaderContext.leaves()) {
DocsAndPositionsEnum docsAndPosEnum = getDocsAndPositions(
- atomicReaderContext.reader(), bytes, null);
+ leafReaderContext.reader(), bytes, null);
assertNotNull(docsAndPosEnum);
int initDoc = 0;
- int maxDoc = atomicReaderContext.reader().maxDoc();
+ int maxDoc = leafReaderContext.reader().maxDoc();
// initially advance or do next doc
if (random().nextBoolean()) {
initDoc = docsAndPosEnum.nextDoc();
@@ -335,7 +335,7 @@ public class TestDocsAndPositions extend
doc.add(newStringField("foo", "bar", Field.Store.NO));
writer.addDocument(doc);
DirectoryReader reader = writer.getReader();
- AtomicReader r = getOnlySegmentReader(reader);
+ LeafReader r = getOnlySegmentReader(reader);
DocsEnum disi = TestUtil.docs(random(), r, "foo", new BytesRef("bar"), null, null, DocsEnum.FLAG_NONE);
int docid = disi.docID();
assertEquals(-1, docid);
@@ -360,7 +360,7 @@ public class TestDocsAndPositions extend
doc.add(newTextField("foo", "bar", Field.Store.NO));
writer.addDocument(doc);
DirectoryReader reader = writer.getReader();
- AtomicReader r = getOnlySegmentReader(reader);
+ LeafReader r = getOnlySegmentReader(reader);
DocsAndPositionsEnum disi = r.termPositionsEnum(new Term("foo", "bar"));
int docid = disi.docID();
assertEquals(-1, docid);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java Tue Sep 23 23:51:55 2014
@@ -34,7 +34,7 @@ import org.apache.lucene.util.LuceneTest
public class TestFilterAtomicReader extends LuceneTestCase {
- private static class TestReader extends FilterAtomicReader {
+ private static class TestReader extends FilterLeafReader {
/** Filter that only permits terms containing 'e'.*/
private static class TestFields extends FilterFields {
@@ -184,12 +184,12 @@ public class TestFilterAtomicReader exte
}
public void testOverrideMethods() throws Exception {
- checkOverrideMethods(FilterAtomicReader.class);
- checkOverrideMethods(FilterAtomicReader.FilterFields.class);
- checkOverrideMethods(FilterAtomicReader.FilterTerms.class);
- checkOverrideMethods(FilterAtomicReader.FilterTermsEnum.class);
- checkOverrideMethods(FilterAtomicReader.FilterDocsEnum.class);
- checkOverrideMethods(FilterAtomicReader.FilterDocsAndPositionsEnum.class);
+ checkOverrideMethods(FilterLeafReader.class);
+ checkOverrideMethods(FilterLeafReader.FilterFields.class);
+ checkOverrideMethods(FilterLeafReader.FilterTerms.class);
+ checkOverrideMethods(FilterLeafReader.FilterTermsEnum.class);
+ checkOverrideMethods(FilterLeafReader.FilterDocsEnum.class);
+ checkOverrideMethods(FilterLeafReader.FilterDocsAndPositionsEnum.class);
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java Tue Sep 23 23:51:55 2014
@@ -43,8 +43,8 @@ public class TestIndexReaderClose extend
writer.close();
DirectoryReader open = DirectoryReader.open(dir);
final boolean throwOnClose = !rarely();
- AtomicReader wrap = SlowCompositeReaderWrapper.wrap(open);
- FilterAtomicReader reader = new FilterAtomicReader(wrap) {
+ LeafReader wrap = SlowCompositeReaderWrapper.wrap(open);
+ FilterLeafReader reader = new FilterLeafReader(wrap) {
@Override
protected void doClose() throws IOException {
super.doClose();
@@ -107,37 +107,37 @@ public class TestIndexReaderClose extend
w.close();
final IndexReader reader = DirectoryReader.open(w.w.getDirectory());
- final AtomicReader atomicReader = SlowCompositeReaderWrapper.wrap(reader);
+ final LeafReader leafReader = SlowCompositeReaderWrapper.wrap(reader);
final int numListeners = TestUtil.nextInt(random(), 1, 10);
- final List<AtomicReader.CoreClosedListener> listeners = new ArrayList<>();
+ final List<LeafReader.CoreClosedListener> listeners = new ArrayList<>();
AtomicInteger counter = new AtomicInteger(numListeners);
for (int i = 0; i < numListeners; ++i) {
CountCoreListener listener = new CountCoreListener(counter);
listeners.add(listener);
- atomicReader.addCoreClosedListener(listener);
+ leafReader.addCoreClosedListener(listener);
}
for (int i = 0; i < 100; ++i) {
- atomicReader.addCoreClosedListener(listeners.get(random().nextInt(listeners.size())));
+ leafReader.addCoreClosedListener(listeners.get(random().nextInt(listeners.size())));
}
final int removed = random().nextInt(numListeners);
Collections.shuffle(listeners);
for (int i = 0; i < removed; ++i) {
- atomicReader.removeCoreClosedListener(listeners.get(i));
+ leafReader.removeCoreClosedListener(listeners.get(i));
}
assertEquals(numListeners, counter.get());
// make sure listeners are registered on the wrapped reader and that closing any of them has the same effect
if (random().nextBoolean()) {
reader.close();
} else {
- atomicReader.close();
+ leafReader.close();
}
assertEquals(removed, counter.get());
w.w.getDirectory().close();
}
- private static final class CountCoreListener implements AtomicReader.CoreClosedListener {
+ private static final class CountCoreListener implements LeafReader.CoreClosedListener {
private final AtomicInteger count;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Tue Sep 23 23:51:55 2014
@@ -740,7 +740,7 @@ public class TestIndexWriter extends Luc
writer.addDocument(doc);
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
- AtomicReader subreader = getOnlySegmentReader(reader);
+ LeafReader subreader = getOnlySegmentReader(reader);
TermsEnum te = subreader.fields().terms("").iterator(null);
assertEquals(new BytesRef("a"), te.next());
assertEquals(new BytesRef("b"), te.next());
@@ -761,7 +761,7 @@ public class TestIndexWriter extends Luc
writer.addDocument(doc);
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
- AtomicReader subreader = getOnlySegmentReader(reader);
+ LeafReader subreader = getOnlySegmentReader(reader);
TermsEnum te = subreader.fields().terms("").iterator(null);
assertEquals(new BytesRef(""), te.next());
assertEquals(new BytesRef("a"), te.next());
@@ -1600,7 +1600,7 @@ public class TestIndexWriter extends Luc
assertNoUnreferencedFiles(dir, "no tv files");
DirectoryReader r0 = DirectoryReader.open(dir);
- for (AtomicReaderContext ctx : r0.leaves()) {
+ for (LeafReaderContext ctx : r0.leaves()) {
SegmentReader sr = (SegmentReader) ctx.reader();
assertFalse(sr.getFieldInfos().hasVectors());
}
@@ -2241,9 +2241,9 @@ public class TestIndexWriter extends Luc
}
DirectoryReader reader = w.getReader();
assertEquals(docCount, reader.numDocs());
- List<AtomicReaderContext> leaves = reader.leaves();
- for (AtomicReaderContext atomicReaderContext : leaves) {
- AtomicReader ar = atomicReaderContext.reader();
+ List<LeafReaderContext> leaves = reader.leaves();
+ for (LeafReaderContext leafReaderContext : leaves) {
+ LeafReader ar = leafReaderContext.reader();
Bits liveDocs = ar.getLiveDocs();
int maxDoc = ar.maxDoc();
for (int i = 0; i < maxDoc; i++) {
@@ -2293,9 +2293,9 @@ public class TestIndexWriter extends Luc
}
DirectoryReader reader = w.getReader();
assertEquals(docCount, reader.numDocs());
- List<AtomicReaderContext> leaves = reader.leaves();
- for (AtomicReaderContext atomicReaderContext : leaves) {
- AtomicReader ar = atomicReaderContext.reader();
+ List<LeafReaderContext> leaves = reader.leaves();
+ for (LeafReaderContext leafReaderContext : leaves) {
+ LeafReader ar = leafReaderContext.reader();
Bits liveDocs = ar.getLiveDocs();
int maxDoc = ar.maxDoc();
for (int i = 0; i < maxDoc; i++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Tue Sep 23 23:51:55 2014
@@ -46,7 +46,6 @@ import org.apache.lucene.document.Sorted
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
@@ -1312,7 +1311,7 @@ public class TestIndexWriterExceptions e
assertTrue(reader.numDocs() > 0);
SegmentInfos sis = new SegmentInfos();
sis.read(dir);
- for(AtomicReaderContext context : reader.leaves()) {
+ for(LeafReaderContext context : reader.leaves()) {
assertFalse(context.reader().getFieldInfos().hasVectors());
}
reader.close();
@@ -2076,8 +2075,8 @@ public class TestIndexWriterExceptions e
}
assertEquals(docCount-deleteCount, r.numDocs());
BytesRef scratch = new BytesRef();
- for (AtomicReaderContext context : r.leaves()) {
- AtomicReader reader = context.reader();
+ for (LeafReaderContext context : r.leaves()) {
+ LeafReader reader = context.reader();
Bits liveDocs = reader.getLiveDocs();
NumericDocValues f = reader.getNumericDocValues("f");
NumericDocValues cf = reader.getNumericDocValues("cf");
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java Tue Sep 23 23:51:55 2014
@@ -599,7 +599,7 @@ public class TestIndexWriterReader exten
private static class MyWarmer extends IndexWriter.IndexReaderWarmer {
int warmCount;
@Override
- public void warm(AtomicReader reader) throws IOException {
+ public void warm(LeafReader reader) throws IOException {
warmCount++;
}
}
@@ -956,7 +956,7 @@ public class TestIndexWriterReader exten
setReaderPooling(true).
setMergedSegmentWarmer(new IndexWriter.IndexReaderWarmer() {
@Override
- public void warm(AtomicReader r) throws IOException {
+ public void warm(LeafReader r) throws IOException {
IndexSearcher s = newSearcher(r);
TopDocs hits = s.search(new TermQuery(new Term("foo", "bar")), 10);
assertEquals(20, hits.totalHits);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java Tue Sep 23 23:51:55 2014
@@ -316,7 +316,7 @@ public class TestIndexWriterUnicode exte
IndexReader r = writer.getReader();
// Test each sub-segment
- for (AtomicReaderContext ctx : r.leaves()) {
+ for (LeafReaderContext ctx : r.leaves()) {
checkTermsOrder(ctx.reader(), allTerms, false);
}
checkTermsOrder(r, allTerms, true);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java Tue Sep 23 23:51:55 2014
@@ -114,8 +114,8 @@ public class TestMixedDocValuesUpdates e
reader = newReader;
// System.out.println("[" + Thread.currentThread().getName() + "]: reopened reader: " + reader);
assertTrue(reader.numDocs() > 0); // we delete at most one document per round
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
// System.out.println(((SegmentReader) r).getSegmentName());
Bits liveDocs = r.getLiveDocs();
for (int field = 0; field < fieldValues.length; field++) {
@@ -259,8 +259,8 @@ public class TestMixedDocValuesUpdates e
DirectoryReader reader = DirectoryReader.open(dir);
BytesRef scratch = new BytesRef();
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
for (int i = 0; i < numFields; i++) {
BinaryDocValues bdv = r.getBinaryDocValues("f" + i);
NumericDocValues control = r.getNumericDocValues("cf" + i);
@@ -310,8 +310,8 @@ public class TestMixedDocValuesUpdates e
writer.updateDocValues(t, new BinaryDocValuesField("f", TestBinaryDocValuesUpdates.toBytes(value)),
new NumericDocValuesField("cf", value*2));
DirectoryReader reader = DirectoryReader.open(writer, true);
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
BinaryDocValues fbdv = r.getBinaryDocValues("f");
NumericDocValues cfndv = r.getNumericDocValues("cf");
for (int j = 0; j < r.maxDoc(); j++) {
@@ -377,9 +377,9 @@ public class TestMixedDocValuesUpdates e
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
- for (AtomicReaderContext context : reader.leaves()) {
+ for (LeafReaderContext context : reader.leaves()) {
for (int i = 0; i < numBinaryFields; i++) {
- AtomicReader r = context.reader();
+ LeafReader r = context.reader();
BinaryDocValues f = r.getBinaryDocValues("f" + i);
NumericDocValues cf = r.getNumericDocValues("cf" + i);
for (int j = 0; j < r.maxDoc(); j++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java Tue Sep 23 23:51:55 2014
@@ -56,7 +56,7 @@ public class TestMultiDocValues extends
DirectoryReader ir = iw.getReader();
iw.forceMerge(1);
DirectoryReader ir2 = iw.getReader();
- AtomicReader merged = getOnlySegmentReader(ir2);
+ LeafReader merged = getOnlySegmentReader(ir2);
iw.close();
NumericDocValues multi = MultiDocValues.getNumericValues(ir, "numbers");
@@ -91,7 +91,7 @@ public class TestMultiDocValues extends
DirectoryReader ir = iw.getReader();
iw.forceMerge(1);
DirectoryReader ir2 = iw.getReader();
- AtomicReader merged = getOnlySegmentReader(ir2);
+ LeafReader merged = getOnlySegmentReader(ir2);
iw.close();
BinaryDocValues multi = MultiDocValues.getBinaryValues(ir, "bytes");
@@ -131,7 +131,7 @@ public class TestMultiDocValues extends
DirectoryReader ir = iw.getReader();
iw.forceMerge(1);
DirectoryReader ir2 = iw.getReader();
- AtomicReader merged = getOnlySegmentReader(ir2);
+ LeafReader merged = getOnlySegmentReader(ir2);
iw.close();
SortedDocValues multi = MultiDocValues.getSortedValues(ir, "bytes");
@@ -173,7 +173,7 @@ public class TestMultiDocValues extends
DirectoryReader ir = iw.getReader();
iw.forceMerge(1);
DirectoryReader ir2 = iw.getReader();
- AtomicReader merged = getOnlySegmentReader(ir2);
+ LeafReader merged = getOnlySegmentReader(ir2);
iw.close();
SortedDocValues multi = MultiDocValues.getSortedValues(ir, "bytes");
@@ -214,7 +214,7 @@ public class TestMultiDocValues extends
DirectoryReader ir = iw.getReader();
iw.forceMerge(1);
DirectoryReader ir2 = iw.getReader();
- AtomicReader merged = getOnlySegmentReader(ir2);
+ LeafReader merged = getOnlySegmentReader(ir2);
iw.close();
SortedSetDocValues multi = MultiDocValues.getSortedSetValues(ir, "bytes");
@@ -276,7 +276,7 @@ public class TestMultiDocValues extends
DirectoryReader ir = iw.getReader();
iw.forceMerge(1);
DirectoryReader ir2 = iw.getReader();
- AtomicReader merged = getOnlySegmentReader(ir2);
+ LeafReader merged = getOnlySegmentReader(ir2);
iw.close();
SortedSetDocValues multi = MultiDocValues.getSortedSetValues(ir, "bytes");
@@ -337,7 +337,7 @@ public class TestMultiDocValues extends
DirectoryReader ir = iw.getReader();
iw.forceMerge(1);
DirectoryReader ir2 = iw.getReader();
- AtomicReader merged = getOnlySegmentReader(ir2);
+ LeafReader merged = getOnlySegmentReader(ir2);
iw.close();
SortedNumericDocValues multi = MultiDocValues.getSortedNumericValues(ir, "nums");
@@ -388,7 +388,7 @@ public class TestMultiDocValues extends
DirectoryReader ir = iw.getReader();
iw.forceMerge(1);
DirectoryReader ir2 = iw.getReader();
- AtomicReader merged = getOnlySegmentReader(ir2);
+ LeafReader merged = getOnlySegmentReader(ir2);
iw.close();
Bits multi = MultiDocValues.getDocsWithField(ir, "numbers");
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java Tue Sep 23 23:51:55 2014
@@ -80,7 +80,7 @@ public class TestMultiLevelSkipList exte
writer.forceMerge(1);
writer.close();
- AtomicReader reader = getOnlySegmentReader(DirectoryReader.open(dir));
+ LeafReader reader = getOnlySegmentReader(DirectoryReader.open(dir));
for (int i = 0; i < 2; i++) {
counter = 0;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java Tue Sep 23 23:51:55 2014
@@ -111,7 +111,7 @@ public class TestNorms extends LuceneTes
public void testMaxByteNorms() throws IOException {
Directory dir = newFSDirectory(createTempDir("TestNorms.testMaxByteNorms"));
buildIndex(dir);
- AtomicReader open = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
+ LeafReader open = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
NumericDocValues normValues = open.getNormValues(byteTestField);
assertNotNull(normValues);
for (int i = 0; i < open.maxDoc(); i++) {
@@ -192,7 +192,7 @@ public class TestNorms extends LuceneTes
}
@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/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java Tue Sep 23 23:51:55 2014
@@ -107,7 +107,7 @@ public class TestNumericDocValuesUpdates
}
assertEquals(1, reader.leaves().size());
- AtomicReader r = reader.leaves().get(0).reader();
+ LeafReader r = reader.leaves().get(0).reader();
NumericDocValues ndv = r.getNumericDocValues("val");
assertEquals(2, ndv.get(0));
assertEquals(2, ndv.get(1));
@@ -149,8 +149,8 @@ public class TestNumericDocValuesUpdates
writer.close();
}
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
NumericDocValues ndv = r.getNumericDocValues("val");
assertNotNull(ndv);
for (int i = 0; i < r.maxDoc(); i++) {
@@ -232,7 +232,7 @@ public class TestNumericDocValuesUpdates
writer.close();
}
- AtomicReader slow = SlowCompositeReaderWrapper.wrap(reader);
+ LeafReader slow = SlowCompositeReaderWrapper.wrap(reader);
Bits liveDocs = slow.getLiveDocs();
boolean[] expectedLiveDocs = new boolean[] { true, false, false, true, true, true };
@@ -277,7 +277,7 @@ public class TestNumericDocValuesUpdates
writer.close();
}
- AtomicReader r = reader.leaves().get(0).reader();
+ LeafReader r = reader.leaves().get(0).reader();
assertFalse(r.getLiveDocs().get(0));
assertEquals(17, r.getNumericDocValues("val").get(1));
@@ -312,7 +312,7 @@ public class TestNumericDocValuesUpdates
writer.close();
}
- AtomicReader r = reader.leaves().get(0).reader();
+ LeafReader r = reader.leaves().get(0).reader();
assertFalse(r.getLiveDocs().get(0));
assertEquals(1, r.getNumericDocValues("val").get(0)); // deletes are currently applied first
@@ -344,7 +344,7 @@ public class TestNumericDocValuesUpdates
writer.close();
final DirectoryReader reader = DirectoryReader.open(dir);
- AtomicReader r = reader.leaves().get(0).reader();
+ LeafReader r = reader.leaves().get(0).reader();
NumericDocValues ndv = r.getNumericDocValues("ndv");
BinaryDocValues bdv = r.getBinaryDocValues("bdv");
SortedDocValues sdv = r.getSortedDocValues("sdv");
@@ -392,7 +392,7 @@ public class TestNumericDocValuesUpdates
writer.close();
final DirectoryReader reader = DirectoryReader.open(dir);
- AtomicReader r = reader.leaves().get(0).reader();
+ LeafReader r = reader.leaves().get(0).reader();
NumericDocValues ndv1 = r.getNumericDocValues("ndv1");
NumericDocValues ndv2 = r.getNumericDocValues("ndv2");
for (int i = 0; i < r.maxDoc(); i++) {
@@ -425,7 +425,7 @@ public class TestNumericDocValuesUpdates
writer.close();
final DirectoryReader reader = DirectoryReader.open(dir);
- AtomicReader r = reader.leaves().get(0).reader();
+ LeafReader r = reader.leaves().get(0).reader();
NumericDocValues ndv = r.getNumericDocValues("ndv");
for (int i = 0; i < r.maxDoc(); i++) {
assertEquals(17, ndv.get(i));
@@ -495,7 +495,7 @@ public class TestNumericDocValuesUpdates
final DirectoryReader reader = DirectoryReader.open(dir);
- AtomicReader r = SlowCompositeReaderWrapper.wrap(reader);
+ LeafReader r = SlowCompositeReaderWrapper.wrap(reader);
NumericDocValues ndv = r.getNumericDocValues("ndv");
SortedDocValues sdv = r.getSortedDocValues("sorted");
for (int i = 0; i < r.maxDoc(); i++) {
@@ -526,7 +526,7 @@ public class TestNumericDocValuesUpdates
writer.close();
final DirectoryReader reader = DirectoryReader.open(dir);
- final AtomicReader r = SlowCompositeReaderWrapper.wrap(reader);
+ final LeafReader r = SlowCompositeReaderWrapper.wrap(reader);
NumericDocValues ndv = r.getNumericDocValues("ndv");
for (int i = 0; i < r.maxDoc(); i++) {
assertEquals(3, ndv.get(i));
@@ -593,7 +593,7 @@ public class TestNumericDocValuesUpdates
}
assertEquals(1, reader.leaves().size());
- final AtomicReader r = reader.leaves().get(0).reader();
+ final LeafReader r = reader.leaves().get(0).reader();
assertNull("index should have no deletes after forceMerge", r.getLiveDocs());
NumericDocValues ndv = r.getNumericDocValues("ndv");
assertNotNull(ndv);
@@ -627,7 +627,7 @@ public class TestNumericDocValuesUpdates
writer.close();
final DirectoryReader reader = DirectoryReader.open(dir);
- final AtomicReader r = SlowCompositeReaderWrapper.wrap(reader);
+ final LeafReader r = SlowCompositeReaderWrapper.wrap(reader);
NumericDocValues ndv = r.getNumericDocValues("ndv");
for (int i = 0; i < r.maxDoc(); i++) {
assertEquals(3, ndv.get(i));
@@ -701,8 +701,8 @@ public class TestNumericDocValuesUpdates
reader = newReader;
// System.out.println("[" + Thread.currentThread().getName() + "]: reopened reader: " + reader);
assertTrue(reader.numDocs() > 0); // we delete at most one document per round
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
// System.out.println(((SegmentReader) r).getSegmentName());
Bits liveDocs = r.getLiveDocs();
for (int field = 0; field < fieldValues.length; field++) {
@@ -766,8 +766,8 @@ public class TestNumericDocValuesUpdates
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
NumericDocValues ndv = r.getNumericDocValues("ndv");
Bits docsWithField = r.getDocsWithField("ndv");
assertNotNull(docsWithField);
@@ -811,8 +811,8 @@ public class TestNumericDocValuesUpdates
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
NumericDocValues ndv = r.getNumericDocValues("ndv");
for (int i = 0; i < r.maxDoc(); i++) {
assertEquals(5L, ndv.get(i));
@@ -954,8 +954,8 @@ public class TestNumericDocValuesUpdates
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
for (int i = 0; i < numFields; i++) {
NumericDocValues ndv = r.getNumericDocValues("f" + i);
NumericDocValues control = r.getNumericDocValues("cf" + i);
@@ -1000,8 +1000,8 @@ public class TestNumericDocValuesUpdates
long value = random().nextLong();
writer.updateDocValues(t, new NumericDocValuesField("f", value), new NumericDocValuesField("cf", value*2));
DirectoryReader reader = DirectoryReader.open(writer, true);
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
NumericDocValues fndv = r.getNumericDocValues("f");
NumericDocValues cfndv = r.getNumericDocValues("cf");
for (int j = 0; j < r.maxDoc(); j++) {
@@ -1052,7 +1052,7 @@ public class TestNumericDocValuesUpdates
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
- AtomicReader r = SlowCompositeReaderWrapper.wrap(reader);
+ LeafReader r = SlowCompositeReaderWrapper.wrap(reader);
NumericDocValues f1 = r.getNumericDocValues("f1");
NumericDocValues f2 = r.getNumericDocValues("f2");
assertEquals(12L, f1.get(0));
@@ -1108,8 +1108,8 @@ public class TestNumericDocValuesUpdates
writer.close();
DirectoryReader reader = DirectoryReader.open(dir2);
- for (AtomicReaderContext context : reader.leaves()) {
- AtomicReader r = context.reader();
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader r = context.reader();
NumericDocValues ndv = r.getNumericDocValues("ndv");
NumericDocValues control = r.getNumericDocValues("control");
for (int i = 0; i < r.maxDoc(); i++) {
@@ -1208,9 +1208,9 @@ public class TestNumericDocValuesUpdates
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
- for (AtomicReaderContext context : reader.leaves()) {
+ for (LeafReaderContext context : reader.leaves()) {
for (int i = 0; i < numNumericFields; i++) {
- AtomicReader r = context.reader();
+ LeafReader r = context.reader();
NumericDocValues f = r.getNumericDocValues("f" + i);
NumericDocValues cf = r.getNumericDocValues("cf" + i);
for (int j = 0; j < r.maxDoc(); j++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java Tue Sep 23 23:51:55 2014
@@ -435,7 +435,7 @@ public class TestOmitTf extends LuceneTe
public static int getSum() { return sum; }
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
docBase = context.docBase;
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java Tue Sep 23 23:51:55 2014
@@ -83,7 +83,7 @@ public class TestOrdinalMap extends Luce
}
iw.commit();
DirectoryReader r = iw.getReader();
- AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
+ LeafReader ar = SlowCompositeReaderWrapper.wrap(r);
SortedDocValues sdv = ar.getSortedDocValues("sdv");
if (sdv instanceof MultiSortedDocValues) {
OrdinalMap map = ((MultiSortedDocValues) sdv).mapping;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java Tue Sep 23 23:51:55 2014
@@ -63,7 +63,7 @@ public class TestParallelAtomicReader ex
public void testFieldNames() throws Exception {
Directory dir1 = getDir1(random());
Directory dir2 = getDir2(random());
- ParallelAtomicReader pr = new ParallelAtomicReader(SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1)),
+ ParallelLeafReader pr = new ParallelLeafReader(SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1)),
SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2)));
FieldInfos fieldInfos = pr.getFieldInfos();
assertEquals(4, fieldInfos.size());
@@ -79,9 +79,9 @@ public class TestParallelAtomicReader ex
public void testRefCounts1() throws IOException {
Directory dir1 = getDir1(random());
Directory dir2 = getDir2(random());
- AtomicReader ir1, ir2;
+ LeafReader ir1, ir2;
// close subreaders, ParallelReader will not change refCounts, but close on its own close
- ParallelAtomicReader pr = new ParallelAtomicReader(ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1)),
+ ParallelLeafReader pr = new ParallelLeafReader(ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1)),
ir2 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2)));
// check RefCounts
@@ -97,10 +97,10 @@ public class TestParallelAtomicReader ex
public void testRefCounts2() throws IOException {
Directory dir1 = getDir1(random());
Directory dir2 = getDir2(random());
- AtomicReader ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1));
- AtomicReader ir2 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2));
+ LeafReader ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1));
+ LeafReader ir2 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2));
// don't close subreaders, so ParallelReader will increment refcounts
- ParallelAtomicReader pr = new ParallelAtomicReader(false, ir1, ir2);
+ ParallelLeafReader pr = new ParallelLeafReader(false, ir1, ir2);
// check RefCounts
assertEquals(2, ir1.getRefCount());
assertEquals(2, ir2.getRefCount());
@@ -117,12 +117,12 @@ public class TestParallelAtomicReader ex
public void testCloseInnerReader() throws Exception {
Directory dir1 = getDir1(random());
- AtomicReader ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1));
+ LeafReader ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1));
// with overlapping
- ParallelAtomicReader pr = new ParallelAtomicReader(true,
- new AtomicReader[] {ir1},
- new AtomicReader[] {ir1});
+ ParallelLeafReader pr = new ParallelLeafReader(true,
+ new LeafReader[] {ir1},
+ new LeafReader[] {ir1});
ir1.close();
@@ -151,20 +151,20 @@ public class TestParallelAtomicReader ex
w2.addDocument(d3);
w2.close();
- AtomicReader ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1));
- AtomicReader ir2 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2));
+ LeafReader ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1));
+ LeafReader ir2 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2));
try {
- new ParallelAtomicReader(ir1, ir2);
+ new ParallelLeafReader(ir1, ir2);
fail("didn't get exptected exception: indexes don't have same number of documents");
} catch (IllegalArgumentException e) {
// expected exception
}
try {
- new ParallelAtomicReader(random().nextBoolean(),
- new AtomicReader[] {ir1, ir2},
- new AtomicReader[] {ir1, ir2});
+ new ParallelLeafReader(random().nextBoolean(),
+ new LeafReader[] {ir1, ir2},
+ new LeafReader[] {ir1, ir2});
fail("didn't get expected exception: indexes don't have same number of documents");
} catch (IllegalArgumentException e) {
// expected exception
@@ -181,13 +181,13 @@ public class TestParallelAtomicReader ex
public void testIgnoreStoredFields() throws IOException {
Directory dir1 = getDir1(random());
Directory dir2 = getDir2(random());
- AtomicReader ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1));
- AtomicReader ir2 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2));
+ LeafReader ir1 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1));
+ LeafReader ir2 = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2));
// with overlapping
- ParallelAtomicReader pr = new ParallelAtomicReader(false,
- new AtomicReader[] {ir1, ir2},
- new AtomicReader[] {ir1});
+ ParallelLeafReader pr = new ParallelLeafReader(false,
+ new LeafReader[] {ir1, ir2},
+ new LeafReader[] {ir1});
assertEquals("v1", pr.document(0).get("f1"));
assertEquals("v1", pr.document(0).get("f2"));
assertNull(pr.document(0).get("f3"));
@@ -200,9 +200,9 @@ public class TestParallelAtomicReader ex
pr.close();
// no stored fields at all
- pr = new ParallelAtomicReader(false,
- new AtomicReader[] {ir2},
- new AtomicReader[0]);
+ pr = new ParallelLeafReader(false,
+ new LeafReader[] {ir2},
+ new LeafReader[0]);
assertNull(pr.document(0).get("f1"));
assertNull(pr.document(0).get("f2"));
assertNull(pr.document(0).get("f3"));
@@ -215,9 +215,9 @@ public class TestParallelAtomicReader ex
pr.close();
// without overlapping
- pr = new ParallelAtomicReader(true,
- new AtomicReader[] {ir2},
- new AtomicReader[] {ir1});
+ pr = new ParallelLeafReader(true,
+ new LeafReader[] {ir2},
+ new LeafReader[] {ir1});
assertEquals("v1", pr.document(0).get("f1"));
assertEquals("v1", pr.document(0).get("f2"));
assertNull(pr.document(0).get("f3"));
@@ -231,9 +231,9 @@ public class TestParallelAtomicReader ex
// no main readers
try {
- new ParallelAtomicReader(true,
- new AtomicReader[0],
- new AtomicReader[] {ir1});
+ new ParallelLeafReader(true,
+ new LeafReader[0],
+ new LeafReader[] {ir1});
fail("didn't get expected exception: need a non-empty main-reader array");
} catch (IllegalArgumentException iae) {
// pass
@@ -284,7 +284,7 @@ public class TestParallelAtomicReader ex
private IndexSearcher parallel(Random random) throws IOException {
dir1 = getDir1(random);
dir2 = getDir2(random);
- ParallelAtomicReader pr = new ParallelAtomicReader(
+ ParallelLeafReader pr = new ParallelLeafReader(
SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1)),
SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2)));
TestUtil.checkReader(pr);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java Tue Sep 23 23:51:55 2014
@@ -137,7 +137,7 @@ public class TestParallelCompositeReader
assertEquals(3, pr.leaves().size());
- for(AtomicReaderContext cxt : pr.leaves()) {
+ for(LeafReaderContext cxt : pr.leaves()) {
cxt.reader().addReaderClosedListener(new ReaderClosedListener() {
@Override
public void onClose(IndexReader reader) {
@@ -165,7 +165,7 @@ public class TestParallelCompositeReader
assertEquals(3, pr.leaves().size());
- for(AtomicReaderContext cxt : pr.leaves()) {
+ for(LeafReaderContext cxt : pr.leaves()) {
cxt.reader().addReaderClosedListener(new ReaderClosedListener() {
@Override
public void onClose(IndexReader reader) {
@@ -324,7 +324,7 @@ public class TestParallelCompositeReader
assertNull(pr.document(0).get("f3"));
assertNull(pr.document(0).get("f4"));
// check that fields are there
- AtomicReader slow = SlowCompositeReaderWrapper.wrap(pr);
+ LeafReader slow = SlowCompositeReaderWrapper.wrap(pr);
assertNotNull(slow.terms("f1"));
assertNotNull(slow.terms("f2"));
assertNotNull(slow.terms("f3"));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java Tue Sep 23 23:51:55 2014
@@ -29,7 +29,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.LuceneTestCase;
/**
- * Some tests for {@link ParallelAtomicReader}s with empty indexes
+ * Some tests for {@link ParallelLeafReader}s with empty indexes
*/
public class TestParallelReaderEmptyIndex extends LuceneTestCase {
@@ -48,7 +48,7 @@ public class TestParallelReaderEmptyInde
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig(new MockAnalyzer(random())));
- ParallelAtomicReader apr = new ParallelAtomicReader(
+ ParallelLeafReader apr = new ParallelLeafReader(
SlowCompositeReaderWrapper.wrap(DirectoryReader.open(rd1)),
SlowCompositeReaderWrapper.wrap(DirectoryReader.open(rd2)));
@@ -57,7 +57,7 @@ public class TestParallelReaderEmptyInde
iwOut.forceMerge(1);
// 2nd try with a readerless parallel reader
- iwOut.addIndexes(new ParallelAtomicReader());
+ iwOut.addIndexes(new ParallelLeafReader());
iwOut.forceMerge(1);
ParallelCompositeReader cpr = new ParallelCompositeReader(
@@ -135,7 +135,7 @@ public class TestParallelReaderEmptyInde
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig(new MockAnalyzer(random())));
final DirectoryReader reader1, reader2;
- ParallelAtomicReader pr = new ParallelAtomicReader(
+ ParallelLeafReader pr = new ParallelLeafReader(
SlowCompositeReaderWrapper.wrap(reader1 = DirectoryReader.open(rd1)),
SlowCompositeReaderWrapper.wrap(reader2 = DirectoryReader.open(rd2)));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java Tue Sep 23 23:51:55 2014
@@ -31,8 +31,8 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.TestUtil;
public class TestParallelTermEnum extends LuceneTestCase {
- private AtomicReader ir1;
- private AtomicReader ir2;
+ private LeafReader ir1;
+ private LeafReader ir2;
private Directory rd1;
private Directory rd2;
@@ -89,7 +89,7 @@ public class TestParallelTermEnum extend
}
public void test1() throws IOException {
- ParallelAtomicReader pr = new ParallelAtomicReader(ir1, ir2);
+ ParallelLeafReader pr = new ParallelLeafReader(ir1, ir2);
Bits liveDocs = pr.getLiveDocs();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java Tue Sep 23 23:51:55 2014
@@ -603,7 +603,7 @@ public class TestPayloads extends Lucene
field.setTokenStream(ts);
writer.addDocument(doc);
DirectoryReader reader = writer.getReader();
- AtomicReader sr = SlowCompositeReaderWrapper.wrap(reader);
+ LeafReader sr = SlowCompositeReaderWrapper.wrap(reader);
DocsAndPositionsEnum de = sr.termPositionsEnum(new Term("field", "withPayload"));
de.nextDoc();
de.nextPosition();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java Tue Sep 23 23:51:55 2014
@@ -290,9 +290,9 @@ public class TestPostingsOffsets extends
w.close();
final String[] terms = new String[] {"a", "b", "c", "d"};
- for(AtomicReaderContext ctx : r.leaves()) {
+ for(LeafReaderContext ctx : r.leaves()) {
// TODO: improve this
- AtomicReader sub = ctx.reader();
+ LeafReader sub = ctx.reader();
//System.out.println("\nsub=" + sub);
final TermsEnum termsEnum = sub.fields().terms("content").iterator(null);
DocsEnum docs = null;
@@ -379,7 +379,7 @@ public class TestPostingsOffsets extends
riw.addDocument(doc);
}
CompositeReader ir = riw.getReader();
- AtomicReader slow = SlowCompositeReaderWrapper.wrap(ir);
+ LeafReader slow = SlowCompositeReaderWrapper.wrap(ir);
FieldInfos fis = slow.getFieldInfos();
assertEquals(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS, fis.fieldInfo("foo").getIndexOptions());
slow.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java Tue Sep 23 23:51:55 2014
@@ -72,7 +72,7 @@ public class TestReaderClosed extends Lu
public void testReaderChaining() throws Exception {
assertTrue(reader.getRefCount() > 0);
IndexReader wrappedReader = SlowCompositeReaderWrapper.wrap(reader);
- wrappedReader = new ParallelAtomicReader((AtomicReader) wrappedReader);
+ wrappedReader = new ParallelLeafReader((LeafReader) wrappedReader);
IndexSearcher searcher = newSearcher(wrappedReader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java Tue Sep 23 23:51:55 2014
@@ -80,7 +80,7 @@ public class TestSegmentMerger extends L
final Codec codec = Codec.getDefault();
final SegmentInfo si = new SegmentInfo(mergedDir, Version.LATEST, mergedSegment, -1, false, codec, null);
- SegmentMerger merger = new SegmentMerger(Arrays.<AtomicReader>asList(reader1, reader2),
+ SegmentMerger merger = new SegmentMerger(Arrays.<LeafReader>asList(reader1, reader2),
si, InfoStream.getDefault(), mergedDir,
MergeState.CheckAbort.NONE, new FieldInfos.FieldNumbers(), newIOContext(random()), true);
MergeState mergeState = merger.merge();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java Tue Sep 23 23:51:55 2014
@@ -172,7 +172,7 @@ public class TestSegmentReader extends L
checkNorms(reader);
}
- public static void checkNorms(AtomicReader reader) throws IOException {
+ public static void checkNorms(LeafReader reader) throws IOException {
// test omit norms
for (int i=0; i<DocHelper.fields.length; i++) {
IndexableField f = DocHelper.fields[i];
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java Tue Sep 23 23:51:55 2014
@@ -280,9 +280,9 @@ public class TestStressIndexing2 extends
}
private static void printDocs(DirectoryReader r) throws Throwable {
- for(AtomicReaderContext ctx : r.leaves()) {
+ for(LeafReaderContext ctx : r.leaves()) {
// TODO: improve this
- AtomicReader sub = ctx.reader();
+ LeafReader sub = ctx.reader();
Bits liveDocs = sub.getLiveDocs();
System.out.println(" " + ((SegmentReader) sub).getSegmentInfo());
for(int docID=0;docID<sub.maxDoc();docID++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Tue Sep 23 23:51:55 2014
@@ -187,7 +187,7 @@ public class TestTermVectorsReader exten
public void test() throws IOException {
//Check to see the files were created properly in setup
DirectoryReader reader = DirectoryReader.open(dir);
- for (AtomicReaderContext ctx : reader.leaves()) {
+ for (LeafReaderContext ctx : reader.leaves()) {
SegmentReader sr = (SegmentReader) ctx.reader();
assertTrue(sr.getFieldInfos().hasVectors());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java Tue Sep 23 23:51:55 2014
@@ -735,7 +735,7 @@ public class TestTermsEnum extends Lucen
w.forceMerge(1);
DirectoryReader r = w.getReader();
w.close();
- AtomicReader sub = getOnlySegmentReader(r);
+ LeafReader sub = getOnlySegmentReader(r);
Terms terms = sub.fields().terms("field");
Automaton automaton = new RegExp(".*", RegExp.NONE).toAutomaton();
CompiledAutomaton ca = new CompiledAutomaton(automaton, false, false);
@@ -789,7 +789,7 @@ public class TestTermsEnum extends Lucen
w.forceMerge(1);
DirectoryReader r = w.getReader();
w.close();
- AtomicReader sub = getOnlySegmentReader(r);
+ LeafReader sub = getOnlySegmentReader(r);
Terms terms = sub.fields().terms("field");
Automaton automaton = new RegExp(".*d", RegExp.NONE).toAutomaton();
@@ -843,7 +843,7 @@ public class TestTermsEnum extends Lucen
w.forceMerge(1);
DirectoryReader r = w.getReader();
w.close();
- AtomicReader sub = getOnlySegmentReader(r);
+ LeafReader sub = getOnlySegmentReader(r);
Terms terms = sub.fields().terms("field");
Automaton automaton = new RegExp(".*", RegExp.NONE).toAutomaton(); // accept ALL
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java Tue Sep 23 23:51:55 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
@@ -233,7 +232,7 @@ public class TestTieredMergePolicy exten
IndexReader r = DirectoryReader.open(w, true);
// Make sure TMP always merged equal-number-of-docs segments:
- for(AtomicReaderContext ctx : r.leaves()) {
+ for(LeafReaderContext ctx : r.leaves()) {
int numDocs = ctx.reader().numDocs();
assertTrue("got numDocs=" + numDocs, numDocs == 100 || numDocs == 1000 || numDocs == 10000);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java Tue Sep 23 23:51:55 2014
@@ -110,7 +110,7 @@ public class TestUniqueTermCount extends
}
@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/core/src/test/org/apache/lucene/search/JustCompileSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java Tue Sep 23 23:51:55 2014
@@ -19,12 +19,9 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.util.PriorityQueue;
@@ -47,7 +44,7 @@ final class JustCompileSearch {
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -127,7 +124,7 @@ final class JustCompileSearch {
}
@Override
- public FieldComparator<Object> setNextReader(AtomicReaderContext context) {
+ public FieldComparator<Object> setNextReader(LeafReaderContext context) {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -157,7 +154,7 @@ final class JustCompileSearch {
// still added here in case someone will add abstract methods in the future.
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return null;
}
}
@@ -246,7 +243,7 @@ final class JustCompileSearch {
}
@Override
- public SimScorer simScorer(SimWeight stats, AtomicReaderContext context) {
+ public SimScorer simScorer(SimWeight stats, LeafReaderContext context) {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -268,7 +265,7 @@ final class JustCompileSearch {
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -302,7 +299,7 @@ final class JustCompileSearch {
static final class JustCompileWeight extends Weight {
@Override
- public Explanation explain(AtomicReaderContext context, int doc) {
+ public Explanation explain(LeafReaderContext context, int doc) {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -322,7 +319,7 @@ final class JustCompileSearch {
}
@Override
- public Scorer scorer(AtomicReaderContext context, Bits acceptDocs) {
+ public Scorer scorer(LeafReaderContext context, Bits acceptDocs) {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/MockFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/MockFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/MockFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/MockFilter.java Tue Sep 23 23:51:55 2014
@@ -17,8 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.util.DocIdBitSet;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.Bits;
@@ -26,7 +25,7 @@ public class MockFilter extends Filter {
private boolean wasCalled;
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
wasCalled = true;
return new FixedBitSet(context.reader().maxDoc());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/MultiCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/MultiCollectorTest.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/MultiCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/MultiCollectorTest.java Tue Sep 23 23:51:55 2014
@@ -19,9 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.search.Collector;
-import org.apache.lucene.search.Scorer;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
@@ -46,7 +44,7 @@ public class MultiCollectorTest extends
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
setNextReaderCalled = true;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/SingleDocTestFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/SingleDocTestFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/SingleDocTestFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/SingleDocTestFilter.java Tue Sep 23 23:51:55 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.FixedBitSet;
@@ -31,7 +31,7 @@ public class SingleDocTestFilter extends
}
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
FixedBitSet bits = new FixedBitSet(context.reader().maxDoc());
bits.set(doc);
if (acceptDocs != null && !acceptDocs.get(doc)) bits.clear(doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java Tue Sep 23 23:51:55 2014
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
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.FieldInvertState;
import org.apache.lucene.index.IndexWriter;
@@ -95,7 +95,7 @@ public class TestBooleanCoord extends Lu
}
@Override
- public SimScorer simScorer(SimWeight weight, AtomicReaderContext context) throws IOException {
+ public SimScorer simScorer(SimWeight weight, LeafReaderContext context) throws IOException {
return new SimScorer() {
@Override
public float score(int doc, float freq) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java Tue Sep 23 23:51:55 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-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;
@@ -337,7 +337,7 @@ public class TestBooleanQuery extends Lu
w.close();
IndexSearcher s = new IndexSearcher(r) {
@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 {
assertEquals(-1, collector.getClass().getSimpleName().indexOf("OutOfOrder"));
super.search(leaves, weight, collector);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java Tue Sep 23 23:51:55 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.TextField;
-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;
@@ -133,7 +133,7 @@ public class TestBooleanQueryVisitSubsco
super(TopScoreDocCollector.create(10, true));
}
- public LeafCollector getLeafCollector(AtomicReaderContext context)
+ public LeafCollector getLeafCollector(LeafReaderContext context)
throws IOException {
final int docBase = context.docBase;
return new FilterLeafCollector(super.getLeafCollector(context)) {
@@ -232,7 +232,7 @@ public class TestBooleanQueryVisitSubsco
}
@Override
- public LeafCollector getLeafCollector(AtomicReaderContext context) throws IOException {
+ public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
return new LeafCollector() {
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java Tue Sep 23 23:51:55 2014
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -111,7 +111,7 @@ public class TestBooleanScorer extends L
}
@Override
- protected void doSetNextReader(AtomicReaderContext context) throws IOException {
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
docBase = context.docBase;
}
@@ -188,7 +188,7 @@ public class TestBooleanScorer extends L
public Weight createWeight(IndexSearcher searcher) throws IOException {
return new Weight() {
@Override
- public Explanation explain(AtomicReaderContext context, int doc) {
+ public Explanation explain(LeafReaderContext context, int doc) {
throw new UnsupportedOperationException();
}
@@ -207,12 +207,12 @@ public class TestBooleanScorer extends L
}
@Override
- public Scorer scorer(AtomicReaderContext context, Bits acceptDocs) {
+ public Scorer scorer(LeafReaderContext context, Bits acceptDocs) {
throw new UnsupportedOperationException();
}
@Override
- public BulkScorer bulkScorer(AtomicReaderContext context, boolean scoreDocsInOrder, Bits acceptDocs) {
+ public BulkScorer bulkScorer(LeafReaderContext context, boolean scoreDocsInOrder, Bits acceptDocs) {
return new BulkScorer() {
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Tue Sep 23 23:51:55 2014
@@ -23,7 +23,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
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.RandomIndexWriter;
@@ -147,7 +147,7 @@ public class TestCachingWrapperFilter ex
writer.close();
IndexReader reader = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
- AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
+ LeafReaderContext context = (LeafReaderContext) reader.getContext();
MockFilter filter = new MockFilter();
CachingWrapperFilter cacher = new CachingWrapperFilter(filter);
@@ -173,11 +173,11 @@ public class TestCachingWrapperFilter ex
writer.close();
IndexReader reader = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
- AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
+ LeafReaderContext context = (LeafReaderContext) reader.getContext();
final Filter filter = new Filter() {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return null;
}
};
@@ -196,11 +196,11 @@ public class TestCachingWrapperFilter ex
writer.close();
IndexReader reader = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
- AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
+ LeafReaderContext context = (LeafReaderContext) reader.getContext();
final Filter filter = new Filter() {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return new DocIdSet() {
@Override
public DocIdSetIterator iterator() {
@@ -224,8 +224,8 @@ public class TestCachingWrapperFilter ex
}
private static void assertDocIdSetCacheable(IndexReader reader, Filter filter, boolean shouldCacheable) throws IOException {
- assertTrue(reader.getContext() instanceof AtomicReaderContext);
- AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
+ assertTrue(reader.getContext() instanceof LeafReaderContext);
+ LeafReaderContext context = (LeafReaderContext) reader.getContext();
final CachingWrapperFilter cacher = new CachingWrapperFilter(filter);
final DocIdSet originalSet = filter.getDocIdSet(context, context.reader().getLiveDocs());
final DocIdSet cachedSet = cacher.getDocIdSet(context, context.reader().getLiveDocs());
@@ -263,7 +263,7 @@ public class TestCachingWrapperFilter ex
// a fixedbitset filter is always cacheable
assertDocIdSetCacheable(reader, new Filter() {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return new FixedBitSet(context.reader().maxDoc());
}
}, true);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java?rev=1627178&r1=1627177&r2=1627178&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java Tue Sep 23 23:51:55 2014
@@ -25,7 +25,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
@@ -109,7 +109,7 @@ public class TestConjunctions extends Lu
}
@Override
- public SimScorer simScorer(SimWeight weight, AtomicReaderContext context) throws IOException {
+ public SimScorer simScorer(SimWeight weight, LeafReaderContext context) throws IOException {
return new SimScorer() {
@Override
public float score(int doc, float freq) {