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

LUCENE-4055: send FIS/SI to tv writer like stored fields 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4055@1341678 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-05-22 23:23:23 +00:00
parent 4b00880436
commit b1693f5cab
12 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,5 +35,5 @@ public abstract class TermVectorsFormat {
/** Returns a {@link TermVectorsWriter} to write term /** Returns a {@link TermVectorsWriter} to write term
* vectors. */ * vectors. */
public abstract TermVectorsWriter vectorsWriter(Directory directory, String segment, IOContext context) throws IOException; public abstract TermVectorsWriter vectorsWriter(Directory directory, SegmentInfo segmentInfo, IOContext context) throws IOException;
} }

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

@ -90,7 +90,7 @@ public abstract class TermVectorsWriter implements Closeable {
* calls to {@link #startDocument(int)}, but a Codec should * calls to {@link #startDocument(int)}, but a Codec should
* check that this is the case to detect the JRE bug described * check that this is the case to detect the JRE bug described
* in LUCENE-1282. */ * in LUCENE-1282. */
public abstract void finish(int numDocs) throws IOException; public abstract void finish(FieldInfos fis, int numDocs) throws IOException;
/** /**
* Called by IndexWriter when writing new segments. * Called by IndexWriter when writing new segments.
@ -159,7 +159,7 @@ public abstract class TermVectorsWriter implements Closeable {
mergeState.checkAbort.work(300); mergeState.checkAbort.work(300);
} }
} }
finish(docCount); finish(mergeState.fieldInfos, docCount);
return docCount; return docCount;
} }

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

@ -75,7 +75,7 @@ class Lucene3xTermVectorsFormat extends TermVectorsFormat {
} }
@Override @Override
public TermVectorsWriter vectorsWriter(Directory directory, String segment, IOContext context) throws IOException { public TermVectorsWriter vectorsWriter(Directory directory, SegmentInfo segmentInfo, IOContext context) throws IOException {
throw new UnsupportedOperationException("this codec can only be used for reading"); throw new UnsupportedOperationException("this codec can only be used for reading");
} }
} }

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

@ -108,7 +108,7 @@ public class Lucene40TermVectorsFormat extends TermVectorsFormat {
} }
@Override @Override
public TermVectorsWriter vectorsWriter(Directory directory, String segment, IOContext context) throws IOException { public TermVectorsWriter vectorsWriter(Directory directory, SegmentInfo segmentInfo, IOContext context) throws IOException {
return new Lucene40TermVectorsWriter(directory, segment, context); return new Lucene40TermVectorsWriter(directory, segmentInfo.name, context);
} }
} }

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

@ -23,6 +23,7 @@ import java.util.Comparator;
import org.apache.lucene.codecs.TermVectorsReader; import org.apache.lucene.codecs.TermVectorsReader;
import org.apache.lucene.codecs.TermVectorsWriter; import org.apache.lucene.codecs.TermVectorsWriter;
import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.Fields; import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy.MergeAbortedException; import org.apache.lucene.index.MergePolicy.MergeAbortedException;
@ -264,7 +265,7 @@ public final class Lucene40TermVectorsWriter extends TermVectorsWriter {
numDocs += copyVectorsNoDeletions(mergeState, matchingVectorsReader, reader, rawDocLengths, rawDocLengths2); numDocs += copyVectorsNoDeletions(mergeState, matchingVectorsReader, reader, rawDocLengths, rawDocLengths2);
} }
} }
finish(numDocs); finish(mergeState.fieldInfos, numDocs);
return numDocs; return numDocs;
} }
@ -355,7 +356,7 @@ public final class Lucene40TermVectorsWriter extends TermVectorsWriter {
} }
@Override @Override
public void finish(int numDocs) throws IOException { public void finish(FieldInfos fis, int numDocs) throws IOException {
if (4+((long) numDocs)*16 != tvx.getFilePointer()) if (4+((long) numDocs)*16 != tvx.getFilePointer())
// This is most likely a bug in Sun JRE 1.6.0_04/_05; // This is most likely a bug in Sun JRE 1.6.0_04/_05;
// we detect that the bug has struck, here, and // we detect that the bug has struck, here, and

3
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java
View File

@ -18,7 +18,6 @@ package org.apache.lucene.codecs.simpletext;
*/ */
import java.io.IOException; import java.io.IOException;
import java.util.Set;
import org.apache.lucene.codecs.StoredFieldsFormat; import org.apache.lucene.codecs.StoredFieldsFormat;
import org.apache.lucene.codecs.StoredFieldsReader; import org.apache.lucene.codecs.StoredFieldsReader;
@ -37,7 +36,7 @@ import org.apache.lucene.store.IOContext;
public class SimpleTextStoredFieldsFormat extends StoredFieldsFormat { public class SimpleTextStoredFieldsFormat extends StoredFieldsFormat {
@Override @Override
public StoredFieldsReader fieldsReader(Directory directory, SegmentInfo si, FieldInfos fn, IOContext context) throws IOException { public StoredFieldsReader fieldsReader(Directory directory, SegmentInfo si, FieldInfos fn, IOContext context) throws IOException {;
return new SimpleTextStoredFieldsReader(directory, si, fn, context); return new SimpleTextStoredFieldsReader(directory, si, fn, context);
} }

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

@ -42,7 +42,7 @@ public class SimpleTextTermVectorsFormat extends TermVectorsFormat {
} }
@Override @Override
public TermVectorsWriter vectorsWriter(Directory directory, String segment, IOContext context) throws IOException { public TermVectorsWriter vectorsWriter(Directory directory, SegmentInfo segmentInfo, IOContext context) throws IOException {
return new SimpleTextTermVectorsWriter(directory, segment, context); return new SimpleTextTermVectorsWriter(directory, segmentInfo.name, context);
} }
} }

3
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java
View File

@ -22,6 +22,7 @@ import java.util.Comparator;
import org.apache.lucene.codecs.TermVectorsWriter; import org.apache.lucene.codecs.TermVectorsWriter;
import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IOContext;
@ -154,7 +155,7 @@ public class SimpleTextTermVectorsWriter extends TermVectorsWriter {
} }
@Override @Override
public void finish(int numDocs) throws IOException { public void finish(FieldInfos fis, int numDocs) throws IOException {
if (numDocsWritten != numDocs) { if (numDocsWritten != numDocs) {
throw new RuntimeException("mergeVectors produced an invalid result: mergedDocs is " + numDocs + " but vec numDocs is " + numDocsWritten + " file=" + out.toString() + "; now aborting this merge to prevent index corruption"); throw new RuntimeException("mergeVectors produced an invalid result: mergedDocs is " + numDocs + " but vec numDocs is " + numDocsWritten + " file=" + out.toString() + "; now aborting this merge to prevent index corruption");
} }

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

@ -278,7 +278,7 @@ final class SegmentMerger {
* @throws IOException * @throws IOException
*/ */
private final int mergeVectors() throws IOException { private final int mergeVectors() throws IOException {
final TermVectorsWriter termVectorsWriter = codec.termVectorsFormat().vectorsWriter(directory, segment, context); final TermVectorsWriter termVectorsWriter = codec.termVectorsFormat().vectorsWriter(directory, mergeState.segmentInfo, context);
try { try {
return termVectorsWriter.merge(mergeState); return termVectorsWriter.merge(mergeState);

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

@ -55,7 +55,7 @@ final class TermVectorsConsumer extends TermsHashConsumer {
try { try {
fill(state.numDocs); fill(state.numDocs);
assert state.segmentInfo != null; assert state.segmentInfo != null;
writer.finish(state.numDocs); writer.finish(state.fieldInfos, state.numDocs);
} finally { } finally {
IOUtils.close(writer); IOUtils.close(writer);
writer = null; writer = null;
@ -84,7 +84,7 @@ final class TermVectorsConsumer extends TermsHashConsumer {
private final void initTermVectorsWriter() throws IOException { private final void initTermVectorsWriter() throws IOException {
if (writer == null) { if (writer == null) {
IOContext context = new IOContext(new FlushInfo(docWriter.getNumDocsInRAM(), docWriter.bytesUsed())); IOContext context = new IOContext(new FlushInfo(docWriter.getNumDocsInRAM(), docWriter.bytesUsed()));
writer = docWriter.codec.termVectorsFormat().vectorsWriter(docWriter.directory, docWriter.getSegmentInfo().name, context); writer = docWriter.codec.termVectorsFormat().vectorsWriter(docWriter.directory, docWriter.getSegmentInfo(), context);
lastDocID = 0; lastDocID = 0;
} }
} }

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

@ -30,8 +30,8 @@ import org.apache.lucene.util.LuceneTestCase;
class PreFlexRWTermVectorsFormat extends Lucene3xTermVectorsFormat { class PreFlexRWTermVectorsFormat extends Lucene3xTermVectorsFormat {
@Override @Override
public TermVectorsWriter vectorsWriter(Directory directory, String segment, IOContext context) throws IOException { public TermVectorsWriter vectorsWriter(Directory directory, SegmentInfo segmentInfo, IOContext context) throws IOException {
return new PreFlexRWTermVectorsWriter(directory, segment, context); return new PreFlexRWTermVectorsWriter(directory, segmentInfo.name, context);
} }
@Override @Override

3
lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsWriter.java
View File

@ -22,6 +22,7 @@ import java.util.Comparator;
import org.apache.lucene.codecs.TermVectorsWriter; import org.apache.lucene.codecs.TermVectorsWriter;
import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.store.DataInput; import org.apache.lucene.store.DataInput;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
@ -194,7 +195,7 @@ final class PreFlexRWTermVectorsWriter extends TermVectorsWriter {
} }
@Override @Override
public void finish(int numDocs) throws IOException { public void finish(FieldInfos fis, int numDocs) throws IOException {
if (4+((long) numDocs)*16 != tvx.getFilePointer()) if (4+((long) numDocs)*16 != tvx.getFilePointer())
// This is most likely a bug in Sun JRE 1.6.0_04/_05; // This is most likely a bug in Sun JRE 1.6.0_04/_05;
// we detect that the bug has struck, here, and // we detect that the bug has struck, here, and