Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-3109: revert 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1310998 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2012-04-08 13:38:01 +00:00
parent c9031ca725
commit 72cc92c903
90 changed files with 320 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -259,9 +259,6 @@ Changes in backwards compatibility policy
* LUCENE-2000: clone() now returns covariant types where possible. (ryan)
* LUCENE-3109: Rename Fields/Producer/Consumer -> InvertedFields*
(Iulius Curt via Mike McCandless)
Changes in Runtime Behavior
* LUCENE-2846: omitNorms now behaves like omitTermFrequencyAndPositions, if you

8
lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
View File

@ -33,7 +33,7 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@ -70,7 +70,7 @@ public class TokenSources {
String field, Document doc, Analyzer analyzer) throws IOException {
TokenStream ts = null;
InvertedFields vectors = reader.getTermVectors(docId);
Fields vectors = reader.getTermVectors(docId);
if (vectors != null) {
Terms vector = vectors.terms(field);
if (vector != null) {
@ -102,7 +102,7 @@ public class TokenSources {
String field, Analyzer analyzer) throws IOException {
TokenStream ts = null;
InvertedFields vectors = reader.getTermVectors(docId);
Fields vectors = reader.getTermVectors(docId);
if (vectors != null) {
Terms vector = vectors.terms(field);
if (vector != null) {
@ -275,7 +275,7 @@ public class TokenSources {
public static TokenStream getTokenStream(IndexReader reader, int docId,
String field) throws IOException {
InvertedFields vectors = reader.getTermVectors(docId);
Fields vectors = reader.getTermVectors(docId);
if (vectors == null) {
throw new IllegalArgumentException(field + " in doc #" + docId
+ "does not have any term position data stored");

4
lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
View File

@ -22,7 +22,7 @@ import java.util.LinkedList;
import java.util.Set;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@ -78,7 +78,7 @@ public class FieldTermStack {
// just return to make null snippet if un-matched fieldName specified when fieldMatch == true
if( termSet == null ) return;
final InvertedFields vectors = reader.getTermVectors(docId);
final Fields vectors = reader.getTermVectors(docId);
if (vectors == null) {
// null snippet
return;

9
lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
View File

@ -35,13 +35,13 @@ import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Norm;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.OrdTermState;
import org.apache.lucene.index.StoredFieldVisitor;
@ -58,6 +58,7 @@ import org.apache.lucene.store.RAMDirectory; // for javadocs
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.Constants; // for javadocs
import org.apache.lucene.util.RamUsageEstimator;
/**
@ -715,7 +716,7 @@ public class MemoryIndex {
return fieldInfos;
}
private class MemoryFields extends InvertedFields {
private class MemoryFields extends Fields {
@Override
public FieldsEnum iterator() {
return new FieldsEnum() {
@ -790,7 +791,7 @@ public class MemoryIndex {
}
@Override
public InvertedFields fields() {
public Fields fields() {
sortFields();
return new MemoryFields();
}
@ -1016,7 +1017,7 @@ public class MemoryIndex {
}
@Override
public InvertedFields getTermVectors(int docID) {
public Fields getTermVectors(int docID) {
if (docID == 0) {
return fields();
} else {

6
lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
View File

@ -19,8 +19,8 @@ package org.apache.lucene.misc;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.Terms;
@ -115,7 +115,7 @@ public class HighFreqTerms {
TermStatsQueue tiq = null;
if (field != null) {
InvertedFields fields = MultiFields.getFields(reader);
Fields fields = MultiFields.getFields(reader);
if (fields == null) {
throw new RuntimeException("field " + field + " not found");
}
@ -126,7 +126,7 @@ public class HighFreqTerms {
fillQueue(termsEnum, tiq, field);
}
} else {
InvertedFields fields = MultiFields.getFields(reader);
Fields fields = MultiFields.getFields(reader);
if (fields == null) {
throw new RuntimeException("no fields found for this index");
}

2
lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
View File

@ -56,7 +56,7 @@ import org.apache.lucene.util.DoubleBarrelLRUCache;
* implementation of the terms dict index.
* @lucene.experimental */
public class BlockTermsReader extends InvertedFieldsProducer {
public class BlockTermsReader extends FieldsProducer {
// Open input to the main terms dict file (_X.tis)
private final IndexInput in;

2
lucene/core/src/java/org/apache/lucene/codecs/BlockTermsWriter.java
View File

@ -47,7 +47,7 @@ import org.apache.lucene.util.RamUsageEstimator;
* @lucene.experimental
*/
public class BlockTermsWriter extends InvertedFieldsConsumer {
public class BlockTermsWriter extends FieldsConsumer {
final static String CODEC_NAME = "BLOCK_TERMS_DICT";

2
lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
View File

@ -85,7 +85,7 @@ import org.apache.lucene.util.fst.Util;
* @lucene.experimental
*/
public class BlockTreeTermsReader extends InvertedFieldsProducer {
public class BlockTreeTermsReader extends FieldsProducer {
// Open input to the main terms dict file (_X.tib)
private final IndexInput in;

2
lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java
View File

@ -83,7 +83,7 @@ import org.apache.lucene.util.fst.Util;
* @lucene.experimental
*/
public class BlockTreeTermsWriter extends InvertedFieldsConsumer {
public class BlockTreeTermsWriter extends FieldsConsumer {
public final static int DEFAULT_MIN_BLOCK_SIZE = 25;
public final static int DEFAULT_MAX_BLOCK_SIZE = 48;

6
lucene/core/src/java/org/apache/lucene/codecs/InvertedFieldsConsumer.java → lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java
View File

@ -21,7 +21,7 @@ import java.io.Closeable;
import java.io.IOException;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.MergeState;
import org.apache.lucene.index.Terms;
@ -33,7 +33,7 @@ import org.apache.lucene.index.Terms;
*
* @lucene.experimental
*/
public abstract class InvertedFieldsConsumer implements Closeable {
public abstract class FieldsConsumer implements Closeable {
/** Add a new field */
public abstract TermsConsumer addField(FieldInfo field) throws IOException;
@ -41,7 +41,7 @@ public abstract class InvertedFieldsConsumer implements Closeable {
/** Called when we are done adding everything. */
public abstract void close() throws IOException;
public void merge(MergeState mergeState, InvertedFields fields) throws IOException {
public void merge(MergeState mergeState, Fields fields) throws IOException {
FieldsEnum fieldsEnum = fields.iterator();
assert fieldsEnum != null;
String field;

4
lucene/core/src/java/org/apache/lucene/codecs/InvertedFieldsProducer.java → lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java
View File

@ -20,7 +20,7 @@ package org.apache.lucene.codecs;
import java.io.Closeable;
import java.io.IOException;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
/** Abstract API that produces terms, doc, freq, prox and
* payloads postings.
@ -28,6 +28,6 @@ import org.apache.lucene.index.InvertedFields;
* @lucene.experimental
*/
public abstract class InvertedFieldsProducer extends InvertedFields implements Closeable {
public abstract class FieldsProducer extends Fields implements Closeable {
public abstract void close() throws IOException;
}

4
lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java
View File

@ -49,12 +49,12 @@ public abstract class PostingsFormat implements NamedSPILoader.NamedSPI {
}
/** Writes a new segment */
public abstract InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException;
public abstract FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException;
/** Reads a segment. NOTE: by the time this call
* returns, it must hold open any files it will need to
* use; else, those files may be deleted. */
public abstract InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException;
public abstract FieldsProducer fieldsProducer(SegmentReadState state) throws IOException;
/**
* Gathers files associated with this segment

4
lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java
View File

@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; // javadocs
import org.apache.lucene.index.DocsAndPositionsEnum; // javadocs
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
/**
* Codec API for reading term vectors:
@ -35,7 +35,7 @@ public abstract class TermVectorsReader implements Cloneable,Closeable {
* term vectors were not indexed. If offsets are
* available they are in an {@link OffsetAttribute}
* available from the {@link DocsAndPositionsEnum}. */
public abstract InvertedFields get(int doc) throws IOException;
public abstract Fields get(int doc) throws IOException;
/** Create a clone that one caller at a time may use to
* read term vectors. */

8
lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
View File

@ -24,7 +24,7 @@ import java.util.Comparator;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.MergeState;
import org.apache.lucene.index.Terms;
@ -153,7 +153,7 @@ public abstract class TermVectorsWriter implements Closeable {
}
// NOTE: it's very important to first assign to vectors then pass it to
// termVectorsWriter.addAllDocVectors; see LUCENE-1282
InvertedFields vectors = reader.reader.getTermVectors(docID);
Fields vectors = reader.reader.getTermVectors(docID);
addAllDocVectors(vectors, mergeState.fieldInfos);
docCount++;
mergeState.checkAbort.work(300);
@ -166,9 +166,9 @@ public abstract class TermVectorsWriter implements Closeable {
/** Safe (but, slowish) default method to write every
* vector field in the document. This default
* implementation requires that the vectors implement
* both InvertedFields.getUniqueFieldCount and
* both Fields.getUniqueFieldCount and
* Terms.getUniqueTermCount. */
protected final void addAllDocVectors(InvertedFields vectors, FieldInfos fieldInfos) throws IOException {
protected final void addAllDocVectors(Fields vectors, FieldInfos fieldInfos) throws IOException {
if (vectors == null) {
startDocument(0);
return;

12
lucene/core/src/java/org/apache/lucene/codecs/appending/AppendingPostingsFormat.java
View File

@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.lucene.codecs.BlockTreeTermsReader;
import org.apache.lucene.codecs.BlockTreeTermsWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.PostingsReaderBase;
import org.apache.lucene.codecs.PostingsWriterBase;
@ -44,11 +44,11 @@ class AppendingPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
PostingsWriterBase docsWriter = new Lucene40PostingsWriter(state);
boolean success = false;
try {
InvertedFieldsConsumer ret = new AppendingTermsWriter(state, docsWriter, BlockTreeTermsWriter.DEFAULT_MIN_BLOCK_SIZE, BlockTreeTermsWriter.DEFAULT_MAX_BLOCK_SIZE);
FieldsConsumer ret = new AppendingTermsWriter(state, docsWriter, BlockTreeTermsWriter.DEFAULT_MIN_BLOCK_SIZE, BlockTreeTermsWriter.DEFAULT_MAX_BLOCK_SIZE);
success = true;
return ret;
} finally {
@ -59,12 +59,12 @@ class AppendingPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
PostingsReaderBase postings = new Lucene40PostingsReader(state.dir, state.segmentInfo, state.context, state.segmentSuffix);
boolean success = false;
try {
InvertedFieldsProducer ret = new AppendingTermsReader(
FieldsProducer ret = new AppendingTermsReader(
state.dir,
state.fieldInfos,
state.segmentInfo.name,

9
lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
View File

@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo.IndexOptions;
@ -49,7 +49,7 @@ import org.apache.lucene.util.UnicodeUtil;
* @deprecated (4.0)
*/
@Deprecated
class Lucene3xFields extends InvertedFieldsProducer {
class Lucene3xFields extends FieldsProducer {
private static final boolean DEBUG_SURROGATES = false;
@ -59,14 +59,18 @@ class Lucene3xFields extends InvertedFieldsProducer {
public final IndexInput freqStream;
public final IndexInput proxStream;
final private FieldInfos fieldInfos;
private final SegmentInfo si;
final TreeMap<String,FieldInfo> fields = new TreeMap<String,FieldInfo>();
final Map<String,Terms> preTerms = new HashMap<String,Terms>();
private final Directory dir;
private final IOContext context;
private Directory cfsReader;
public Lucene3xFields(Directory dir, FieldInfos fieldInfos, SegmentInfo info, IOContext context, int indexDivisor)
throws IOException {
si = info;
// NOTE: we must always load terms index, even for
// "sequential" scan during merging, because what is
// sequential to merger may not be to TermInfosReader
@ -84,6 +88,7 @@ class Lucene3xFields extends InvertedFieldsProducer {
tisNoIndex = null;
tis = r;
}
this.context = context;
this.fieldInfos = fieldInfos;
// make sure that all index files have been read or are kept open

8
lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xPostingsFormat.java
View File

@ -20,8 +20,8 @@ package org.apache.lucene.codecs.lucene3x;
import java.util.Set;
import java.io.IOException;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.SegmentWriteState;
@ -55,12 +55,12 @@ class Lucene3xPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
throw new UnsupportedOperationException("this codec can only be used for reading");
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
return new Lucene3xFields(state.dir, state.fieldInfos, state.segmentInfo, state.context, state.termsIndexDivisor);
}

8
lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
View File

@ -30,7 +30,7 @@ import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexFormatTooNewException;
@ -195,7 +195,7 @@ class Lucene3xTermVectorsReader extends TermVectorsReader {
return size;
}
private class TVFields extends InvertedFields {
private class TVFields extends Fields {
private final int[] fieldNumbers;
private final long[] fieldFPs;
private final Map<Integer,Integer> fieldNumberToIndex = new HashMap<Integer,Integer>();
@ -654,12 +654,12 @@ class Lucene3xTermVectorsReader extends TermVectorsReader {
}
@Override
public InvertedFields get(int docID) throws IOException {
public Fields get(int docID) throws IOException {
if (docID < 0 || docID >= numTotalDocs) {
throw new IllegalArgumentException("doID=" + docID + " is out of bounds [0.." + (numTotalDocs-1) + "]");
}
if (tvx != null) {
InvertedFields fields = new TVFields(docID);
Fields fields = new TVFields(docID);
if (fields.getUniqueFieldCount() == 0) {
// TODO: we can improve writer here, eg write 0 into
// tvx file, so we know on first read from tvx that

12
lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsFormat.java
View File

@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.lucene.codecs.BlockTreeTermsReader;
import org.apache.lucene.codecs.BlockTreeTermsWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.PostingsReaderBase;
import org.apache.lucene.codecs.PostingsWriterBase;
@ -54,7 +54,7 @@ public class Lucene40PostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
PostingsWriterBase docs = new Lucene40PostingsWriter(state);
// TODO: should we make the terms index more easily
@ -63,7 +63,7 @@ public class Lucene40PostingsFormat extends PostingsFormat {
// Or... you must make a new Codec for this?
boolean success = false;
try {
InvertedFieldsConsumer ret = new BlockTreeTermsWriter(state, docs, minBlockSize, maxBlockSize);
FieldsConsumer ret = new BlockTreeTermsWriter(state, docs, minBlockSize, maxBlockSize);
success = true;
return ret;
} finally {
@ -76,12 +76,12 @@ public class Lucene40PostingsFormat extends PostingsFormat {
public final static int TERMS_CACHE_SIZE = 1024;
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
PostingsReaderBase postings = new Lucene40PostingsReader(state.dir, state.segmentInfo, state.context, state.segmentSuffix);
boolean success = false;
try {
InvertedFieldsProducer ret = new BlockTreeTermsReader(
FieldsProducer ret = new BlockTreeTermsReader(
state.dir,
state.fieldInfos,
state.segmentInfo.name,

8
lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
View File

@ -30,7 +30,7 @@ import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexFormatTooNewException;
@ -225,7 +225,7 @@ public class Lucene40TermVectorsReader extends TermVectorsReader {
return size;
}
private class TVFields extends InvertedFields {
private class TVFields extends Fields {
private final int[] fieldNumbers;
private final long[] fieldFPs;
private final Map<Integer,Integer> fieldNumberToIndex = new HashMap<Integer,Integer>();
@ -668,12 +668,12 @@ public class Lucene40TermVectorsReader extends TermVectorsReader {
}
@Override
public InvertedFields get(int docID) throws IOException {
public Fields get(int docID) throws IOException {
if (docID < 0 || docID >= numTotalDocs) {
throw new IllegalArgumentException("doID=" + docID + " is out of bounds [0.." + (numTotalDocs-1) + "]");
}
if (tvx != null) {
InvertedFields fields = new TVFields(docID);
Fields fields = new TVFields(docID);
if (fields.getUniqueFieldCount() == 0) {
// TODO: we can improve writer here, eg write 0 into
// tvx file, so we know on first read from tvx that

8
lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsWriter.java
View File

@ -23,7 +23,7 @@ import java.util.Comparator;
import org.apache.lucene.codecs.TermVectorsReader;
import org.apache.lucene.codecs.TermVectorsWriter;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy.MergeAbortedException;
import org.apache.lucene.index.MergeState;
@ -231,7 +231,7 @@ public final class Lucene40TermVectorsWriter extends TermVectorsWriter {
}
@Override
public int merge(MergeState mergeState) throws IOException {
public final int merge(MergeState mergeState) throws IOException {
// Used for bulk-reading raw bytes for term vectors
int rawDocLengths[] = new int[MAX_RAW_MERGE_DOCS];
int rawDocLengths2[] = new int[MAX_RAW_MERGE_DOCS];
@ -309,7 +309,7 @@ public final class Lucene40TermVectorsWriter extends TermVectorsWriter {
// NOTE: it's very important to first assign to vectors then pass it to
// termVectorsWriter.addAllDocVectors; see LUCENE-1282
InvertedFields vectors = reader.reader.getTermVectors(docNum);
Fields vectors = reader.reader.getTermVectors(docNum);
addAllDocVectors(vectors, mergeState.fieldInfos);
totalNumDocs++;
mergeState.checkAbort.work(300);
@ -339,7 +339,7 @@ public final class Lucene40TermVectorsWriter extends TermVectorsWriter {
for (int docNum = 0; docNum < maxDoc; docNum++) {
// NOTE: it's very important to first assign to vectors then pass it to
// termVectorsWriter.addAllDocVectors; see LUCENE-1282
InvertedFields vectors = reader.reader.getTermVectors(docNum);
Fields vectors = reader.reader.getTermVectors(docNum);
addAllDocVectors(vectors, mergeState.fieldInfos);
mergeState.checkAbort.work(300);
}

12
lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
View File

@ -24,8 +24,8 @@ import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsConsumer;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.TermStats;
@ -283,12 +283,12 @@ public class MemoryPostingsFormat extends PostingsFormat {
private static String EXTENSION = "ram";
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
final String fileName = IndexFileNames.segmentFileName(state.segmentName, state.segmentSuffix, EXTENSION);
final IndexOutput out = state.directory.createOutput(fileName, state.context);
return new InvertedFieldsConsumer() {
return new FieldsConsumer() {
@Override
public TermsConsumer addField(FieldInfo field) {
//System.out.println("\naddField field=" + field.name);
@ -840,7 +840,7 @@ public class MemoryPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
final String fileName = IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, EXTENSION);
final IndexInput in = state.dir.openInput(fileName, IOContext.READONCE);
@ -860,7 +860,7 @@ public class MemoryPostingsFormat extends PostingsFormat {
in.close();
}
return new InvertedFieldsProducer() {
return new FieldsProducer() {
@Override
public FieldsEnum iterator() {
final Iterator<TermsReader> iter = fields.values().iterator();

22
lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
View File

@ -28,8 +28,8 @@ import java.util.ServiceLoader; // javadocs
import java.util.Set;
import java.util.TreeMap;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.TermsConsumer;
import org.apache.lucene.index.FieldInfo;
@ -72,17 +72,17 @@ public abstract class PerFieldPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state)
public FieldsConsumer fieldsConsumer(SegmentWriteState state)
throws IOException {
return new FieldsWriter(state);
}
// NOTE: not private to avoid $accessN at runtime!!
static class FieldsConsumerAndID implements Closeable {
final InvertedFieldsConsumer fieldsConsumer;
final FieldsConsumer fieldsConsumer;
final String segmentSuffix;
public FieldsConsumerAndID(InvertedFieldsConsumer fieldsConsumer, String segmentSuffix) {
public FieldsConsumerAndID(FieldsConsumer fieldsConsumer, String segmentSuffix) {
this.fieldsConsumer = fieldsConsumer;
this.segmentSuffix = segmentSuffix;
}
@ -93,7 +93,7 @@ public abstract class PerFieldPostingsFormat extends PostingsFormat {
}
};
private class FieldsWriter extends InvertedFieldsConsumer {
private class FieldsWriter extends FieldsConsumer {
private final Map<PostingsFormat,FieldsConsumerAndID> formats = new IdentityHashMap<PostingsFormat,FieldsConsumerAndID>();
@ -181,10 +181,10 @@ public abstract class PerFieldPostingsFormat extends PostingsFormat {
}
}
private class FieldsReader extends InvertedFieldsProducer {
private class FieldsReader extends FieldsProducer {
private final Map<String,InvertedFieldsProducer> fields = new TreeMap<String,InvertedFieldsProducer>();
private final Map<PostingsFormat,InvertedFieldsProducer> formats = new IdentityHashMap<PostingsFormat,InvertedFieldsProducer>();
private final Map<String,FieldsProducer> fields = new TreeMap<String,FieldsProducer>();
private final Map<PostingsFormat,FieldsProducer> formats = new IdentityHashMap<PostingsFormat,FieldsProducer>();
public FieldsReader(final SegmentReadState readState) throws IOException {
@ -243,7 +243,7 @@ public abstract class PerFieldPostingsFormat extends PostingsFormat {
@Override
public Terms terms(String field) throws IOException {
InvertedFieldsProducer fieldsProducer = fields.get(field);
FieldsProducer fieldsProducer = fields.get(field);
return fieldsProducer == null ? null : fieldsProducer.terms(field);
}
@ -259,7 +259,7 @@ public abstract class PerFieldPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state)
public FieldsProducer fieldsProducer(SegmentReadState state)
throws IOException {
return new FieldsReader(state);
}

12
lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsFormat.java
View File

@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.lucene.codecs.BlockTreeTermsReader;
import org.apache.lucene.codecs.BlockTreeTermsWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsBaseFormat;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.PostingsReaderBase;
@ -66,7 +66,7 @@ public abstract class PulsingPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
PostingsWriterBase docsWriter = wrappedPostingsBaseFormat.postingsWriterBase(state);
// Terms that have <= freqCutoff number of docs are
@ -76,7 +76,7 @@ public abstract class PulsingPostingsFormat extends PostingsFormat {
// Terms dict
boolean success = false;
try {
InvertedFieldsConsumer ret = new BlockTreeTermsWriter(state, pulsingWriter, minBlockSize, maxBlockSize);
FieldsConsumer ret = new BlockTreeTermsWriter(state, pulsingWriter, minBlockSize, maxBlockSize);
success = true;
return ret;
} finally {
@ -87,14 +87,14 @@ public abstract class PulsingPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
PostingsReaderBase docsReader = wrappedPostingsBaseFormat.postingsReaderBase(state);
PostingsReaderBase pulsingReader = new PulsingPostingsReader(docsReader);
boolean success = false;
try {
InvertedFieldsProducer ret = new BlockTreeTermsReader(
FieldsProducer ret = new BlockTreeTermsReader(
state.dir, state.fieldInfos, state.segmentInfo.name,
pulsingReader,
state.context,

4
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
View File

@ -22,7 +22,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo.IndexOptions;
@ -47,7 +47,7 @@ import org.apache.lucene.util.fst.PairOutputs;
import org.apache.lucene.util.fst.PositiveIntOutputs;
import org.apache.lucene.util.fst.Util;
class SimpleTextFieldsReader extends InvertedFieldsProducer {
class SimpleTextFieldsReader extends FieldsProducer {
private final IndexInput in;
private final FieldInfos fieldInfos;

4
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java
View File

@ -18,7 +18,7 @@ package org.apache.lucene.codecs.simpletext;
*/
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.PostingsConsumer;
import org.apache.lucene.codecs.TermStats;
import org.apache.lucene.codecs.TermsConsumer;
@ -30,7 +30,7 @@ import org.apache.lucene.store.IndexOutput;
import java.io.IOException;
import java.util.Comparator;
class SimpleTextFieldsWriter extends InvertedFieldsConsumer {
class SimpleTextFieldsWriter extends FieldsConsumer {
private final IndexOutput out;
private final BytesRef scratch = new BytesRef(10);

8
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPostingsFormat.java
View File

@ -20,8 +20,8 @@ package org.apache.lucene.codecs.simpletext;
import java.io.IOException;
import java.util.Set;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.SegmentWriteState;
@ -43,12 +43,12 @@ public class SimpleTextPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
return new SimpleTextFieldsWriter(state);
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
return new SimpleTextFieldsReader(state);
}

6
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
View File

@ -29,7 +29,7 @@ import java.util.TreeMap;
import org.apache.lucene.codecs.TermVectorsReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentInfo;
@ -94,7 +94,7 @@ public class SimpleTextTermVectorsReader extends TermVectorsReader {
}
@Override
public InvertedFields get(int doc) throws IOException {
public Fields get(int doc) throws IOException {
// TestTV tests for this in testBadParams... but is this
// really guaranteed by the API?
if (doc < 0 || doc >= offsets.size()) {
@ -221,7 +221,7 @@ public class SimpleTextTermVectorsReader extends TermVectorsReader {
return scratchUTF16.toString();
}
private class SimpleTVFields extends InvertedFields {
private class SimpleTVFields extends Fields {
private final SortedMap<String,SimpleTVTerms> fields;
SimpleTVFields(SortedMap<String,SimpleTVTerms> fields) throws IOException {

22
lucene/core/src/java/org/apache/lucene/index/AtomicReader.java
View File

@ -19,8 +19,10 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.search.SearcherManager; // javadocs
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ReaderUtil; // for javadocs
/** {@code AtomicReader} is an abstract class, providing an interface for accessing an
index. Search of an index is done entirely through this abstract interface,
@ -72,15 +74,15 @@ public abstract class AtomicReader extends IndexReader {
}
/**
* Returns {@link InvertedFields} for this reader.
* Returns {@link Fields} for this reader.
* This method may return null if the reader has no
* postings.
*/
public abstract InvertedFields fields() throws IOException;
public abstract Fields fields() throws IOException;
@Override
public final int docFreq(String field, BytesRef term) throws IOException {
final InvertedFields fields = fields();
final Fields fields = fields();
if (fields == null) {
return 0;
}
@ -102,7 +104,7 @@ public abstract class AtomicReader extends IndexReader {
* account deleted documents that have not yet been merged
* away. */
public final long totalTermFreq(String field, BytesRef term) throws IOException {
final InvertedFields fields = fields();
final Fields fields = fields();
if (fields == null) {
return 0;
}
@ -120,7 +122,7 @@ public abstract class AtomicReader extends IndexReader {
/** This may return null if the field does not exist.*/
public final Terms terms(String field) throws IOException {
final InvertedFields fields = fields();
final Fields fields = fields();
if (fields == null) {
return null;
}
@ -133,7 +135,7 @@ public abstract class AtomicReader extends IndexReader {
public final DocsEnum termDocsEnum(Bits liveDocs, String field, BytesRef term, boolean needsFreqs) throws IOException {
assert field != null;
assert term != null;
final InvertedFields fields = fields();
final Fields fields = fields();
if (fields != null) {
final Terms terms = fields.terms(field);
if (terms != null) {
@ -153,7 +155,7 @@ public abstract class AtomicReader extends IndexReader {
public final DocsAndPositionsEnum termPositionsEnum(Bits liveDocs, String field, BytesRef term, boolean needsOffsets) throws IOException {
assert field != null;
assert term != null;
final InvertedFields fields = fields();
final Fields fields = fields();
if (fields != null) {
final Terms terms = fields.terms(field);
if (terms != null) {
@ -174,7 +176,7 @@ public abstract class AtomicReader extends IndexReader {
public final DocsEnum termDocsEnum(Bits liveDocs, String field, BytesRef term, TermState state, boolean needsFreqs) throws IOException {
assert state != null;
assert field != null;
final InvertedFields fields = fields();
final Fields fields = fields();
if (fields != null) {
final Terms terms = fields.terms(field);
if (terms != null) {
@ -195,7 +197,7 @@ public abstract class AtomicReader extends IndexReader {
public final DocsAndPositionsEnum termPositionsEnum(Bits liveDocs, String field, BytesRef term, TermState state, boolean needsOffsets) throws IOException {
assert state != null;
assert field != null;
final InvertedFields fields = fields();
final Fields fields = fields();
if (fields != null) {
final Terms terms = fields.terms(field);
if (terms != null) {
@ -211,7 +213,7 @@ public abstract class AtomicReader extends IndexReader {
* in this reader.
*/
public final long getUniqueTermCount() throws IOException {
final InvertedFields fields = fields();
final Fields fields = fields();
if (fields == null) {
return 0;
}

2
lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java
View File

@ -83,7 +83,7 @@ public abstract class BaseCompositeReader<R extends IndexReader> extends Composi
}
@Override
public final InvertedFields getTermVectors(int docID) throws IOException {
public final Fields getTermVectors(int docID) throws IOException {
ensureOpen();
final int i = readerIndex(docID); // find subreader num
return subReaders[i].getTermVectors(docID - starts[i]); // dispatch to subreader

2
lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java
View File

@ -357,7 +357,7 @@ class BufferedDeletesStream {
// Delete by Term
private synchronized long applyTermDeletes(Iterable<Term> termsIter, ReadersAndLiveDocs rld, SegmentReader reader) throws IOException {
long delCount = 0;
InvertedFields fields = reader.fields();
Fields fields = reader.fields();
if (fields == null) {
// This reader has no postings
return 0;

14
lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
View File

@ -701,11 +701,11 @@ public class CheckIndex {
}
/**
* checks InvertedFields api is consistent with itself.
* checks Fields api is consistent with itself.
* searcher is optional, to verify with queries. Can be null.
*/
// TODO: cutover term vectors to this!
private Status.TermIndexStatus checkFields(InvertedFields fields, Bits liveDocs, int maxDoc, FieldInfos fieldInfos, IndexSearcher searcher) throws IOException {
private Status.TermIndexStatus checkFields(Fields fields, Bits liveDocs, int maxDoc, FieldInfos fieldInfos, IndexSearcher searcher) throws IOException {
// TODO: we should probably return our own stats thing...?!
final Status.TermIndexStatus status = new Status.TermIndexStatus();
@ -1003,7 +1003,7 @@ public class CheckIndex {
// make sure TermsEnum is empty:
final Terms fieldTerms2 = fieldsEnum.terms();
if (fieldTerms2 != null && fieldTerms2.iterator(null).next() != null) {
throw new RuntimeException("InvertedFields.terms(field=" + field + ") returned null yet the field appears to have terms");
throw new RuntimeException("Fields.terms(field=" + field + ") returned null yet the field appears to have terms");
}
} else {
if (fieldTerms instanceof BlockTreeTermsReader.FieldReader) {
@ -1160,7 +1160,7 @@ public class CheckIndex {
infoStream.print(" test: terms, freq, prox...");
}
final InvertedFields fields = reader.fields();
final Fields fields = reader.fields();
status = checkFields(fields, liveDocs, maxDoc, fieldInfos, is);
if (liveDocs != null) {
if (infoStream != null) {
@ -1328,7 +1328,7 @@ public class CheckIndex {
}
}
msg("OK [" + status.docCount + " total doc Count; Num DocValues InvertedFields "
msg("OK [" + status.docCount + " total doc Count; Num DocValues Fields "
+ status.totalValueFields);
} catch (Throwable e) {
msg("ERROR [" + String.valueOf(e.getMessage()) + "]");
@ -1362,7 +1362,7 @@ public class CheckIndex {
final Bits liveDocs = reader.getLiveDocs();
final InvertedFields postingsFields;
final Fields postingsFields;
// TODO: testTermsIndex
if (crossCheckTermVectors) {
postingsFields = reader.fields();
@ -1377,7 +1377,7 @@ public class CheckIndex {
// Intentionally pull/visit (but don't count in
// stats) deleted documents to make sure they too
// are not corrupt:
InvertedFields tfv = reader.getTermVectors(j);
Fields tfv = reader.getTermVectors(j);
// TODO: can we make a IS(FIR) that searches just
// this term vector... to pass for searcher?

4
lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java
View File

@ -200,7 +200,7 @@ public class DocTermOrds {
}
if (indexedTermsArray == null) {
//System.out.println("GET normal enum");
final InvertedFields fields = reader.fields();
final Fields fields = reader.fields();
if (fields == null) {
return null;
}
@ -241,7 +241,7 @@ public class DocTermOrds {
final int[] lastTerm = new int[maxDoc]; // last term we saw for this document
final byte[][] bytes = new byte[maxDoc][]; // list of term numbers for the doc (delta encoded vInts)
final InvertedFields fields = reader.fields();
final Fields fields = reader.fields();
if (fields == null) {
// No terms
return;

2
lucene/core/src/java/org/apache/lucene/index/DocValues.java
View File

@ -74,7 +74,7 @@ public abstract class DocValues implements Closeable {
* <p>
* {@link Source} instances obtained from this method are closed / released
* from the cache once this {@link DocValues} instance is closed by the
* {@link IndexReader}, {@link InvertedFields} or {@link FieldsEnum} the
* {@link IndexReader}, {@link Fields} or {@link FieldsEnum} the
* {@link DocValues} was created from.
*/
public Source getSource() throws IOException {

4
lucene/core/src/java/org/apache/lucene/index/InvertedFields.java → lucene/core/src/java/org/apache/lucene/index/Fields.java
View File

@ -22,7 +22,7 @@ import java.io.IOException;
/** Flex API for access to fields and terms
* @lucene.experimental */
public abstract class InvertedFields {
public abstract class Fields {
/** Returns an iterator that will step through all fields
* names. This will not return null. */
@ -64,5 +64,5 @@ public abstract class InvertedFields {
return numTerms;
}
public final static InvertedFields[] EMPTY_ARRAY = new InvertedFields[0];
public final static Fields[] EMPTY_ARRAY = new Fields[0];
}

12
lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
View File

@ -36,12 +36,12 @@ import java.util.Comparator;
*/
public class FilterAtomicReader extends AtomicReader {
/** Base class for filtering {@link InvertedFields}
/** Base class for filtering {@link Fields}
* implementations. */
public static class FilterFields extends InvertedFields {
protected final InvertedFields in;
public static class FilterFields extends Fields {
protected final Fields in;
public FilterFields(InvertedFields in) {
public FilterFields(Fields in) {
this.in = in;
}
@ -329,7 +329,7 @@ public class FilterAtomicReader extends AtomicReader {
}
@Override
public InvertedFields getTermVectors(int docID)
public Fields getTermVectors(int docID)
throws IOException {
ensureOpen();
return in.getTermVectors(docID);
@ -365,7 +365,7 @@ public class FilterAtomicReader extends AtomicReader {
}
@Override
public InvertedFields fields() throws IOException {
public Fields fields() throws IOException {
ensureOpen();
return in.fields();
}

8
lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
View File

@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CollectionUtil;
@ -34,7 +34,7 @@ final class FreqProxTermsWriter extends TermsHashConsumer {
void abort() {}
// TODO: would be nice to factor out more of this, eg the
// FreqProxFieldMergeState, and code to visit all InvertedFields
// FreqProxFieldMergeState, and code to visit all Fields
// under the same FieldInfo together, up into TermsHash*.
// Other writers would presumably share alot of this...
@ -57,7 +57,7 @@ final class FreqProxTermsWriter extends TermsHashConsumer {
// Sort by field name
CollectionUtil.quickSort(allFields);
final InvertedFieldsConsumer consumer = state.codec.postingsFormat().fieldsConsumer(state);
final FieldsConsumer consumer = state.codec.postingsFormat().fieldsConsumer(state);
boolean success = false;
@ -66,7 +66,7 @@ final class FreqProxTermsWriter extends TermsHashConsumer {
/*
Current writer chain:
InvertedFieldsConsumer
FieldsConsumer
-> IMPL: FormatPostingsTermsDictWriter
-> TermsConsumer
-> IMPL: FormatPostingsTermsDictWriter.TermsWriter

4
lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
View File

@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.PostingsConsumer;
import org.apache.lucene.codecs.TermStats;
import org.apache.lucene.codecs.TermsConsumer;
@ -316,7 +316,7 @@ final class FreqProxTermsWriterPerField extends TermsHashConsumerPerField implem
/* Walk through all unique text tokens (Posting
* instances) found in this field and serialize them
* into a single RAM segment. */
void flush(String fieldName, InvertedFieldsConsumer consumer, final SegmentWriteState state)
void flush(String fieldName, FieldsConsumer consumer, final SegmentWriteState state)
throws CorruptIndexException, IOException {
final TermsConsumer termsConsumer = consumer.addField(fieldInfo);

12
lucene/core/src/java/org/apache/lucene/index/IndexReader.java
View File

@ -27,9 +27,11 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.DocumentStoredFieldVisitor;
import org.apache.lucene.search.SearcherManager; // javadocs
import org.apache.lucene.store.*;
import org.apache.lucene.util.Bits; // javadocs
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ReaderUtil; // for javadocs
/** IndexReader is an abstract class, providing an interface for accessing an
index. Search of an index is done entirely through this abstract interface,
@ -371,19 +373,19 @@ public abstract class IndexReader implements Closeable {
}
/** Retrieve term vectors for this document, or null if
* term vectors were not indexed. The returned InvertedFields
* term vectors were not indexed. The returned Fields
* instance acts like a single-document inverted index
* (the docID will be 0). */
public abstract InvertedFields getTermVectors(int docID)
public abstract Fields getTermVectors(int docID)
throws IOException;
/** Retrieve term vector for this document and field, or
* null if term vectors were not indexed. The returned
* InvertedFields instance acts like a single-document inverted
* Fields instance acts like a single-document inverted
* index (the docID will be 0). */
public final Terms getTermVector(int docID, String field)
throws IOException {
InvertedFields vectors = getTermVectors(docID);
Fields vectors = getTermVectors(docID);
if (vectors == null) {
return null;
}

18
lucene/core/src/java/org/apache/lucene/index/MultiFields.java
View File

@ -46,12 +46,12 @@ import org.apache.lucene.util.ReaderUtil;
* @lucene.experimental
*/
public final class MultiFields extends InvertedFields {
private final InvertedFields[] subs;
public final class MultiFields extends Fields {
private final Fields[] subs;
private final ReaderUtil.Slice[] subSlices;
private final Map<String,Terms> terms = new ConcurrentHashMap<String,Terms>();
/** Returns a single {@link InvertedFields} instance for this
/** Returns a single {@link Fields} instance for this
* reader, merging fields/terms/docs/positions on the
* fly. This method will return null if the reader
* has no postings.
@ -60,7 +60,7 @@ public final class MultiFields extends InvertedFields {
* It's better to get the sub-readers (using {@link
* Gather}) and iterate through them
* yourself. */
public static InvertedFields getFields(IndexReader r) throws IOException {
public static Fields getFields(IndexReader r) throws IOException {
if (r instanceof AtomicReader) {
// already an atomic reader
return ((AtomicReader) r).fields();
@ -71,13 +71,13 @@ public final class MultiFields extends InvertedFields {
// no fields
return null;
} else {
final List<InvertedFields> fields = new ArrayList<InvertedFields>();
final List<Fields> fields = new ArrayList<Fields>();
final List<ReaderUtil.Slice> slices = new ArrayList<ReaderUtil.Slice>();
new ReaderUtil.Gather(r) {
@Override
protected void add(int base, AtomicReader r) throws IOException {
final InvertedFields f = r.fields();
final Fields f = r.fields();
if (f != null) {
fields.add(f);
slices.add(new ReaderUtil.Slice(base, r.maxDoc(), fields.size()-1));
@ -90,7 +90,7 @@ public final class MultiFields extends InvertedFields {
} else if (fields.size() == 1) {
return fields.get(0);
} else {
return new MultiFields(fields.toArray(InvertedFields.EMPTY_ARRAY),
return new MultiFields(fields.toArray(Fields.EMPTY_ARRAY),
slices.toArray(ReaderUtil.Slice.EMPTY_ARRAY));
}
}
@ -130,7 +130,7 @@ public final class MultiFields extends InvertedFields {
/** This method may return null if the field does not exist.*/
public static Terms getTerms(IndexReader r, String field) throws IOException {
final InvertedFields fields = getFields(r);
final Fields fields = getFields(r);
if (fields == null) {
return null;
} else {
@ -170,7 +170,7 @@ public final class MultiFields extends InvertedFields {
return null;
}
public MultiFields(InvertedFields[] subs, ReaderUtil.Slice[] subSlices) {
public MultiFields(Fields[] subs, ReaderUtil.Slice[] subSlices) {
this.subs = subs;
this.subSlices = subSlices;
}

4
lucene/core/src/java/org/apache/lucene/index/MultiFieldsEnum.java
View File

@ -41,7 +41,7 @@ public final class MultiFieldsEnum extends FieldsEnum {
private int numTop;
private final InvertedFields fields;
private final Fields fields;
private String currentField;
@ -125,7 +125,7 @@ public final class MultiFieldsEnum extends FieldsEnum {
}
@Override
protected boolean lessThan(FieldsEnumWithSlice fieldsA, FieldsEnumWithSlice fieldsB) {
protected final boolean lessThan(FieldsEnumWithSlice fieldsA, FieldsEnumWithSlice fieldsB) {
// No need to break ties by field name: TermsEnum handles that
return fieldsA.current.compareTo(fieldsB.current) < 0;
}

10
lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
View File

@ -114,9 +114,9 @@ public final class ParallelAtomicReader extends AtomicReader {
}
}
// build InvertedFields instance
// build Fields instance
for (final AtomicReader reader : this.parallelReaders) {
final InvertedFields readerFields = reader.fields();
final Fields readerFields = reader.fields();
if (readerFields != null) {
final FieldsEnum it = readerFields.iterator();
String name;
@ -176,7 +176,7 @@ public final class ParallelAtomicReader extends AtomicReader {
}
// Single instance of this, per ParallelReader instance
private final class ParallelFields extends InvertedFields {
private final class ParallelFields extends Fields {
final Map<String,Terms> fields = new TreeMap<String,Terms>();
ParallelFields() {
@ -214,7 +214,7 @@ public final class ParallelAtomicReader extends AtomicReader {
}
@Override
public InvertedFields fields() {
public Fields fields() {
ensureOpen();
return fields;
}
@ -246,7 +246,7 @@ public final class ParallelAtomicReader extends AtomicReader {
}
@Override
public InvertedFields getTermVectors(int docID) throws IOException {
public Fields getTermVectors(int docID) throws IOException {
ensureOpen();
ParallelFields fields = null;
for (Map.Entry<String,AtomicReader> ent : tvFieldToReader.entrySet()) {

6
lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
View File

@ -24,7 +24,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PerDocProducer;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.StoredFieldsReader;
@ -50,7 +50,7 @@ final class SegmentCoreReaders {
final FieldInfos fieldInfos;
final InvertedFieldsProducer fields;
final FieldsProducer fields;
final PerDocProducer perDocProducer;
final PerDocProducer norms;
@ -148,7 +148,7 @@ final class SegmentCoreReaders {
}
}
private void notifyCoreClosedListeners() {
private final void notifyCoreClosedListeners() {
synchronized(coreClosedListeners) {
for (CoreClosedListener listener : coreClosedListeners) {
listener.onClose(owner);

10
lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
View File

@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.FieldInfosWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.PerDocConsumer;
import org.apache.lucene.codecs.StoredFieldsWriter;
import org.apache.lucene.codecs.TermVectorsWriter;
@ -334,14 +334,14 @@ final class SegmentMerger {
private final void mergeTerms(SegmentWriteState segmentWriteState) throws CorruptIndexException, IOException {
final List<InvertedFields> fields = new ArrayList<InvertedFields>();
final List<Fields> fields = new ArrayList<Fields>();
final List<ReaderUtil.Slice> slices = new ArrayList<ReaderUtil.Slice>();
int docBase = 0;
for(int readerIndex=0;readerIndex<mergeState.readers.size();readerIndex++) {
final MergeState.IndexReaderAndLiveDocs r = mergeState.readers.get(readerIndex);
final InvertedFields f = r.reader.fields();
final Fields f = r.reader.fields();
final int maxDoc = r.reader.maxDoc();
if (f != null) {
slices.add(new ReaderUtil.Slice(docBase, maxDoc, readerIndex));
@ -350,11 +350,11 @@ final class SegmentMerger {
docBase += maxDoc;
}
final InvertedFieldsConsumer consumer = codec.postingsFormat().fieldsConsumer(segmentWriteState);
final FieldsConsumer consumer = codec.postingsFormat().fieldsConsumer(segmentWriteState);
boolean success = false;
try {
consumer.merge(mergeState,
new MultiFields(fields.toArray(InvertedFields.EMPTY_ARRAY),
new MultiFields(fields.toArray(Fields.EMPTY_ARRAY),
slices.toArray(ReaderUtil.Slice.EMPTY_ARRAY)));
success = true;
} finally {

4
lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
View File

@ -137,7 +137,7 @@ public final class SegmentReader extends AtomicReader {
}
@Override
public InvertedFields fields() throws IOException {
public Fields fields() throws IOException {
ensureOpen();
return core.fields;
}
@ -167,7 +167,7 @@ public final class SegmentReader extends AtomicReader {
* @throws IOException
*/
@Override
public InvertedFields getTermVectors(int docID) throws IOException {
public Fields getTermVectors(int docID) throws IOException {
TermVectorsReader termVectorsReader = getTermVectorsReader();
if (termVectorsReader == null) {
return null;

8
lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
View File

@ -24,6 +24,8 @@ import java.util.Map;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.ReaderUtil; // javadoc
import org.apache.lucene.index.DirectoryReader; // javadoc
import org.apache.lucene.index.MultiReader; // javadoc
/**
* This class forces a composite reader (eg a {@link
@ -45,7 +47,7 @@ public final class SlowCompositeReaderWrapper extends AtomicReader {
private final CompositeReader in;
private final Map<String, DocValues> normsCache = new HashMap<String, DocValues>();
private final InvertedFields fields;
private final Fields fields;
private final Bits liveDocs;
/** This method is sugar for getting an {@link AtomicReader} from
@ -75,7 +77,7 @@ public final class SlowCompositeReaderWrapper extends AtomicReader {
}
@Override
public InvertedFields fields() throws IOException {
public Fields fields() throws IOException {
ensureOpen();
return fields;
}
@ -98,7 +100,7 @@ public final class SlowCompositeReaderWrapper extends AtomicReader {
}
@Override
public InvertedFields getTermVectors(int docID)
public Fields getTermVectors(int docID)
throws IOException {
ensureOpen();
return in.getTermVectors(docID);

2
lucene/core/src/java/org/apache/lucene/index/Terms.java
View File

@ -24,7 +24,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.automaton.CompiledAutomaton;
/**
* Access to the terms in a specific field. See {@link InvertedFields}.
* Access to the terms in a specific field. See {@link Fields}.
* @lucene.experimental
*/

4
lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
View File

@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@ -85,7 +85,7 @@ public class MultiTermQueryWrapperFilter<Q extends MultiTermQuery> extends Filte
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
final AtomicReader reader = context.reader();
final InvertedFields fields = reader.fields();
final Fields fields = reader.fields();
if (fields == null) {
// reader has no fields
return DocIdSet.EMPTY_DOCIDSET;

4
lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java
View File

@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.Comparator;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
@ -50,7 +50,7 @@ abstract class TermCollectingRewrite<Q extends Query> extends MultiTermQuery.Rew
Comparator<BytesRef> lastTermComp = null;
final AtomicReaderContext[] leaves = topReaderContext.leaves();
for (AtomicReaderContext context : leaves) {
final InvertedFields fields = context.reader().fields();
final Fields fields = context.reader().fields();
if (fields == null) {
// reader has no fields
continue;

4
lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
View File

@ -18,7 +18,7 @@ package org.apache.lucene.search.spans;
*/
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.TermState;
@ -93,7 +93,7 @@ public class SpanTermQuery extends SpanQuery {
if (termContext == null) {
// this happens with span-not query, as it doesn't include the NOT side in extractTerms()
// so we seek to the term now in this segment..., this sucks because its ugly mostly!
final InvertedFields fields = context.reader().fields();
final Fields fields = context.reader().fields();
if (fields != null) {
final Terms terms = fields.terms(term.field());
if (terms != null) {

4
lucene/core/src/java/org/apache/lucene/util/TermContext.java
View File

@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.Arrays;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
@ -89,7 +89,7 @@ public final class TermContext {
//if (DEBUG) System.out.println("prts.build term=" + term);
for (int i = 0; i < leaves.length; i++) {
//if (DEBUG) System.out.println(" r=" + leaves[i].reader);
final InvertedFields fields = leaves[i].reader().fields();
final Fields fields = leaves[i].reader().fields();
if (fields != null) {
final Terms terms = fields.terms(field);
if (terms != null) {

5
lucene/core/src/test/org/apache/lucene/codecs/appending/TestAppendingCodec.java
View File

@ -21,11 +21,12 @@ import java.io.IOException;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.appending.AppendingCodec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@ -128,7 +129,7 @@ public class TestAppendingCodec extends LuceneTestCase {
assertEquals(2, reader.numDocs());
Document doc2 = reader.document(0);
assertEquals(text, doc2.get("f"));
InvertedFields fields = MultiFields.getFields(reader);
Fields fields = MultiFields.getFields(reader);
Terms terms = fields.terms("f");
assertNotNull(terms);
TermsEnum te = terms.iterator(null);

5
lucene/core/src/test/org/apache/lucene/document/TestDocument.java
View File

@ -21,9 +21,10 @@ import java.io.StringReader;
import org.apache.lucene.analysis.EmptyTokenizer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@ -341,7 +342,7 @@ public class TestDocument extends LuceneTestCase {
assertEquals(1, s.search(new TermQuery(new Term("tokenized_tokenstream", "xyz")), 1).totalHits);
for(String field : new String[] {"tv", "tv_pos", "tv_off", "tv_pos_off"}) {
InvertedFields tvFields = r.getTermVectors(0);
Fields tvFields = r.getTermVectors(0);
Terms tvs = tvFields.terms(field);
assertNotNull(tvs);
assertEquals(2, tvs.getUniqueTermCount());

22
lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
View File

@ -23,8 +23,8 @@ import java.util.HashSet;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsConsumer;
import org.apache.lucene.codecs.TermStats;
import org.apache.lucene.codecs.TermsConsumer;
@ -106,7 +106,7 @@ public class TestCodecs extends LuceneTestCase {
return fieldInfo.name.compareTo(other.fieldInfo.name);
}
public void write(final InvertedFieldsConsumer consumer) throws Throwable {
public void write(final FieldsConsumer consumer) throws Throwable {
Arrays.sort(terms);
final TermsConsumer termsConsumer = consumer.addField(fieldInfo);
long sumTotalTermCount = 0;
@ -260,7 +260,7 @@ public class TestCodecs extends LuceneTestCase {
Codec codec = Codec.getDefault();
final SegmentInfo si = new SegmentInfo(SEGMENT, 10000, dir, false, codec, clonedFieldInfos);
final InvertedFieldsProducer reader = codec.postingsFormat().fieldsProducer(new SegmentReadState(dir, si, fieldInfos, newIOContext(random), DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR));
final FieldsProducer reader = codec.postingsFormat().fieldsProducer(new SegmentReadState(dir, si, fieldInfos, newIOContext(random), DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR));
final FieldsEnum fieldsEnum = reader.iterator();
assertNotNull(fieldsEnum.next());
@ -319,7 +319,7 @@ public class TestCodecs extends LuceneTestCase {
if (VERBOSE) {
System.out.println("TEST: now read postings");
}
final InvertedFieldsProducer terms = codec.postingsFormat().fieldsProducer(new SegmentReadState(dir, si, fieldInfos, newIOContext(random), DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR));
final FieldsProducer terms = codec.postingsFormat().fieldsProducer(new SegmentReadState(dir, si, fieldInfos, newIOContext(random), DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR));
final Verify[] threads = new Verify[NUM_TEST_THREADS-1];
for(int i=0;i<NUM_TEST_THREADS-1;i++) {
@ -398,12 +398,12 @@ public class TestCodecs extends LuceneTestCase {
}
private class Verify extends Thread {
final InvertedFields termsDict;
final Fields termsDict;
final FieldData[] fields;
final SegmentInfo si;
volatile boolean failed;
Verify(final SegmentInfo si, final FieldData[] fields, final InvertedFields termsDict) {
Verify(final SegmentInfo si, final FieldData[] fields, final Fields termsDict) {
this.fields = fields;
this.termsDict = termsDict;
this.si = si;
@ -549,16 +549,18 @@ public class TestCodecs extends LuceneTestCase {
term = field.terms[upto];
if (LuceneTestCase.random.nextInt(3) == 1) {
final DocsEnum docs;
final DocsEnum docsAndFreqs;
final DocsAndPositionsEnum postings;
if (!field.omitTF) {
postings = termsEnum.docsAndPositions(null, null, false);
if (postings != null) {
docs = postings;
docs = docsAndFreqs = postings;
} else {
docs = _TestUtil.docs(random, termsEnum, null, null, true);
docs = docsAndFreqs = _TestUtil.docs(random, termsEnum, null, null, true);
}
} else {
postings = null;
docsAndFreqs = null;
docs = _TestUtil.docs(random, termsEnum, null, null, false);
}
assertNotNull(docs);
@ -618,7 +620,7 @@ public class TestCodecs extends LuceneTestCase {
final Codec codec = Codec.getDefault();
final SegmentWriteState state = new SegmentWriteState(InfoStream.getDefault(), dir, SEGMENT, fieldInfos, 10000, termIndexInterval, codec, null, newIOContext(random));
final InvertedFieldsConsumer consumer = codec.postingsFormat().fieldsConsumer(state);
final FieldsConsumer consumer = codec.postingsFormat().fieldsConsumer(state);
Arrays.sort(fields);
for (final FieldData field : fields) {
if (!allowPreFlex && codec instanceof Lucene3xCodec) {

2
lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
View File

@ -60,7 +60,7 @@ public class TestDocCount extends LuceneTestCase {
}
private void verifyCount(IndexReader ir) throws Exception {
InvertedFields fields = MultiFields.getFields(ir);
Fields fields = MultiFields.getFields(ir);
if (fields == null) {
return;
}

20
lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
View File

@ -157,10 +157,10 @@ public class TestDuelingCodecs extends LuceneTestCase {
}
/**
* InvertedFields api equivalency
* Fields api equivalency
*/
public void assertFields(InvertedFields leftFields, InvertedFields rightFields, boolean deep) throws Exception {
// InvertedFields could be null if there are no postings,
public void assertFields(Fields leftFields, Fields rightFields, boolean deep) throws Exception {
// Fields could be null if there are no postings,
// but then it must be null for both
if (leftFields == null || rightFields == null) {
assertNull(info, leftFields);
@ -181,9 +181,9 @@ public class TestDuelingCodecs extends LuceneTestCase {
}
/**
* checks that top-level statistics on InvertedFields are the same
* checks that top-level statistics on Fields are the same
*/
public void assertFieldStatistics(InvertedFields leftFields, InvertedFields rightFields) throws Exception {
public void assertFieldStatistics(Fields leftFields, Fields rightFields) throws Exception {
if (leftFields.getUniqueFieldCount() != -1 && rightFields.getUniqueFieldCount() != -1) {
assertEquals(info, leftFields.getUniqueFieldCount(), rightFields.getUniqueFieldCount());
}
@ -448,9 +448,9 @@ public class TestDuelingCodecs extends LuceneTestCase {
* checks that norms are the same across all fields
*/
public void assertNorms(IndexReader leftReader, IndexReader rightReader) throws Exception {
InvertedFields leftFields = MultiFields.getFields(leftReader);
InvertedFields rightFields = MultiFields.getFields(rightReader);
// InvertedFields could be null if there are no postings,
Fields leftFields = MultiFields.getFields(leftReader);
Fields rightFields = MultiFields.getFields(rightReader);
// Fields could be null if there are no postings,
// but then it must be null for both
if (leftFields == null || rightFields == null) {
assertNull(info, leftFields);
@ -522,8 +522,8 @@ public class TestDuelingCodecs extends LuceneTestCase {
public void assertTermVectors(IndexReader leftReader, IndexReader rightReader) throws Exception {
assert leftReader.maxDoc() == rightReader.maxDoc();
for (int i = 0; i < leftReader.maxDoc(); i++) {
InvertedFields leftFields = leftReader.getTermVectors(i);
InvertedFields rightFields = rightReader.getTermVectors(i);
Fields leftFields = leftReader.getTermVectors(i);
Fields rightFields = rightReader.getTermVectors(i);
assertFields(leftFields, rightFields, rarely());
}
}

4
lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java
View File

@ -37,7 +37,7 @@ public class TestFilterAtomicReader extends LuceneTestCase {
/** Filter that only permits terms containing 'e'.*/
private static class TestFields extends FilterFields {
TestFields(InvertedFields in) {
TestFields(Fields in) {
super(in);
}
@Override
@ -117,7 +117,7 @@ public class TestFilterAtomicReader extends LuceneTestCase {
}
@Override
public InvertedFields fields() throws IOException {
public Fields fields() throws IOException {
return new TestFields(super.fields());
}
}

2
lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
View File

@ -281,7 +281,7 @@ public class TestIndexableField extends LuceneTestCase {
// TODO: offsets
} else {
InvertedFields vectors = r.getTermVectors(docID);
Fields vectors = r.getTermVectors(docID);
assertTrue(vectors == null || vectors.terms(name) == null);
}

2
lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
View File

@ -222,7 +222,7 @@ public class TestPerSegmentDeletes extends LuceneTestCase {
public static int[] toDocsArray(Term term, Bits bits, IndexReader reader)
throws IOException {
InvertedFields fields = MultiFields.getFields(reader);
Fields fields = MultiFields.getFields(reader);
Terms cterms = fields.terms(term.field);
TermsEnum ctermsEnum = cterms.iterator(null);
if (ctermsEnum.seekExact(new BytesRef(term.text()), false)) {

2
lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
View File

@ -202,7 +202,7 @@ public class TestSegmentReader extends LuceneTestCase {
assertTrue(freq > 0);
}
InvertedFields results = reader.getTermVectors(0);
Fields results = reader.getTermVectors(0);
assertTrue(results != null);
assertEquals("We do not have 3 term freq vectors", 3, results.getUniqueFieldCount());
}

10
lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
View File

@ -313,7 +313,7 @@ public class TestStressIndexing2 extends LuceneTestCase {
int[] r2r1 = new int[r2.maxDoc()]; // r2 id to r1 id mapping
// create mapping from id2 space to id2 based on idField
final InvertedFields f1 = MultiFields.getFields(r1);
final Fields f1 = MultiFields.getFields(r1);
if (f1 == null) {
// make sure r2 is empty
assertNull(MultiFields.getFields(r2));
@ -330,7 +330,7 @@ public class TestStressIndexing2 extends LuceneTestCase {
final Bits liveDocs1 = MultiFields.getLiveDocs(r1);
final Bits liveDocs2 = MultiFields.getLiveDocs(r2);
InvertedFields fields = MultiFields.getFields(r2);
Fields fields = MultiFields.getFields(r2);
if (fields == null) {
// make sure r1 is in fact empty (eg has only all
// deleted docs):
@ -393,7 +393,7 @@ public class TestStressIndexing2 extends LuceneTestCase {
verifyEquals(r1.getTermVectors(id1), r2.getTermVectors(id2));
} catch (Throwable e) {
System.out.println("FAILED id=" + term + " id1=" + id1 + " id2=" + id2);
InvertedFields tv1 = r1.getTermVectors(id1);
Fields tv1 = r1.getTermVectors(id1);
System.out.println(" d1=" + tv1);
if (tv1 != null) {
FieldsEnum fieldsEnum = tv1.iterator();
@ -427,7 +427,7 @@ public class TestStressIndexing2 extends LuceneTestCase {
}
}
InvertedFields tv2 = r2.getTermVectors(id2);
Fields tv2 = r2.getTermVectors(id2);
System.out.println(" d2=" + tv2);
if (tv2 != null) {
FieldsEnum fieldsEnum = tv2.iterator();
@ -598,7 +598,7 @@ public class TestStressIndexing2 extends LuceneTestCase {
}
}
public static void verifyEquals(InvertedFields d1, InvertedFields d2) throws IOException {
public static void verifyEquals(Fields d1, Fields d2) throws IOException {
if (d1 == null) {
assertTrue(d2 == null || d2.getUniqueFieldCount() == 0);
return;

2
lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
View File

@ -75,7 +75,7 @@ public class TestSumDocFreq extends LuceneTestCase {
private void assertSumDocFreq(IndexReader ir) throws Exception {
// compute sumDocFreq across all fields
InvertedFields fields = MultiFields.getFields(ir);
Fields fields = MultiFields.getFields(ir);
FieldsEnum fieldEnum = fields.iterator();
String f = null;
while ((f = fieldEnum.next()) != null) {

7
lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
View File

@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.*;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@ -154,6 +154,7 @@ class MultiThreadTermVectorsReader implements Runnable {
catch (Exception e) {
e.printStackTrace();
}
return;
}
private void testTermVectors() throws Exception {
@ -162,7 +163,7 @@ class MultiThreadTermVectorsReader implements Runnable {
long start = 0L;
for (int docId = 0; docId < numDocs; docId++) {
start = System.currentTimeMillis();
InvertedFields vectors = reader.getTermVectors(docId);
Fields vectors = reader.getTermVectors(docId);
timeElapsed += System.currentTimeMillis()-start;
// verify vectors result
@ -176,7 +177,7 @@ class MultiThreadTermVectorsReader implements Runnable {
}
}
private void verifyVectors(InvertedFields vectors, int num) throws IOException {
private void verifyVectors(Fields vectors, int num) throws IOException {
FieldsEnum fieldsEnum = vectors.iterator();
while(fieldsEnum.next() != null) {
Terms terms = fieldsEnum.terms();

12
lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
View File

@ -96,7 +96,7 @@ public class TestTermVectors extends LuceneTestCase {
assertEquals(100, hits.length);
for (int i = 0; i < hits.length; i++) {
InvertedFields vectors = searcher.reader.getTermVectors(hits[i].doc);
Fields vectors = searcher.reader.getTermVectors(hits[i].doc);
assertNotNull(vectors);
assertEquals("doc=" + hits[i].doc + " tv=" + vectors, 1, vectors.getUniqueFieldCount());
}
@ -120,7 +120,7 @@ public class TestTermVectors extends LuceneTestCase {
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
InvertedFields v = reader.getTermVectors(0);
Fields v = reader.getTermVectors(0);
assertEquals(4, v.getUniqueFieldCount());
String[] expectedFields = new String[]{"a", "b", "c", "x"};
int[] expectedPositions = new int[]{1, 2, 0};
@ -164,7 +164,7 @@ public class TestTermVectors extends LuceneTestCase {
DocsAndPositionsEnum dpEnum = null;
for (int i = 0; i < hits.length; i++) {
InvertedFields vectors = searcher.reader.getTermVectors(hits[i].doc);
Fields vectors = searcher.reader.getTermVectors(hits[i].doc);
assertNotNull(vectors);
assertEquals(1, vectors.getUniqueFieldCount());
@ -203,7 +203,7 @@ public class TestTermVectors extends LuceneTestCase {
assertEquals(100, hits.length);
for (int i = 0; i < hits.length; i++) {
InvertedFields vectors = searcher.reader.getTermVectors(hits[i].doc);
Fields vectors = searcher.reader.getTermVectors(hits[i].doc);
assertNotNull(vectors);
assertEquals(1, vectors.getUniqueFieldCount());
}
@ -369,7 +369,7 @@ public class TestTermVectors extends LuceneTestCase {
assertEquals(10, hits.length);
for (int i = 0; i < hits.length; i++) {
InvertedFields vectors = searcher.reader.getTermVectors(hits[i].doc);
Fields vectors = searcher.reader.getTermVectors(hits[i].doc);
assertNotNull(vectors);
assertEquals(1, vectors.getUniqueFieldCount());
}
@ -416,7 +416,7 @@ public class TestTermVectors extends LuceneTestCase {
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(1, hits.length);
InvertedFields vectors = searcher.reader.getTermVectors(hits[0].doc);
Fields vectors = searcher.reader.getTermVectors(hits[0].doc);
assertNotNull(vectors);
assertEquals(1, vectors.getUniqueFieldCount());
Terms vector = vectors.terms("field");

4
lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldsWriter.java
View File

@ -20,7 +20,7 @@ package org.apache.lucene.codecs.lucene3x;
import java.io.IOException;
import java.util.Comparator;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.PostingsConsumer;
import org.apache.lucene.codecs.TermStats;
import org.apache.lucene.codecs.TermsConsumer;
@ -34,7 +34,7 @@ import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
class PreFlexRWFieldsWriter extends InvertedFieldsConsumer {
class PreFlexRWFieldsWriter extends FieldsConsumer {
private final TermInfosWriter termsOut;
private final IndexOutput freqOut;

8
lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWPostingsFormat.java
View File

@ -19,8 +19,8 @@ package org.apache.lucene.codecs.lucene3x;
import java.io.IOException;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.util.LuceneTestCase;
@ -38,12 +38,12 @@ class PreFlexRWPostingsFormat extends Lucene3xPostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
return new PreFlexRWFieldsWriter(state);
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
// Whenever IW opens readers, eg for merging, we have to
// keep terms order in UTF16:

12
lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40ords/Lucene40WithOrds.java
View File

@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.lucene.codecs.BlockTermsReader;
import org.apache.lucene.codecs.BlockTermsWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.FixedGapTermsIndexReader;
import org.apache.lucene.codecs.FixedGapTermsIndexWriter;
import org.apache.lucene.codecs.PostingsFormat;
@ -48,7 +48,7 @@ public class Lucene40WithOrds extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
PostingsWriterBase docs = new Lucene40PostingsWriter(state);
// TODO: should we make the terms index more easily
@ -70,7 +70,7 @@ public class Lucene40WithOrds extends PostingsFormat {
try {
// Must use BlockTermsWriter (not BlockTree) because
// BlockTree doens't support ords (yet)...
InvertedFieldsConsumer ret = new BlockTermsWriter(indexWriter, state, docs);
FieldsConsumer ret = new BlockTermsWriter(indexWriter, state, docs);
success = true;
return ret;
} finally {
@ -87,7 +87,7 @@ public class Lucene40WithOrds extends PostingsFormat {
public final static int TERMS_CACHE_SIZE = 1024;
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
PostingsReaderBase postings = new Lucene40PostingsReader(state.dir, state.segmentInfo, state.context, state.segmentSuffix);
TermsIndexReaderBase indexReader;
@ -108,7 +108,7 @@ public class Lucene40WithOrds extends PostingsFormat {
success = false;
try {
InvertedFieldsProducer ret = new BlockTermsReader(indexReader,
FieldsProducer ret = new BlockTermsReader(indexReader,
state.dir,
state.fieldInfos,
state.segmentInfo.name,

12
lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java
View File

@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.lucene.codecs.BlockTermsReader;
import org.apache.lucene.codecs.BlockTermsWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.FixedGapTermsIndexReader;
import org.apache.lucene.codecs.FixedGapTermsIndexWriter;
import org.apache.lucene.codecs.PostingsFormat;
@ -124,7 +124,7 @@ public class MockFixedIntBlockPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
PostingsWriterBase postingsWriter = new SepPostingsWriter(state, new MockIntFactory(blockSize));
boolean success = false;
@ -140,7 +140,7 @@ public class MockFixedIntBlockPostingsFormat extends PostingsFormat {
success = false;
try {
InvertedFieldsConsumer ret = new BlockTermsWriter(indexWriter, state, postingsWriter);
FieldsConsumer ret = new BlockTermsWriter(indexWriter, state, postingsWriter);
success = true;
return ret;
} finally {
@ -155,7 +155,7 @@ public class MockFixedIntBlockPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
PostingsReaderBase postingsReader = new SepPostingsReader(state.dir,
state.segmentInfo,
state.context,
@ -179,7 +179,7 @@ public class MockFixedIntBlockPostingsFormat extends PostingsFormat {
success = false;
try {
InvertedFieldsProducer ret = new BlockTermsReader(indexReader,
FieldsProducer ret = new BlockTermsReader(indexReader,
state.dir,
state.fieldInfos,
state.segmentInfo.name,

12
lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java
View File

@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.lucene.codecs.BlockTermsReader;
import org.apache.lucene.codecs.BlockTermsWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.FixedGapTermsIndexReader;
import org.apache.lucene.codecs.FixedGapTermsIndexWriter;
import org.apache.lucene.codecs.PostingsFormat;
@ -147,7 +147,7 @@ public class MockVariableIntBlockPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
PostingsWriterBase postingsWriter = new SepPostingsWriter(state, new MockIntFactory(baseBlockSize));
boolean success = false;
@ -163,7 +163,7 @@ public class MockVariableIntBlockPostingsFormat extends PostingsFormat {
success = false;
try {
InvertedFieldsConsumer ret = new BlockTermsWriter(indexWriter, state, postingsWriter);
FieldsConsumer ret = new BlockTermsWriter(indexWriter, state, postingsWriter);
success = true;
return ret;
} finally {
@ -178,7 +178,7 @@ public class MockVariableIntBlockPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
PostingsReaderBase postingsReader = new SepPostingsReader(state.dir,
state.segmentInfo,
state.context,
@ -202,7 +202,7 @@ public class MockVariableIntBlockPostingsFormat extends PostingsFormat {
success = false;
try {
InvertedFieldsProducer ret = new BlockTermsReader(indexReader,
FieldsProducer ret = new BlockTermsReader(indexReader,
state.dir,
state.fieldInfos,
state.segmentInfo.name,

12
lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java
View File

@ -28,8 +28,8 @@ import org.apache.lucene.codecs.BlockTermsReader;
import org.apache.lucene.codecs.BlockTermsWriter;
import org.apache.lucene.codecs.BlockTreeTermsReader;
import org.apache.lucene.codecs.BlockTreeTermsWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.FixedGapTermsIndexReader;
import org.apache.lucene.codecs.FixedGapTermsIndexWriter;
import org.apache.lucene.codecs.PostingsFormat;
@ -126,7 +126,7 @@ public class MockRandomPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
// we pull this before the seed intentionally: because its not consumed at runtime
// (the skipInterval is written into postings header)
int skipInterval = _TestUtil.nextInt(seedRandom, 2, 10);
@ -171,7 +171,7 @@ public class MockRandomPostingsFormat extends PostingsFormat {
postingsWriter = new PulsingPostingsWriter(totTFCutoff, postingsWriter);
}
final InvertedFieldsConsumer fields;
final FieldsConsumer fields;
if (random.nextBoolean()) {
// Use BlockTree terms dict
@ -270,7 +270,7 @@ public class MockRandomPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
final String seedFileName = IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, SEED_EXT);
final IndexInput in = state.dir.openInput(seedFileName, state.context);
@ -310,7 +310,7 @@ public class MockRandomPostingsFormat extends PostingsFormat {
postingsReader = new PulsingPostingsReader(postingsReader);
}
final InvertedFieldsProducer fields;
final FieldsProducer fields;
if (random.nextBoolean()) {
// Use BlockTree terms dict

12
lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSepPostingsFormat.java
View File

@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.lucene.codecs.BlockTermsReader;
import org.apache.lucene.codecs.BlockTermsWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.FixedGapTermsIndexReader;
import org.apache.lucene.codecs.FixedGapTermsIndexWriter;
import org.apache.lucene.codecs.PostingsFormat;
@ -52,7 +52,7 @@ public class MockSepPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
PostingsWriterBase postingsWriter = new SepPostingsWriter(state, new MockSingleIntFactory());
@ -69,7 +69,7 @@ public class MockSepPostingsFormat extends PostingsFormat {
success = false;
try {
InvertedFieldsConsumer ret = new BlockTermsWriter(indexWriter, state, postingsWriter);
FieldsConsumer ret = new BlockTermsWriter(indexWriter, state, postingsWriter);
success = true;
return ret;
} finally {
@ -84,7 +84,7 @@ public class MockSepPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
PostingsReaderBase postingsReader = new SepPostingsReader(state.dir, state.segmentInfo,
state.context, new MockSingleIntFactory(), state.segmentSuffix);
@ -107,7 +107,7 @@ public class MockSepPostingsFormat extends PostingsFormat {
success = false;
try {
InvertedFieldsProducer ret = new BlockTermsReader(indexReader,
FieldsProducer ret = new BlockTermsReader(indexReader,
state.dir,
state.fieldInfos,
state.segmentInfo.name,

12
lucene/test-framework/src/java/org/apache/lucene/codecs/nestedpulsing/NestedPulsingPostingsFormat.java
View File

@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.lucene.codecs.BlockTreeTermsReader;
import org.apache.lucene.codecs.BlockTreeTermsWriter;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.PostingsReaderBase;
import org.apache.lucene.codecs.PostingsWriterBase;
@ -48,7 +48,7 @@ public class NestedPulsingPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
PostingsWriterBase docsWriter = new Lucene40PostingsWriter(state);
PostingsWriterBase pulsingWriterInner = new PulsingPostingsWriter(2, docsWriter);
@ -57,7 +57,7 @@ public class NestedPulsingPostingsFormat extends PostingsFormat {
// Terms dict
boolean success = false;
try {
InvertedFieldsConsumer ret = new BlockTreeTermsWriter(state, pulsingWriter,
FieldsConsumer ret = new BlockTreeTermsWriter(state, pulsingWriter,
BlockTreeTermsWriter.DEFAULT_MIN_BLOCK_SIZE, BlockTreeTermsWriter.DEFAULT_MAX_BLOCK_SIZE);
success = true;
return ret;
@ -69,13 +69,13 @@ public class NestedPulsingPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
PostingsReaderBase docsReader = new Lucene40PostingsReader(state.dir, state.segmentInfo, state.context, state.segmentSuffix);
PostingsReaderBase pulsingReaderInner = new PulsingPostingsReader(docsReader);
PostingsReaderBase pulsingReader = new PulsingPostingsReader(pulsingReaderInner);
boolean success = false;
try {
InvertedFieldsProducer ret = new BlockTreeTermsReader(
FieldsProducer ret = new BlockTreeTermsReader(
state.dir, state.fieldInfos, state.segmentInfo.name,
pulsingReader,
state.context,

12
lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
View File

@ -29,8 +29,8 @@ import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.lucene.codecs.InvertedFieldsConsumer;
import org.apache.lucene.codecs.InvertedFieldsProducer;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsConsumer;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.TermStats;
@ -100,7 +100,7 @@ public class RAMOnlyPostingsFormat extends PostingsFormat {
}
// Postings state:
static class RAMPostings extends InvertedFieldsProducer {
static class RAMPostings extends FieldsProducer {
final Map<String,RAMField> fieldToTerms = new TreeMap<String,RAMField>();
@Override
@ -186,7 +186,7 @@ public class RAMOnlyPostingsFormat extends PostingsFormat {
}
// Classes for writing to the postings state
private static class RAMFieldsConsumer extends InvertedFieldsConsumer {
private static class RAMFieldsConsumer extends FieldsConsumer {
private final RAMPostings postings;
private final RAMTermsConsumer termsConsumer = new RAMTermsConsumer();
@ -534,7 +534,7 @@ public class RAMOnlyPostingsFormat extends PostingsFormat {
private static final String ID_EXTENSION = "id";
@Override
public InvertedFieldsConsumer fieldsConsumer(SegmentWriteState writeState) throws IOException {
public FieldsConsumer fieldsConsumer(SegmentWriteState writeState) throws IOException {
final int id = nextID.getAndIncrement();
// TODO -- ok to do this up front instead of
@ -565,7 +565,7 @@ public class RAMOnlyPostingsFormat extends PostingsFormat {
}
@Override
public InvertedFieldsProducer fieldsProducer(SegmentReadState readState)
public FieldsProducer fieldsProducer(SegmentReadState readState)
throws IOException {
// Load our ID:

12
lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
View File

@ -20,6 +20,8 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.util.Set;
import org.apache.lucene.index.FilterAtomicReader;
public final class FieldFilterAtomicReader extends FilterAtomicReader {
private final Set<String> fields;
@ -48,8 +50,8 @@ public final class FieldFilterAtomicReader extends FilterAtomicReader {
}
@Override
public InvertedFields getTermVectors(int docID) throws IOException {
InvertedFields f = super.getTermVectors(docID);
public Fields getTermVectors(int docID) throws IOException {
Fields f = super.getTermVectors(docID);
if (f == null) {
return null;
}
@ -99,8 +101,8 @@ public final class FieldFilterAtomicReader extends FilterAtomicReader {
}
@Override
public InvertedFields fields() throws IOException {
final InvertedFields f = super.fields();
public Fields fields() throws IOException {
final Fields f = super.fields();
return (f == null) ? null : new FieldFilterFields(f);
}
@ -123,7 +125,7 @@ public final class FieldFilterAtomicReader extends FilterAtomicReader {
}
private class FieldFilterFields extends FilterFields {
public FieldFilterFields(InvertedFields in) {
public FieldFilterFields(Fields in) {
super(in);
}

2
lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
View File

@ -340,7 +340,7 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
try {
if (s.getIndexReader().numDocs() > 0) {
smokeTestSearcher(s);
InvertedFields fields = MultiFields.getFields(s.getIndexReader());
Fields fields = MultiFields.getFields(s.getIndexReader());
if (fields == null) {
continue;
}

4
modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
View File

@ -41,7 +41,7 @@ import org.apache.lucene.collation.CollationKeyAnalyzer;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@ -750,7 +750,7 @@ public class TestPerfTasksLogic extends BenchmarkTestCase {
writer.close();
Directory dir = benchmark.getRunData().getDirectory();
IndexReader reader = IndexReader.open(dir);
InvertedFields tfv = reader.getTermVectors(0);
Fields tfv = reader.getTermVectors(0);
assertNotNull(tfv);
assertTrue(tfv.getUniqueFieldCount() > 0);
reader.close();

2
modules/queries/src/java/org/apache/lucene/queries/TermsFilter.java
View File

@ -57,7 +57,7 @@ public class TermsFilter extends Filter {
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
AtomicReader reader = context.reader();
FixedBitSet result = new FixedBitSet(reader.maxDoc());
InvertedFields fields = reader.fields();
Fields fields = reader.fields();
if (fields == null) {
return result;

5
modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
View File

@ -18,12 +18,13 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.Terms;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.LongDocValues;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;
import java.util.Map;
@ -57,7 +58,7 @@ public class SumTotalTermFreqValueSource extends ValueSource {
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
long sumTotalTermFreq = 0;
for (AtomicReaderContext readerContext : searcher.getTopReaderContext().leaves()) {
InvertedFields fields = readerContext.reader().fields();
Fields fields = readerContext.reader().fields();
if (fields == null) continue;
Terms terms = fields.terms(indexedField);
if (terms == null) continue;

2
modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
View File

@ -40,7 +40,7 @@ public class TFValueSource extends TermFreqValueSource {
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
InvertedFields fields = readerContext.reader().fields();
Fields fields = readerContext.reader().fields();
final Terms terms = fields.terms(field);
IndexSearcher searcher = (IndexSearcher)context.get("searcher");
final TFIDFSimilarity similarity = IDFValueSource.asTFIDF(searcher.getSimilarity(), field);

2
modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
View File

@ -38,7 +38,7 @@ public class TermFreqValueSource extends DocFreqValueSource {
@Override
public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
InvertedFields fields = readerContext.reader().fields();
Fields fields = readerContext.reader().fields();
final Terms terms = fields.terms(field);
return new IntDocValues(this) {

4
modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
View File

@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.MultiFields;
@ -705,7 +705,7 @@ public final class MoreLikeThis {
public PriorityQueue<Object[]> retrieveTerms(int docNum) throws IOException {
Map<String, Int> termFreqMap = new HashMap<String, Int>();
for (String fieldName : fieldNames) {
final InvertedFields vectors = ir.getTermVectors(docNum);
final Fields vectors = ir.getTermVectors(docNum);
final Terms vector;
if (vectors != null) {
vector = vectors.terms(fieldName);

2
solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
View File

@ -575,7 +575,7 @@ public class LukeRequestHandler extends RequestHandlerBase
final CharsRef spare = new CharsRef();
InvertedFields fields = MultiFields.getFields(req.getSearcher().getIndexReader());
Fields fields = MultiFields.getFields(req.getSearcher().getIndexReader());
if (fields == null) { // No indexed fields
return;

2
solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
View File

@ -532,7 +532,7 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
//convert the ids to Lucene doc ids, the ordSet and termValues needs to be the same size as the number of elevation docs we have
ordSet.clear();
InvertedFields fields = context.reader().fields();
Fields fields = context.reader().fields();
if (fields == null) return this;
Terms terms = fields.terms(idField);
if (terms == null) return this;

4
solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
View File

@ -10,7 +10,7 @@ import java.util.Map;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.StoredFieldVisitor;
@ -251,7 +251,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar
}
} else {
// extract all fields
final InvertedFields vectors = reader.getTermVectors(docId);
final Fields vectors = reader.getTermVectors(docId);
final FieldsEnum fieldsEnum = vectors.iterator();
String field;
while((field = fieldsEnum.next()) != null) {

2
solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
View File

@ -118,7 +118,7 @@ public class TermsComponent extends SearchComponent {
final AtomicReader indexReader = rb.req.getSearcher().getAtomicReader();
InvertedFields lfields = indexReader.fields();
Fields lfields = indexReader.fields();
for (String field : fields) {
NamedList<Integer> fieldTerms = new NamedList<Integer>();

2
solr/core/src/java/org/apache/solr/request/SimpleFacets.java
View File

@ -669,7 +669,7 @@ public class SimpleFacets {
startTermBytes = new BytesRef(indexedPrefix);
}
InvertedFields fields = r.fields();
Fields fields = r.fields();
Terms terms = fields==null ? null : fields.terms(field);
TermsEnum termsEnum = null;
SolrIndexSearcher.DocsEnumState deState = null;

4
solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
View File

@ -262,8 +262,8 @@ class JoinQuery extends Query {
fastForRandomSet = new HashDocSet(sset.getDocs(), 0, sset.size());
}
InvertedFields fromFields = fromSearcher.getAtomicReader().fields();
InvertedFields toFields = fromSearcher==toSearcher ? fromFields : toSearcher.getAtomicReader().fields();
Fields fromFields = fromSearcher.getAtomicReader().fields();
Fields toFields = fromSearcher==toSearcher ? fromFields : toSearcher.getAtomicReader().fields();
if (fromFields == null) return DocSet.EMPTY;
Terms terms = fromFields.terms(fromField);
Terms toTerms = toFields.terms(toField);

8
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
View File

@ -34,12 +34,14 @@ import org.apache.lucene.document.LongField;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.*;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.OpenBitSet;
import org.apache.lucene.util.ReaderUtil;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
@ -582,7 +584,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn
* @return the first document number containing the term
*/
public int getFirstMatch(Term t) throws IOException {
InvertedFields fields = atomicReader.fields();
Fields fields = atomicReader.fields();
if (fields == null) return -1;
Terms terms = fields.terms(t.field());
if (terms == null) return -1;
@ -610,7 +612,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn
final AtomicReaderContext leaf = leaves[i];
final AtomicReader reader = leaf.reader();
final InvertedFields fields = reader.fields();
final Fields fields = reader.fields();
if (fields == null) continue;
final Bits liveDocs = reader.getLiveDocs();
@ -996,7 +998,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn
final AtomicReaderContext leaf = leaves[i];
final AtomicReader reader = leaf.reader();
collector.setNextReader(leaf);
InvertedFields fields = reader.fields();
Fields fields = reader.fields();
Terms terms = fields.terms(t.field());
BytesRef termBytes = t.bytes();

6
solr/core/src/test/org/apache/solr/search/TestDocSet.java
View File

@ -23,8 +23,8 @@ import java.util.Random;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.InvertedFields;
import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.AtomicReaderContext;
@ -368,12 +368,12 @@ public class TestDocSet extends LuceneTestCase {
}
@Override
public InvertedFields fields() {
public Fields fields() {
return null;
}
@Override
public InvertedFields getTermVectors(int doc) {
public Fields getTermVectors(int doc) {
return null;
}

4
solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
View File

@ -28,6 +28,8 @@ import org.apache.lucene.util.BytesRef;
import org.apache.noggit.ObjectBuilder;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.update.UpdateHandler;
import org.apache.solr.update.UpdateLog;
@ -1696,7 +1698,7 @@ public class TestRealTimeGet extends SolrTestCaseJ4 {
public int getFirstMatch(IndexReader r, Term t) throws IOException {
InvertedFields fields = MultiFields.getFields(r);
Fields fields = MultiFields.getFields(r);
if (fields == null) return -1;
Terms terms = fields.terms(t.field());
if (terms == null) return -1;