Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-08 02:58:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

catch all the types for now

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4547@1407584 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-11-09 18:39:05 +00:00
parent bb6cf86496
commit dda052df44
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,6 +290,8 @@ public class SimpleTextSimpleDocValuesFormat extends SimpleDocValuesFormat {
case FIXED_INTS_16: case FIXED_INTS_16:
case FIXED_INTS_32: case FIXED_INTS_32:
case FIXED_INTS_64: case FIXED_INTS_64:
case FLOAT_64:
case FLOAT_32:
readLine(); readLine();
assert startsWith(MINVALUE); assert startsWith(MINVALUE);
field.minValue = Integer.parseInt(stripPrefix(MINVALUE)); field.minValue = Integer.parseInt(stripPrefix(MINVALUE));
@ -299,7 +301,7 @@ public class SimpleTextSimpleDocValuesFormat extends SimpleDocValuesFormat {
data.seek(data.getFilePointer() + (1+field.pattern.length()) * maxDoc); data.seek(data.getFilePointer() + (1+field.pattern.length()) * maxDoc);
break; break;
default: default:
break; throw new AssertionError();
} }
field.dataStartFilePointer = data.getFilePointer(); field.dataStartFilePointer = data.getFilePointer();
} }

28
lucene/core/src/java/org/apache/lucene/codecs/SimpleDVConsumer.java
View File

@ -45,12 +45,28 @@ public abstract class SimpleDVConsumer implements Closeable {
mergeState.fieldInfo = field; mergeState.fieldInfo = field;
// nocommit: switch on 3 types: NUMBER, BYTES, SORTED // nocommit: switch on 3 types: NUMBER, BYTES, SORTED
DocValues.Type type = field.getDocValuesType(); DocValues.Type type = field.getDocValuesType();
if (type == DocValues.Type.VAR_INTS) { switch(type) {
mergeNumericField(mergeState); case VAR_INTS:
} else if (type == DocValues.Type.BYTES_VAR_STRAIGHT) { case FIXED_INTS_8:
mergeBinaryField(mergeState); case FIXED_INTS_16:
} else if (type == DocValues.Type.BYTES_VAR_SORTED) { case FIXED_INTS_32:
mergeSortedField(mergeState); case FIXED_INTS_64:
case FLOAT_64:
case FLOAT_32:
mergeNumericField(mergeState);
break;
case BYTES_VAR_SORTED:
case BYTES_FIXED_SORTED:
case BYTES_VAR_DEREF:
case BYTES_FIXED_DEREF:
mergeSortedField(mergeState);
break;
case BYTES_VAR_STRAIGHT:
case BYTES_FIXED_STRAIGHT:
mergeBinaryField(mergeState);
break;
default:
throw new AssertionError();
} }
} }
} }