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

LUCENE-2509: small code cleanups 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@956906 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2010-06-22 14:35:10 +00:00
parent f1be531c50
commit 7686d2f301
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lucene/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictWriter.java
View File

@ -59,16 +59,21 @@ public class StandardTermsDictWriter extends FieldsConsumer {
final StandardPostingsWriter postingsWriter;
final FieldInfos fieldInfos;
FieldInfo currentField;
private final StandardTermsIndexWriter indexWriter;
private final StandardTermsIndexWriter termsIndexWriter;
private final List<TermsConsumer> fields = new ArrayList<TermsConsumer>();
private final Comparator<BytesRef> termComp;
public StandardTermsDictWriter(StandardTermsIndexWriter indexWriter, SegmentWriteState state, StandardPostingsWriter postingsWriter, Comparator<BytesRef> termComp) throws IOException {
public StandardTermsDictWriter(
StandardTermsIndexWriter termsIndexWriter,
SegmentWriteState state,
StandardPostingsWriter postingsWriter,
Comparator<BytesRef> termComp) throws IOException
{
final String termsFileName = IndexFileNames.segmentFileName(state.segmentName, "", StandardCodec.TERMS_EXTENSION);
this.indexWriter = indexWriter;
this.termsIndexWriter = termsIndexWriter;
this.termComp = termComp;
out = state.directory.createOutput(termsFileName);
indexWriter.setTermsOutput(out);
termsIndexWriter.setTermsOutput(out);
state.flushedFiles.add(termsFileName);
fieldInfos = state.fieldInfos;
@ -89,7 +94,7 @@ public class StandardTermsDictWriter extends FieldsConsumer {
public TermsConsumer addField(FieldInfo field) {
assert currentField == null || currentField.name.compareTo(field.name) < 0;
currentField = field;
StandardTermsIndexWriter.FieldWriter fieldIndexWriter = indexWriter.addField(field);
StandardTermsIndexWriter.FieldWriter fieldIndexWriter = termsIndexWriter.addField(field);
TermsConsumer terms = new TermsWriter(fieldIndexWriter, field, postingsWriter);
fields.add(terms);
return terms;
@ -119,7 +124,7 @@ public class StandardTermsDictWriter extends FieldsConsumer {
try {
postingsWriter.close();
} finally {
indexWriter.close();
termsIndexWriter.close();
}
}
}
@ -132,7 +137,11 @@ public class StandardTermsDictWriter extends FieldsConsumer {
private long numTerms;
private final StandardTermsIndexWriter.FieldWriter fieldIndexWriter;
TermsWriter(StandardTermsIndexWriter.FieldWriter fieldIndexWriter, FieldInfo fieldInfo, StandardPostingsWriter postingsWriter) {
TermsWriter(
StandardTermsIndexWriter.FieldWriter fieldIndexWriter,
FieldInfo fieldInfo,
StandardPostingsWriter postingsWriter)
{
this.fieldInfo = fieldInfo;
this.fieldIndexWriter = fieldIndexWriter;