Index: lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java (révision 1430752) +++ lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java (copie de travail) @@ -18,17 +18,20 @@ */ import java.io.IOException; +import java.util.Comparator; import org.apache.lucene.codecs.TermVectorsFormat; import org.apache.lucene.codecs.TermVectorsReader; import org.apache.lucene.codecs.TermVectorsWriter; import org.apache.lucene.codecs.lucene40.Lucene40TermVectorsFormat; import org.apache.lucene.index.AssertingAtomicReader; +import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.Fields; import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.util.BytesRef; /** * Just like {@link Lucene40TermVectorsFormat} but with additional asserts. @@ -43,7 +46,7 @@ @Override public TermVectorsWriter vectorsWriter(Directory directory, SegmentInfo segmentInfo, IOContext context) throws IOException { - return in.vectorsWriter(directory, segmentInfo, context); + return new AssertingTermVectorsWriter(in.vectorsWriter(directory, segmentInfo, context)); } static class AssertingTermVectorsReader extends TermVectorsReader { @@ -68,5 +71,102 @@ public TermVectorsReader clone() { return new AssertingTermVectorsReader(in.clone()); } - } + } + + enum Status { + UNDEFINED, STARTED, FINISHED; + } + + static class AssertingTermVectorsWriter extends TermVectorsWriter { + private final TermVectorsWriter in; + private Status docStatus, fieldStatus, termStatus; + + AssertingTermVectorsWriter(TermVectorsWriter in) { + this.in = in; + docStatus = Status.UNDEFINED; + fieldStatus = Status.UNDEFINED; + termStatus = Status.UNDEFINED; + } + + @Override + public void startDocument(int numVectorFields) throws IOException { + assert docStatus != Status.STARTED; + in.startDocument(numVectorFields); + docStatus = Status.STARTED; + } + + @Override + public void finishDocument() throws IOException { + assert docStatus == Status.STARTED; + in.finishDocument(); + docStatus = Status.FINISHED; + } + + @Override + public void startField(FieldInfo info, int numTerms, boolean positions, + boolean offsets, boolean payloads) throws IOException { + assert docStatus == Status.STARTED; + assert fieldStatus != Status.STARTED; + in.startField(info, numTerms, positions, offsets, payloads); + fieldStatus = Status.STARTED; + } + + @Override + public void finishField() throws IOException { + assert fieldStatus == Status.STARTED; + in.finishField(); + fieldStatus = Status.FINISHED; + } + + @Override + public void startTerm(BytesRef term, int freq) throws IOException { + assert docStatus == Status.STARTED; + assert fieldStatus == Status.STARTED; + assert termStatus != Status.STARTED; + in.startTerm(term, freq); + termStatus = Status.STARTED; + } + + @Override + public void finishTerm() throws IOException { + assert docStatus == Status.STARTED; + assert fieldStatus == Status.STARTED; + assert termStatus == Status.STARTED; + in.finishTerm(); + termStatus = Status.FINISHED; + } + + @Override + public void addPosition(int position, int startOffset, int endOffset, + BytesRef payload) throws IOException { + assert docStatus == Status.STARTED; + assert fieldStatus == Status.STARTED; + assert termStatus == Status.STARTED; + in.addPosition(position, startOffset, endOffset, payload); + } + + @Override + public void abort() { + in.abort(); + } + + @Override + public void finish(FieldInfos fis, int numDocs) throws IOException { + assert docStatus != Status.STARTED; + assert fieldStatus != Status.STARTED; + assert termStatus != Status.STARTED; + in.finish(fis, numDocs); + } + + @Override + public Comparator getComparator() throws IOException { + return in.getComparator(); + } + + @Override + public void close() throws IOException { + in.close(); + } + + } } Index: lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java (révision 1430752) +++ lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java (copie de travail) @@ -71,18 +71,27 @@ * has no vector fields, in this case numVectorFields * will be zero. */ public abstract void startDocument(int numVectorFields) throws IOException; - + + /** Called after a doc and all its fields have been added. */ + public void finishDocument() throws IOException {}; + /** Called before writing the terms of the field. * {@link #startTerm(BytesRef, int)} will be called numTerms times. */ public abstract void startField(FieldInfo info, int numTerms, boolean positions, boolean offsets, boolean payloads) throws IOException; - + + /** Called after a field and all its terms have been added. */ + public void finishField() throws IOException {}; + /** Adds a term and its term frequency freq. * If this field has positions and/or offsets enabled, then * {@link #addPosition(int, int, int, BytesRef)} will be called * freq times respectively. */ public abstract void startTerm(BytesRef term, int freq) throws IOException; - + + /** Called after a term and all its positions have been added. */ + public void finishTerm() throws IOException {} + /** Adds a term position and offsets */ public abstract void addPosition(int position, int startOffset, int endOffset, BytesRef payload) throws IOException; @@ -97,7 +106,7 @@ * check that this is the case to detect the JRE bug described * in LUCENE-1282. */ public abstract void finish(FieldInfos fis, int numDocs) throws IOException; - + /** * Called by IndexWriter when writing new segments. *

@@ -197,6 +206,7 @@ protected final void addAllDocVectors(Fields vectors, MergeState mergeState) throws IOException { if (vectors == null) { startDocument(0); + finishDocument(); return; } @@ -275,10 +285,13 @@ addPosition(pos, startOffset, endOffset, payload); } } + finishTerm(); } assert termCount == numTerms; + finishField(); } assert fieldCount == numFields; + finishDocument(); } /** Return the BytesRef Comparator used to sort terms Index: lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java (révision 1430752) +++ lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java (copie de travail) @@ -78,6 +78,7 @@ void fill(int docID) throws IOException { while(lastDocID < docID) { writer.startDocument(0); + writer.finishDocument(); lastDocID++; } } @@ -108,6 +109,7 @@ for (int i = 0; i < numVectorFields; i++) { perFields[i].finishDocument(); } + writer.finishDocument(); assert lastDocID == docState.docID: "lastDocID=" + lastDocID + " docState.docID=" + docState.docID; Index: lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java (révision 1430752) +++ lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java (copie de travail) @@ -182,7 +182,9 @@ } tv.addProx(freq, posReader, offReader); } + tv.finishTerm(); } + tv.finishField(); termsHashPerField.reset();