You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/01/30 00:51:01 UTC
svn commit: r1237508 [2/4] - in /lucene/dev/branches/lucene2858:
lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/memory/src/java/org/apache/l...
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.ToStringUtils;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java Sun Jan 29 23:50:54 2012
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.Set;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCache.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCache.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCache.java Sun Jan 29 23:50:54 2012
@@ -24,7 +24,7 @@ import java.text.DecimalFormat;
import org.apache.lucene.analysis.NumericTokenStream; // for javadocs
import org.apache.lucene.document.NumericField; // for javadocs
import org.apache.lucene.index.DocTermOrds;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
@@ -63,7 +63,7 @@ public interface FieldCache {
}
/** Interface to parse bytes from document fields.
- * @see FieldCache#getBytes(AtomicIndexReader, String, FieldCache.ByteParser, boolean)
+ * @see FieldCache#getBytes(AtomicReader, String, FieldCache.ByteParser, boolean)
*/
public interface ByteParser extends Parser {
/** Return a single Byte representation of this field's value. */
@@ -71,7 +71,7 @@ public interface FieldCache {
}
/** Interface to parse shorts from document fields.
- * @see FieldCache#getShorts(AtomicIndexReader, String, FieldCache.ShortParser, boolean)
+ * @see FieldCache#getShorts(AtomicReader, String, FieldCache.ShortParser, boolean)
*/
public interface ShortParser extends Parser {
/** Return a short representation of this field's value. */
@@ -79,7 +79,7 @@ public interface FieldCache {
}
/** Interface to parse ints from document fields.
- * @see FieldCache#getInts(AtomicIndexReader, String, FieldCache.IntParser, boolean)
+ * @see FieldCache#getInts(AtomicReader, String, FieldCache.IntParser, boolean)
*/
public interface IntParser extends Parser {
/** Return an integer representation of this field's value. */
@@ -87,7 +87,7 @@ public interface FieldCache {
}
/** Interface to parse floats from document fields.
- * @see FieldCache#getFloats(AtomicIndexReader, String, FieldCache.FloatParser, boolean)
+ * @see FieldCache#getFloats(AtomicReader, String, FieldCache.FloatParser, boolean)
*/
public interface FloatParser extends Parser {
/** Return an float representation of this field's value. */
@@ -95,7 +95,7 @@ public interface FieldCache {
}
/** Interface to parse long from document fields.
- * @see FieldCache#getLongs(AtomicIndexReader, String, FieldCache.LongParser, boolean)
+ * @see FieldCache#getLongs(AtomicReader, String, FieldCache.LongParser, boolean)
*/
public interface LongParser extends Parser {
/** Return an long representation of this field's value. */
@@ -103,7 +103,7 @@ public interface FieldCache {
}
/** Interface to parse doubles from document fields.
- * @see FieldCache#getDoubles(AtomicIndexReader, String, FieldCache.DoubleParser, boolean)
+ * @see FieldCache#getDoubles(AtomicReader, String, FieldCache.DoubleParser, boolean)
*/
public interface DoubleParser extends Parser {
/** Return an long representation of this field's value. */
@@ -303,7 +303,7 @@ public interface FieldCache {
* <code>reader.maxDoc()</code>, with turned on bits for each docid that
* does have a value for this field.
*/
- public Bits getDocsWithField(AtomicIndexReader reader, String field)
+ public Bits getDocsWithField(AtomicReader reader, String field)
throws IOException;
/** Checks the internal cache for an appropriate entry, and if none is
@@ -317,7 +317,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public byte[] getBytes (AtomicIndexReader reader, String field, boolean setDocsWithField)
+ public byte[] getBytes (AtomicReader reader, String field, boolean setDocsWithField)
throws IOException;
/** Checks the internal cache for an appropriate entry, and if none is found,
@@ -332,7 +332,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public byte[] getBytes (AtomicIndexReader reader, String field, ByteParser parser, boolean setDocsWithField)
+ public byte[] getBytes (AtomicReader reader, String field, ByteParser parser, boolean setDocsWithField)
throws IOException;
/** Checks the internal cache for an appropriate entry, and if none is
@@ -346,7 +346,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public short[] getShorts (AtomicIndexReader reader, String field, boolean setDocsWithField)
+ public short[] getShorts (AtomicReader reader, String field, boolean setDocsWithField)
throws IOException;
/** Checks the internal cache for an appropriate entry, and if none is found,
@@ -361,7 +361,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public short[] getShorts (AtomicIndexReader reader, String field, ShortParser parser, boolean setDocsWithField)
+ public short[] getShorts (AtomicReader reader, String field, ShortParser parser, boolean setDocsWithField)
throws IOException;
/** Checks the internal cache for an appropriate entry, and if none is
@@ -375,7 +375,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public int[] getInts (AtomicIndexReader reader, String field, boolean setDocsWithField)
+ public int[] getInts (AtomicReader reader, String field, boolean setDocsWithField)
throws IOException;
/** Checks the internal cache for an appropriate entry, and if none is found,
@@ -390,7 +390,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public int[] getInts (AtomicIndexReader reader, String field, IntParser parser, boolean setDocsWithField)
+ public int[] getInts (AtomicReader reader, String field, IntParser parser, boolean setDocsWithField)
throws IOException;
/** Checks the internal cache for an appropriate entry, and if
@@ -404,7 +404,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public float[] getFloats (AtomicIndexReader reader, String field, boolean setDocsWithField)
+ public float[] getFloats (AtomicReader reader, String field, boolean setDocsWithField)
throws IOException;
/** Checks the internal cache for an appropriate entry, and if
@@ -419,7 +419,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public float[] getFloats (AtomicIndexReader reader, String field,
+ public float[] getFloats (AtomicReader reader, String field,
FloatParser parser, boolean setDocsWithField) throws IOException;
/**
@@ -435,7 +435,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws java.io.IOException If any error occurs.
*/
- public long[] getLongs(AtomicIndexReader reader, String field, boolean setDocsWithField)
+ public long[] getLongs(AtomicReader reader, String field, boolean setDocsWithField)
throws IOException;
/**
@@ -452,7 +452,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public long[] getLongs(AtomicIndexReader reader, String field, LongParser parser, boolean setDocsWithField)
+ public long[] getLongs(AtomicReader reader, String field, LongParser parser, boolean setDocsWithField)
throws IOException;
/**
@@ -468,7 +468,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public double[] getDoubles(AtomicIndexReader reader, String field, boolean setDocsWithField)
+ public double[] getDoubles(AtomicReader reader, String field, boolean setDocsWithField)
throws IOException;
/**
@@ -485,7 +485,7 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public double[] getDoubles(AtomicIndexReader reader, String field, DoubleParser parser, boolean setDocsWithField)
+ public double[] getDoubles(AtomicReader reader, String field, DoubleParser parser, boolean setDocsWithField)
throws IOException;
/** Returned by {@link #getTerms} */
@@ -513,15 +513,15 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public DocTerms getTerms (AtomicIndexReader reader, String field)
+ public DocTerms getTerms (AtomicReader reader, String field)
throws IOException;
- /** Expert: just like {@link #getTerms(AtomicIndexReader,String)},
+ /** Expert: just like {@link #getTerms(AtomicReader,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 DocTerms getTerms (AtomicIndexReader reader, String field, boolean fasterButMoreRAM)
+ public DocTerms getTerms (AtomicReader reader, String field, boolean fasterButMoreRAM)
throws IOException;
/** Returned by {@link #getTermsIndex} */
@@ -589,16 +589,16 @@ public interface FieldCache {
* @return The values in the given field for each document.
* @throws IOException If any error occurs.
*/
- public DocTermsIndex getTermsIndex (AtomicIndexReader reader, String field)
+ public DocTermsIndex getTermsIndex (AtomicReader reader, String field)
throws IOException;
/** Expert: just like {@link
- * #getTermsIndex(AtomicIndexReader,String)}, but you can specify
+ * #getTermsIndex(AtomicReader,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 DocTermsIndex getTermsIndex (AtomicIndexReader reader, String field, boolean fasterButMoreRAM)
+ public DocTermsIndex getTermsIndex (AtomicReader reader, String field, boolean fasterButMoreRAM)
throws IOException;
/**
@@ -611,7 +611,7 @@ public interface FieldCache {
* @return a {@link DocTermOrds} instance
* @throws IOException If any error occurs.
*/
- public DocTermOrds getDocTermOrds(AtomicIndexReader reader, String field) throws IOException;
+ public DocTermOrds getDocTermOrds(AtomicReader reader, String field) throws IOException;
/**
* EXPERT: A unique Identifier/Description for each item in the FieldCache.
@@ -705,7 +705,7 @@ public interface FieldCache {
* top-level reader, it usually will have no effect as
* Lucene now caches at the segment reader level.
*/
- public abstract void purge(AtomicIndexReader r);
+ public abstract void purge(AtomicReader r);
/**
* If non-null, FieldCacheImpl will warn whenever
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java Sun Jan 29 23:50:54 2012
@@ -29,7 +29,7 @@ import java.util.WeakHashMap;
import org.apache.lucene.index.DocTermOrds;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.OrdTermState;
import org.apache.lucene.index.SegmentReader;
@@ -75,7 +75,7 @@ class FieldCacheImpl implements FieldCac
init();
}
- public synchronized void purge(AtomicIndexReader r) {
+ public synchronized void purge(AtomicReader r) {
for(Cache c : caches.values()) {
c.purge(r);
}
@@ -154,23 +154,23 @@ class FieldCacheImpl implements FieldCac
};
// composite/SlowMultiReaderWrapper fieldcaches don't purge until composite reader is closed.
- final AtomicIndexReader.ReaderClosedListener purgeReader = new AtomicIndexReader.ReaderClosedListener() {
+ final IndexReader.ReaderClosedListener purgeReader = new IndexReader.ReaderClosedListener() {
@Override
public void onClose(IndexReader owner) {
- assert owner instanceof AtomicIndexReader;
- FieldCacheImpl.this.purge((AtomicIndexReader) owner);
+ assert owner instanceof AtomicReader;
+ FieldCacheImpl.this.purge((AtomicReader) owner);
}
};
- private void initReader(AtomicIndexReader reader) {
+ private void initReader(AtomicReader reader) {
if (reader instanceof SegmentReader) {
((SegmentReader) reader).addCoreClosedListener(purgeCore);
} else {
// we have a slow reader of some sort, try to register a purge event
// rather than relying on gc:
Object key = reader.getCoreCacheKey();
- if (key instanceof AtomicIndexReader) {
- ((AtomicIndexReader)key).addReaderClosedListener(purgeReader);
+ if (key instanceof AtomicReader) {
+ ((AtomicReader)key).addReaderClosedListener(purgeReader);
} else {
// last chance
reader.addReaderClosedListener(purgeReader);
@@ -189,11 +189,11 @@ class FieldCacheImpl implements FieldCac
final Map<Object,Map<Entry,Object>> readerCache = new WeakHashMap<Object,Map<Entry,Object>>();
- protected abstract Object createValue(AtomicIndexReader reader, Entry key, boolean setDocsWithField)
+ protected abstract Object createValue(AtomicReader reader, Entry key, boolean setDocsWithField)
throws IOException;
/** Remove this reader from the cache, if present. */
- public void purge(AtomicIndexReader r) {
+ public void purge(AtomicReader r) {
Object readerKey = r.getCoreCacheKey();
synchronized(readerCache) {
readerCache.remove(readerKey);
@@ -202,7 +202,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(AtomicIndexReader reader, Entry key, Object value) {
+ public void put(AtomicReader reader, Entry key, Object value) {
final Object readerKey = reader.getCoreCacheKey();
synchronized (readerCache) {
Map<Entry,Object> innerCache = readerCache.get(readerKey);
@@ -221,7 +221,7 @@ class FieldCacheImpl implements FieldCac
}
}
- public Object get(AtomicIndexReader reader, Entry key, boolean setDocsWithField) throws IOException {
+ public Object get(AtomicReader reader, Entry key, boolean setDocsWithField) throws IOException {
Map<Entry,Object> innerCache;
Object value;
final Object readerKey = reader.getCoreCacheKey();
@@ -319,12 +319,12 @@ class FieldCacheImpl implements FieldCac
}
// inherit javadocs
- public byte[] getBytes (AtomicIndexReader reader, String field, boolean setDocsWithField) throws IOException {
+ public byte[] getBytes (AtomicReader reader, String field, boolean setDocsWithField) throws IOException {
return getBytes(reader, field, null, setDocsWithField);
}
// inherit javadocs
- public byte[] getBytes(AtomicIndexReader reader, String field, ByteParser parser, boolean setDocsWithField)
+ public byte[] getBytes(AtomicReader reader, String field, ByteParser parser, boolean setDocsWithField)
throws IOException {
return (byte[]) caches.get(Byte.TYPE).get(reader, new Entry(field, parser), setDocsWithField);
}
@@ -334,7 +334,7 @@ class FieldCacheImpl implements FieldCac
super(wrapper);
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField)
throws IOException {
String field = entryKey.field;
ByteParser parser = (ByteParser) entryKey.custom;
@@ -391,12 +391,12 @@ class FieldCacheImpl implements FieldCac
}
// inherit javadocs
- public short[] getShorts (AtomicIndexReader reader, String field, boolean setDocsWithField) throws IOException {
+ public short[] getShorts (AtomicReader reader, String field, boolean setDocsWithField) throws IOException {
return getShorts(reader, field, null, setDocsWithField);
}
// inherit javadocs
- public short[] getShorts(AtomicIndexReader reader, String field, ShortParser parser, boolean setDocsWithField)
+ public short[] getShorts(AtomicReader reader, String field, ShortParser parser, boolean setDocsWithField)
throws IOException {
return (short[]) caches.get(Short.TYPE).get(reader, new Entry(field, parser), setDocsWithField);
}
@@ -407,7 +407,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField)
throws IOException {
String field = entryKey.field;
ShortParser parser = (ShortParser) entryKey.custom;
@@ -464,7 +464,7 @@ class FieldCacheImpl implements FieldCac
}
// null Bits means no docs matched
- void setDocsWithField(AtomicIndexReader reader, String field, Bits docsWithField) {
+ void setDocsWithField(AtomicReader reader, String field, Bits docsWithField) {
final int maxDoc = reader.maxDoc();
final Bits bits;
if (docsWithField == null) {
@@ -485,12 +485,12 @@ class FieldCacheImpl implements FieldCac
}
// inherit javadocs
- public int[] getInts (AtomicIndexReader reader, String field, boolean setDocsWithField) throws IOException {
+ public int[] getInts (AtomicReader reader, String field, boolean setDocsWithField) throws IOException {
return getInts(reader, field, null, setDocsWithField);
}
// inherit javadocs
- public int[] getInts(AtomicIndexReader reader, String field, IntParser parser, boolean setDocsWithField)
+ public int[] getInts(AtomicReader reader, String field, IntParser parser, boolean setDocsWithField)
throws IOException {
return (int[]) caches.get(Integer.TYPE).get(reader, new Entry(field, parser), setDocsWithField);
}
@@ -501,7 +501,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField)
throws IOException {
String field = entryKey.field;
IntParser parser = (IntParser) entryKey.custom;
@@ -572,7 +572,7 @@ class FieldCacheImpl implements FieldCac
}
}
- public Bits getDocsWithField(AtomicIndexReader reader, String field)
+ public Bits getDocsWithField(AtomicReader reader, String field)
throws IOException {
return (Bits) caches.get(DocsWithFieldCache.class).get(reader, new Entry(field, null), false);
}
@@ -583,7 +583,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField /* ignored */)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField /* ignored */)
throws IOException {
final String field = entryKey.field;
FixedBitSet res = null;
@@ -633,13 +633,13 @@ class FieldCacheImpl implements FieldCac
}
// inherit javadocs
- public float[] getFloats (AtomicIndexReader reader, String field, boolean setDocsWithField)
+ public float[] getFloats (AtomicReader reader, String field, boolean setDocsWithField)
throws IOException {
return getFloats(reader, field, null, setDocsWithField);
}
// inherit javadocs
- public float[] getFloats(AtomicIndexReader reader, String field, FloatParser parser, boolean setDocsWithField)
+ public float[] getFloats(AtomicReader reader, String field, FloatParser parser, boolean setDocsWithField)
throws IOException {
return (float[]) caches.get(Float.TYPE).get(reader, new Entry(field, parser), setDocsWithField);
@@ -651,7 +651,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField)
throws IOException {
String field = entryKey.field;
FloatParser parser = (FloatParser) entryKey.custom;
@@ -723,12 +723,12 @@ class FieldCacheImpl implements FieldCac
}
- public long[] getLongs(AtomicIndexReader reader, String field, boolean setDocsWithField) throws IOException {
+ public long[] getLongs(AtomicReader reader, String field, boolean setDocsWithField) throws IOException {
return getLongs(reader, field, null, setDocsWithField);
}
// inherit javadocs
- public long[] getLongs(AtomicIndexReader reader, String field, FieldCache.LongParser parser, boolean setDocsWithField)
+ public long[] getLongs(AtomicReader reader, String field, FieldCache.LongParser parser, boolean setDocsWithField)
throws IOException {
return (long[]) caches.get(Long.TYPE).get(reader, new Entry(field, parser), setDocsWithField);
}
@@ -739,7 +739,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField)
throws IOException {
String field = entryKey.field;
FieldCache.LongParser parser = (FieldCache.LongParser) entryKey.custom;
@@ -811,13 +811,13 @@ class FieldCacheImpl implements FieldCac
}
// inherit javadocs
- public double[] getDoubles(AtomicIndexReader reader, String field, boolean setDocsWithField)
+ public double[] getDoubles(AtomicReader reader, String field, boolean setDocsWithField)
throws IOException {
return getDoubles(reader, field, null, setDocsWithField);
}
// inherit javadocs
- public double[] getDoubles(AtomicIndexReader reader, String field, FieldCache.DoubleParser parser, boolean setDocsWithField)
+ public double[] getDoubles(AtomicReader reader, String field, FieldCache.DoubleParser parser, boolean setDocsWithField)
throws IOException {
return (double[]) caches.get(Double.TYPE).get(reader, new Entry(field, parser), setDocsWithField);
}
@@ -828,7 +828,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField)
throws IOException {
String field = entryKey.field;
FieldCache.DoubleParser parser = (FieldCache.DoubleParser) entryKey.custom;
@@ -1073,11 +1073,11 @@ class FieldCacheImpl implements FieldCac
private static boolean DEFAULT_FASTER_BUT_MORE_RAM = true;
- public DocTermsIndex getTermsIndex(AtomicIndexReader reader, String field) throws IOException {
+ public DocTermsIndex getTermsIndex(AtomicReader reader, String field) throws IOException {
return getTermsIndex(reader, field, DEFAULT_FASTER_BUT_MORE_RAM);
}
- public DocTermsIndex getTermsIndex(AtomicIndexReader reader, String field, boolean fasterButMoreRAM) throws IOException {
+ public DocTermsIndex getTermsIndex(AtomicReader reader, String field, boolean fasterButMoreRAM) throws IOException {
return (DocTermsIndex) caches.get(DocTermsIndex.class).get(reader, new Entry(field, Boolean.valueOf(fasterButMoreRAM)), false);
}
@@ -1087,7 +1087,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField /* ignored */)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField /* ignored */)
throws IOException {
Terms terms = reader.terms(entryKey.field);
@@ -1218,11 +1218,11 @@ class FieldCacheImpl implements FieldCac
// TODO: this if DocTermsIndex was already created, we
// should share it...
- public DocTerms getTerms(AtomicIndexReader reader, String field) throws IOException {
+ public DocTerms getTerms(AtomicReader reader, String field) throws IOException {
return getTerms(reader, field, DEFAULT_FASTER_BUT_MORE_RAM);
}
- public DocTerms getTerms(AtomicIndexReader reader, String field, boolean fasterButMoreRAM) throws IOException {
+ public DocTerms getTerms(AtomicReader reader, String field, boolean fasterButMoreRAM) throws IOException {
return (DocTerms) caches.get(DocTerms.class).get(reader, new Entry(field, Boolean.valueOf(fasterButMoreRAM)), false);
}
@@ -1232,7 +1232,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField /* ignored */)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField /* ignored */)
throws IOException {
Terms terms = reader.terms(entryKey.field);
@@ -1306,7 +1306,7 @@ class FieldCacheImpl implements FieldCac
}
}
- public DocTermOrds getDocTermOrds(AtomicIndexReader reader, String field) throws IOException {
+ public DocTermOrds getDocTermOrds(AtomicReader reader, String field) throws IOException {
return (DocTermOrds) caches.get(DocTermOrds.class).get(reader, new Entry(field, null), false);
}
@@ -1316,7 +1316,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- protected Object createValue(AtomicIndexReader reader, Entry entryKey, boolean setDocsWithField /* ignored */)
+ protected Object createValue(AtomicReader reader, Entry entryKey, boolean setDocsWithField /* ignored */)
throws IOException {
return new DocTermOrds(reader, entryKey.field);
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java Sun Jan 29 23:50:54 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.index.DocsEnum; // javadoc @link
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldComparator.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldComparator.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldComparator.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Comparator;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldCache.ByteParser;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldValueFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldValueFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldValueFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldValueFilter.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.Bits.MatchAllBits;
import org.apache.lucene.util.Bits.MatchNoBits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Filter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Filter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Filter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Filter.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.index.IndexReader; // javadocs
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.Bits;
/**
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FilteredQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FilteredQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FilteredQuery.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.ToStringUtils;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/IndexSearcher.java Sun Jan 29 23:50:54 2012
@@ -32,7 +32,7 @@ import java.util.concurrent.locks.Reentr
import org.apache.lucene.document.Document;
import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.ToStringUtils;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiCollector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiCollector.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java Sun Jan 29 23:50:54 2012
@@ -22,8 +22,8 @@ import java.util.*;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.AtomicIndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
@@ -178,7 +178,7 @@ public class MultiPhraseQuery extends Qu
public Scorer scorer(AtomicReaderContext context, boolean scoreDocsInOrder,
boolean topScorer, Bits acceptDocs) throws IOException {
assert !termArrays.isEmpty();
- final AtomicIndexReader reader = context.reader();
+ final AtomicReader reader = context.reader();
final Bits liveDocs = acceptDocs;
PhraseQuery.PostingsAndFreq[] postingsFreqs = new PhraseQuery.PostingsAndFreq[termArrays.size()];
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java Sun Jan 29 23:50:54 2012
@@ -21,8 +21,8 @@ import java.io.IOException;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.FixedBitSet;
@@ -83,7 +83,7 @@ public class MultiTermQueryWrapperFilter
*/
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
- final AtomicIndexReader reader = context.reader();
+ final AtomicReader reader = context.reader();
final Fields fields = reader.fields();
if (fields == null) {
// reader has no fields
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PhraseQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PhraseQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PhraseQuery.java Sun Jan 29 23:50:54 2012
@@ -22,10 +22,10 @@ import java.util.ArrayList;
import java.util.Set;
import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermState;
import org.apache.lucene.index.Terms;
@@ -220,7 +220,7 @@ public class PhraseQuery extends Query {
public Scorer scorer(AtomicReaderContext context, boolean scoreDocsInOrder,
boolean topScorer, Bits acceptDocs) throws IOException {
assert !terms.isEmpty();
- final AtomicIndexReader reader = context.reader();
+ final AtomicReader reader = context.reader();
final Bits liveDocs = acceptDocs;
PostingsAndFreq[] postingsFreqs = new PostingsAndFreq[terms.size()];
@@ -271,7 +271,7 @@ public class PhraseQuery extends Query {
}
// only called from assert
- private boolean termNotInReader(AtomicIndexReader reader, String field, BytesRef bytes) throws IOException {
+ private boolean termNotInReader(AtomicReader reader, String field, BytesRef bytes) throws IOException {
return reader.docFreq(field, bytes) == 0;
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
/**
* A {@link Collector} implementation which wraps another
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.Bits;
/**
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java Sun Jan 29 23:50:54 2012
@@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.BytesRef;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermQuery.java Sun Jan 29 23:50:54 2012
@@ -21,9 +21,9 @@ import java.io.IOException;
import java.util.Set;
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermState;
import org.apache.lucene.index.TermsEnum;
@@ -117,7 +117,7 @@ public class TermQuery extends Query {
return termsEnum;
}
- private boolean termNotInReader(AtomicIndexReader reader, String field, BytesRef bytes) throws IOException {
+ private boolean termNotInReader(AtomicReader reader, String field, BytesRef bytes) throws IOException {
// only called from assert
//System.out.println("TQ.termNotInReader reader=" + reader + " term=" + field + ":" + bytes.utf8ToString());
return reader.docFreq(field, bytes) == 0;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.Counter;
import org.apache.lucene.util.ThreadInterruptedException;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopFieldCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopFieldCollector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopFieldCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopFieldCollector.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
import org.apache.lucene.util.PriorityQueue;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopScoreDocCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopScoreDocCollector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopScoreDocCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopScoreDocCollector.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
/**
* A {@link Collector} implementation that collects the top-scoring hits,
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TotalHitCountCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TotalHitCountCollector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TotalHitCountCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TotalHitCountCollector.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
/**
* Just counts the total number of hits.
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Weight.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Weight.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Weight.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Weight.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.search.similarities.SimilarityProvider;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.payload
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.ComplexExplanation;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.Scorer;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java Sun Jan 29 23:50:54 2012
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.TreeSet;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.payload
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java Sun Jan 29 23:50:54 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search.similar
import java.io.IOException;
import org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java Sun Jan 29 23:50:54 2012
@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.lucene.document.DocValuesField; // javadoc
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader; // javadoc
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.index.Terms; // javadoc
import org.apache.lucene.search.BooleanQuery;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java Sun Jan 29 23:50:54 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Norm;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java Sun Jan 29 23:50:54 2012
@@ -21,7 +21,7 @@ package org.apache.lucene.search.similar
import java.io.IOException;
import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java Sun Jan 29 23:50:54 2012
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Weight;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search.spans;
*/
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.TermContext;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search.spans;
*/
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.PriorityQueue;
import org.apache.lucene.util.TermContext;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java Sun Jan 29 23:50:54 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.Map;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.MultiTermQuery;
import org.apache.lucene.search.Query;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java Sun Jan 29 23:50:54 2012
@@ -28,7 +28,7 @@ import java.util.Set;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search.spans;
*/
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java Sun Jan 29 23:50:54 2012
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.PriorityQueue;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java Sun Jan 29 23:50:54 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search.spans;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search.spans;
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.DocsAndPositionsEnum;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java Sun Jan 29 23:50:54 2012
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldCache.CacheEntry;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/ReaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/ReaderUtil.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/ReaderUtil.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/ReaderUtil.java Sun Jan 29 23:50:54 2012
@@ -23,10 +23,10 @@ import java.io.IOException;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.CompositeIndexReader;
-import org.apache.lucene.index.CompositeIndexReader.CompositeReaderContext;
-import org.apache.lucene.index.AtomicIndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.CompositeReader;
+import org.apache.lucene.index.CompositeReader.CompositeReaderContext;
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.ReaderContext;
@@ -68,11 +68,11 @@ public final class ReaderUtil {
* @param reader
*/
- public static void gatherSubReaders(final List<AtomicIndexReader> allSubReaders, IndexReader reader) {
+ public static void gatherSubReaders(final List<AtomicReader> allSubReaders, IndexReader reader) {
try {
new Gather(reader) {
@Override
- protected void add(int base, AtomicIndexReader r) {
+ protected void add(int base, AtomicReader r) {
allSubReaders.add(r);
}
}.run();
@@ -103,13 +103,13 @@ public final class ReaderUtil {
}
private int run(int base, IndexReader reader) throws IOException {
- if (reader instanceof AtomicIndexReader) {
+ if (reader instanceof AtomicReader) {
// atomic reader
- add(base, (AtomicIndexReader) reader);
+ add(base, (AtomicReader) reader);
base += reader.maxDoc();
} else {
- assert reader instanceof CompositeIndexReader : "must be a composite reader";
- IndexReader[] subReaders = ((CompositeIndexReader) reader).getSequentialSubReaders();
+ assert reader instanceof CompositeReader : "must be a composite reader";
+ IndexReader[] subReaders = ((CompositeReader) reader).getSequentialSubReaders();
for (int i = 0; i < subReaders.length; i++) {
base = run(base, subReaders[i]);
}
@@ -118,7 +118,7 @@ public final class ReaderUtil {
return base;
}
- protected abstract void add(int base, AtomicIndexReader r) throws IOException;
+ protected abstract void add(int base, AtomicReader r) throws IOException;
}
public static ReaderContext buildReaderContext(IndexReader reader) {
@@ -140,13 +140,13 @@ public final class ReaderUtil {
}
private ReaderContext build(CompositeReaderContext parent, IndexReader reader, int ord, int docBase) {
- if (reader instanceof AtomicIndexReader) {
- AtomicReaderContext atomic = new AtomicReaderContext(parent, (AtomicIndexReader) reader, ord, docBase, leafOrd, leafDocBase);
+ if (reader instanceof AtomicReader) {
+ AtomicReaderContext atomic = new AtomicReaderContext(parent, (AtomicReader) reader, ord, docBase, leafOrd, leafDocBase);
leaves[leafOrd++] = atomic;
leafDocBase += reader.maxDoc();
return atomic;
} else {
- CompositeIndexReader cr = (CompositeIndexReader) reader;
+ CompositeReader cr = (CompositeReader) reader;
IndexReader[] sequentialSubReaders = cr.getSequentialSubReaders();
ReaderContext[] children = new ReaderContext[sequentialSubReaders.length];
final CompositeReaderContext newParent;
@@ -170,7 +170,7 @@ public final class ReaderUtil {
try {
new Gather(reader) {
@Override
- protected void add(int base, AtomicIndexReader r) {
+ protected void add(int base, AtomicReader r) {
numLeaves[0]++;
}
}.run();
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/TermContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/TermContext.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/TermContext.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/TermContext.java Sun Jan 29 23:50:54 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.Arrays;
import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Sun Jan 29 23:50:54 2012
@@ -455,7 +455,7 @@ public abstract class ThreadedIndexingAn
conf.setMergedSegmentWarmer(new IndexWriter.IndexReaderWarmer() {
@Override
- public void warm(AtomicIndexReader reader) throws IOException {
+ public void warm(AtomicReader reader) throws IOException {
if (VERBOSE) {
System.out.println("TEST: now warm merged reader=" + reader);
}
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java Sun Jan 29 23:50:54 2012
@@ -22,7 +22,7 @@ import java.util.concurrent.ExecutorServ
import java.io.IOException;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.util.Bits;
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java Sun Jan 29 23:50:54 2012
@@ -26,7 +26,7 @@ import java.util.Random;
import junit.framework.Assert;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java Sun Jan 29 23:50:54 2012
@@ -24,10 +24,10 @@ import junit.framework.Assert;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MultiReader;
@@ -239,7 +239,7 @@ public class QueryUtils {
// FUTURE: ensure scorer.doc()==-1
final float maxDiff = 1e-5f;
- final AtomicIndexReader lastReader[] = {null};
+ final AtomicReader lastReader[] = {null};
s.search(q, new Collector() {
private Scorer sc;
@@ -301,7 +301,7 @@ public class QueryUtils {
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
if (lastReader[0] != null) {
- final AtomicIndexReader previousReader = lastReader[0];
+ final AtomicReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader);
Weight w = indexSearcher.createNormalizedWeight(q);
AtomicReaderContext ctx = (AtomicReaderContext)indexSearcher.getTopReaderContext();
@@ -327,7 +327,7 @@ public class QueryUtils {
if (lastReader[0] != null) {
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
- final AtomicIndexReader previousReader = lastReader[0];
+ final AtomicReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader, false);
Weight w = indexSearcher.createNormalizedWeight(q);
AtomicReaderContext ctx = previousReader.getTopReaderContext();
@@ -345,7 +345,7 @@ public class QueryUtils {
//System.out.println("checkFirstSkipTo: "+q);
final float maxDiff = 1e-3f;
final int lastDoc[] = {-1};
- final AtomicIndexReader lastReader[] = {null};
+ final AtomicReader lastReader[] = {null};
final AtomicReaderContext[] context = ReaderUtil.leaves(s.getTopReaderContext());
s.search(q,new Collector() {
private Scorer scorer;
@@ -386,7 +386,7 @@ public class QueryUtils {
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
if (lastReader[0] != null) {
- final AtomicIndexReader previousReader = lastReader[0];
+ final AtomicReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader);
Weight w = indexSearcher.createNormalizedWeight(q);
Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), true, false, previousReader.getLiveDocs());
@@ -410,7 +410,7 @@ public class QueryUtils {
if (lastReader[0] != null) {
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
- final AtomicIndexReader previousReader = lastReader[0];
+ final AtomicReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader);
Weight w = indexSearcher.createNormalizedWeight(q);
Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), true, false, previousReader.getLiveDocs());
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java Sun Jan 29 23:50:54 2012
@@ -22,7 +22,7 @@ import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -53,7 +53,7 @@ public class TestReuseDocsEnum extends L
DirectoryReader open = DirectoryReader.open(dir);
new ReaderUtil.Gather(open) {
@Override
- protected void add(int base, AtomicIndexReader r) throws IOException {
+ protected void add(int base, AtomicReader r) throws IOException {
Terms terms = r.terms("body");
TermsEnum iterator = terms.iterator(null);
IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<DocsEnum, Boolean>();
@@ -82,7 +82,7 @@ public class TestReuseDocsEnum extends L
DirectoryReader open = DirectoryReader.open(dir);
IndexReader[] sequentialSubReaders = open.getSequentialSubReaders();
for (IndexReader indexReader : sequentialSubReaders) {
- Terms terms = ((AtomicIndexReader) indexReader).terms("body");
+ Terms terms = ((AtomicReader) indexReader).terms("body");
TermsEnum iterator = terms.iterator(null);
IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<DocsEnum, Boolean>();
MatchNoBits bits = new Bits.MatchNoBits(open.maxDoc());
@@ -130,7 +130,7 @@ public class TestReuseDocsEnum extends L
IndexReader[] sequentialSubReaders2 = secondReader.getSequentialSubReaders();
for (IndexReader indexReader : sequentialSubReaders) {
- Terms terms = ((AtomicIndexReader) indexReader).terms("body");
+ Terms terms = ((AtomicReader) indexReader).terms("body");
TermsEnum iterator = terms.iterator(null);
IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<DocsEnum, Boolean>();
MatchNoBits bits = new Bits.MatchNoBits(firstReader.maxDoc());
@@ -159,7 +159,7 @@ public class TestReuseDocsEnum extends L
if (random.nextInt(10) == 0) {
return null;
}
- AtomicIndexReader indexReader = (AtomicIndexReader) readers[random.nextInt(readers.length)];
+ AtomicReader indexReader = (AtomicReader) readers[random.nextInt(readers.length)];
return indexReader.termDocsEnum(bits, field, term, random.nextBoolean());
}
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java Sun Jan 29 23:50:54 2012
@@ -26,7 +26,7 @@ import org.apache.lucene.codecs.nestedpu
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.CheckIndex;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
@@ -56,7 +56,7 @@ public class TestPulsingReuse extends Lu
DirectoryReader ir = iw.getReader();
iw.close();
- AtomicIndexReader segment = getOnlySegmentReader(ir);
+ AtomicReader segment = getOnlySegmentReader(ir);
DocsEnum reuse = null;
Map<DocsEnum,Boolean> allEnums = new IdentityHashMap<DocsEnum,Boolean>();
TermsEnum te = segment.terms("foo").iterator(null);
@@ -98,7 +98,7 @@ public class TestPulsingReuse extends Lu
DirectoryReader ir = iw.getReader();
iw.close();
- AtomicIndexReader segment = getOnlySegmentReader(ir);
+ AtomicReader segment = getOnlySegmentReader(ir);
DocsEnum reuse = null;
Map<DocsEnum,Boolean> allEnums = new IdentityHashMap<DocsEnum,Boolean>();
TermsEnum te = segment.terms("foo").iterator(null);