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

SimpleDocValues -> DocValues. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4547@1443467 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrien Grand 2013-02-07 13:33:00 +00:00
parent 6b8e374c44
commit edf731a050
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,7 @@ package org.apache.lucene.index;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.FieldInfosWriter; import org.apache.lucene.codecs.FieldInfosWriter;
@ -125,7 +123,7 @@ final class SegmentMerger {
t0 = System.nanoTime(); t0 = System.nanoTime();
} }
if (mergeState.fieldInfos.hasDocValues()) { if (mergeState.fieldInfos.hasDocValues()) {
mergeSimpleDocValues(segmentWriteState); mergeDocValues(segmentWriteState);
} }
if (mergeState.infoStream.isEnabled("SM")) { if (mergeState.infoStream.isEnabled("SM")) {
long t1 = System.nanoTime(); long t1 = System.nanoTime();
@ -136,7 +134,7 @@ final class SegmentMerger {
if (mergeState.infoStream.isEnabled("SM")) { if (mergeState.infoStream.isEnabled("SM")) {
t0 = System.nanoTime(); t0 = System.nanoTime();
} }
mergeSimpleNorms(segmentWriteState); mergeNorms(segmentWriteState);
if (mergeState.infoStream.isEnabled("SM")) { if (mergeState.infoStream.isEnabled("SM")) {
long t1 = System.nanoTime(); long t1 = System.nanoTime();
mergeState.infoStream.message("SM", ((t1-t0)/1000000) + " msec to merge norms [" + numMerged + " docs]"); mergeState.infoStream.message("SM", ((t1-t0)/1000000) + " msec to merge norms [" + numMerged + " docs]");
@ -162,7 +160,7 @@ final class SegmentMerger {
return mergeState; return mergeState;
} }
private void mergeSimpleDocValues(SegmentWriteState segmentWriteState) throws IOException { private void mergeDocValues(SegmentWriteState segmentWriteState) throws IOException {
if (codec.docValuesFormat() != null) { if (codec.docValuesFormat() != null) {
DocValuesConsumer consumer = codec.docValuesFormat().fieldsConsumer(segmentWriteState); DocValuesConsumer consumer = codec.docValuesFormat().fieldsConsumer(segmentWriteState);
@ -217,7 +215,7 @@ final class SegmentMerger {
} }
} }
private void mergeSimpleNorms(SegmentWriteState segmentWriteState) throws IOException { private void mergeNorms(SegmentWriteState segmentWriteState) throws IOException {
if (codec.normsFormat() != null) { if (codec.normsFormat() != null) {
DocValuesConsumer consumer = codec.normsFormat().normsConsumer(segmentWriteState); DocValuesConsumer consumer = codec.normsFormat().normsConsumer(segmentWriteState);
boolean success = false; boolean success = false;