You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/02/12 02:59:45 UTC
svn commit: r1445015 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
Author: rmuir
Date: Tue Feb 12 01:59:44 2013
New Revision: 1445015
URL: http://svn.apache.org/r1445015
Log:
remove bogus null check
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1445015&r1=1445014&r2=1445015&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java Tue Feb 12 01:59:44 2013
@@ -161,85 +161,80 @@ final class SegmentMerger {
}
private void mergeDocValues(SegmentWriteState segmentWriteState) throws IOException {
-
- if (codec.docValuesFormat() != null) {
- DocValuesConsumer consumer = codec.docValuesFormat().fieldsConsumer(segmentWriteState);
- boolean success = false;
- try {
- for (FieldInfo field : mergeState.fieldInfos) {
- DocValuesType type = field.getDocValuesType();
- if (type != null) {
- if (type == DocValuesType.NUMERIC) {
- List<NumericDocValues> toMerge = new ArrayList<NumericDocValues>();
- for (AtomicReader reader : mergeState.readers) {
- NumericDocValues values = reader.getNumericDocValues(field.name);
- if (values == null) {
- values = NumericDocValues.EMPTY;
- }
- toMerge.add(values);
+ DocValuesConsumer consumer = codec.docValuesFormat().fieldsConsumer(segmentWriteState);
+ boolean success = false;
+ try {
+ for (FieldInfo field : mergeState.fieldInfos) {
+ DocValuesType type = field.getDocValuesType();
+ if (type != null) {
+ if (type == DocValuesType.NUMERIC) {
+ List<NumericDocValues> toMerge = new ArrayList<NumericDocValues>();
+ for (AtomicReader reader : mergeState.readers) {
+ NumericDocValues values = reader.getNumericDocValues(field.name);
+ if (values == null) {
+ values = NumericDocValues.EMPTY;
}
- consumer.mergeNumericField(field, mergeState, toMerge);
- } else if (type == DocValuesType.BINARY) {
- List<BinaryDocValues> toMerge = new ArrayList<BinaryDocValues>();
- for (AtomicReader reader : mergeState.readers) {
- BinaryDocValues values = reader.getBinaryDocValues(field.name);
- if (values == null) {
- values = BinaryDocValues.EMPTY;
- }
- toMerge.add(values);
+ toMerge.add(values);
+ }
+ consumer.mergeNumericField(field, mergeState, toMerge);
+ } else if (type == DocValuesType.BINARY) {
+ List<BinaryDocValues> toMerge = new ArrayList<BinaryDocValues>();
+ for (AtomicReader reader : mergeState.readers) {
+ BinaryDocValues values = reader.getBinaryDocValues(field.name);
+ if (values == null) {
+ values = BinaryDocValues.EMPTY;
}
- consumer.mergeBinaryField(field, mergeState, toMerge);
- } else if (type == DocValuesType.SORTED) {
- List<SortedDocValues> toMerge = new ArrayList<SortedDocValues>();
- for (AtomicReader reader : mergeState.readers) {
- SortedDocValues values = reader.getSortedDocValues(field.name);
- if (values == null) {
- values = SortedDocValues.EMPTY;
- }
- toMerge.add(values);
+ toMerge.add(values);
+ }
+ consumer.mergeBinaryField(field, mergeState, toMerge);
+ } else if (type == DocValuesType.SORTED) {
+ List<SortedDocValues> toMerge = new ArrayList<SortedDocValues>();
+ for (AtomicReader reader : mergeState.readers) {
+ SortedDocValues values = reader.getSortedDocValues(field.name);
+ if (values == null) {
+ values = SortedDocValues.EMPTY;
}
- consumer.mergeSortedField(field, mergeState, toMerge);
- } else {
- throw new AssertionError("type=" + type);
+ toMerge.add(values);
}
+ consumer.mergeSortedField(field, mergeState, toMerge);
+ } else {
+ throw new AssertionError("type=" + type);
}
}
- success = true;
- } finally {
- if (success) {
- IOUtils.close(consumer);
- } else {
- IOUtils.closeWhileHandlingException(consumer);
- }
+ }
+ success = true;
+ } finally {
+ if (success) {
+ IOUtils.close(consumer);
+ } else {
+ IOUtils.closeWhileHandlingException(consumer);
}
}
}
private void mergeNorms(SegmentWriteState segmentWriteState) throws IOException {
- if (codec.normsFormat() != null) {
- DocValuesConsumer consumer = codec.normsFormat().normsConsumer(segmentWriteState);
- boolean success = false;
- try {
- for (FieldInfo field : mergeState.fieldInfos) {
- if (field.hasNorms()) {
- List<NumericDocValues> toMerge = new ArrayList<NumericDocValues>();
- for (AtomicReader reader : mergeState.readers) {
- NumericDocValues norms = reader.getNormValues(field.name);
- if (norms == null) {
- norms = NumericDocValues.EMPTY;
- }
- toMerge.add(norms);
+ DocValuesConsumer consumer = codec.normsFormat().normsConsumer(segmentWriteState);
+ boolean success = false;
+ try {
+ for (FieldInfo field : mergeState.fieldInfos) {
+ if (field.hasNorms()) {
+ List<NumericDocValues> toMerge = new ArrayList<NumericDocValues>();
+ for (AtomicReader reader : mergeState.readers) {
+ NumericDocValues norms = reader.getNormValues(field.name);
+ if (norms == null) {
+ norms = NumericDocValues.EMPTY;
}
- consumer.mergeNumericField(field, mergeState, toMerge);
+ toMerge.add(norms);
}
+ consumer.mergeNumericField(field, mergeState, toMerge);
}
- success = true;
- } finally {
- if (success) {
- IOUtils.close(consumer);
- } else {
- IOUtils.closeWhileHandlingException(consumer);
- }
+ }
+ success = true;
+ } finally {
+ if (success) {
+ IOUtils.close(consumer);
+ } else {
+ IOUtils.closeWhileHandlingException(consumer);
}
}
}