| Index: lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java |
| =================================================================== |
| --- lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java (revision 1299211) |
| +++ lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java (working copy) |
| @@ -107,7 +107,7 @@ |
| hasProx |= isIndexed && indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS; |
| hasFreq |= isIndexed && indexOptions != IndexOptions.DOCS_ONLY; |
| infos[i] = new FieldInfo(name, isIndexed, fieldNumber, storeTermVector, |
| - omitNorms, storePayloads, indexOptions, null, isIndexed && !omitNorms? Type.BYTES_VAR_STRAIGHT : null); |
| + omitNorms, storePayloads, indexOptions, null, isIndexed && !omitNorms? Type.FIXED_INTS_8 : null); |
| } |
| |
| if (input.getFilePointer() != input.length()) { |
| Index: lucene/core/src/java/org/apache/lucene/index/CheckIndex.java |
| =================================================================== |
| --- lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (revision 1299365) |
| +++ lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (working copy) |
| @@ -652,10 +652,16 @@ |
| infoStream.print(" test: field norms........."); |
| } |
| DocValues dv; |
| + // todo: factor out a shared checkValues(DocValues, Type (from fieldinfos), ...) and share this method |
| + // between this and testDocValues |
| for (FieldInfo info : fieldInfos) { |
| if (reader.hasNorms(info.name)) { |
| dv = reader.normValues(info.name); |
| assert dv != null; |
| + DocValues.Type type = dv.type(); |
| + if (type != info.getNormType()) { |
| + throw new RuntimeException("field: " + info.name + " has type: " + type + " but fieldInfos says:" + info.getNormType()); |
| + } |
| if (dv.getSource().hasArray()) { |
| Object array = dv.getSource().getArray(); |
| if (Array.getLength(array) != reader.maxDoc()) { |
