diff --git a/src/java/org/apache/lucene/index/FieldInfo.java b/src/java/org/apache/lucene/index/FieldInfo.java index 08851184194..4b59e7feea9 100644 --- a/src/java/org/apache/lucene/index/FieldInfo.java +++ b/src/java/org/apache/lucene/index/FieldInfo.java @@ -75,28 +75,4 @@ final class FieldInfo { this.storePayloads = true; } } - - void update(FieldInfo other) { - if (isIndexed != other.isIndexed) { - isIndexed = true; // once indexed, always index - } - if (storeTermVector != other.storeTermVector) { - storeTermVector = true; // once vector, always vector - } - if (storePositionWithTermVector != other.storePositionWithTermVector) { - storePositionWithTermVector = true; // once vector, always vector - } - if (storeOffsetWithTermVector != other.storeOffsetWithTermVector) { - storeOffsetWithTermVector = true; // once vector, always vector - } - if (omitNorms != other.omitNorms) { - omitNorms = false; // once norms are stored, always store - } - if (this.omitTf != omitTf) { - this.omitTf = true; // if one require omitTf at least once, it remains off for life - } - if (storePayloads != other.storePayloads) { - storePayloads = true; - } - } } diff --git a/src/java/org/apache/lucene/index/FieldInfos.java b/src/java/org/apache/lucene/index/FieldInfos.java index 234db7cd711..a01020d7e58 100644 --- a/src/java/org/apache/lucene/index/FieldInfos.java +++ b/src/java/org/apache/lucene/index/FieldInfos.java @@ -211,18 +211,6 @@ final class FieldInfos { return fi; } - synchronized public FieldInfo add(FieldInfo fieldInfo) { - FieldInfo fi = fieldInfo(fieldInfo.name); - if (fi == null) { - return addInternal(fieldInfo.name, fieldInfo.isIndexed, fieldInfo.storeTermVector, - fieldInfo.storePositionWithTermVector, fieldInfo.storeOffsetWithTermVector, - fieldInfo.omitNorms, fieldInfo.storePayloads, fieldInfo.omitTf); - } else { - fi.update(fieldInfo); - } - return fi; - } - private FieldInfo addInternal(String name, boolean isIndexed, boolean storeTermVector, boolean storePositionWithTermVector, boolean storeOffsetWithTermVector, boolean omitNorms, boolean storePayloads, boolean omitTf) {