Skip to content

Commit de5b00d

Browse files
authored
Remove version based logic from IpFieldMapper and DateFieldMapper (#113023)
We have logic that throws exception when parsing empty null_value for ip and date field mapper only for indices created from 8.0 and onwards. This conditional can now be removed.
1 parent bb78a28 commit de5b00d

File tree

2 files changed

+2
-37
lines changed

2 files changed

+2
-37
lines changed

server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import org.apache.lucene.search.Query;
2525
import org.elasticsearch.ElasticsearchParseException;
2626
import org.elasticsearch.common.geo.ShapeRelation;
27-
import org.elasticsearch.common.logging.DeprecationCategory;
28-
import org.elasticsearch.common.logging.DeprecationLogger;
2927
import org.elasticsearch.common.lucene.BytesRefs;
3028
import org.elasticsearch.common.time.DateFormatter;
3129
import org.elasticsearch.common.time.DateFormatters;
@@ -35,7 +33,6 @@
3533
import org.elasticsearch.core.Nullable;
3634
import org.elasticsearch.core.TimeValue;
3735
import org.elasticsearch.index.IndexVersion;
38-
import org.elasticsearch.index.IndexVersions;
3936
import org.elasticsearch.index.fielddata.FieldDataContext;
4037
import org.elasticsearch.index.fielddata.IndexFieldData;
4138
import org.elasticsearch.index.fielddata.IndexNumericFieldData.NumericType;
@@ -78,7 +75,6 @@
7875
/** A {@link FieldMapper} for dates. */
7976
public final class DateFieldMapper extends FieldMapper {
8077

81-
private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(DateFieldMapper.class);
8278
private static final Logger logger = LogManager.getLogger(DateFieldMapper.class);
8379

8480
public static final String CONTENT_TYPE = "date";
@@ -340,20 +336,7 @@ private Long parseNullValue(DateFieldType fieldType) {
340336
try {
341337
return fieldType.parse(nullValue.getValue());
342338
} catch (Exception e) {
343-
if (indexCreatedVersion.onOrAfter(IndexVersions.V_8_0_0)) {
344-
throw new MapperParsingException("Error parsing [null_value] on field [" + leafName() + "]: " + e.getMessage(), e);
345-
} else {
346-
DEPRECATION_LOGGER.warn(
347-
DeprecationCategory.MAPPINGS,
348-
"date_mapper_null_field",
349-
"Error parsing ["
350-
+ nullValue.getValue()
351-
+ "] as date in [null_value] on field ["
352-
+ leafName()
353-
+ "]); [null_value] will be ignored"
354-
);
355-
return null;
356-
}
339+
throw new MapperParsingException("Error parsing [null_value] on field [" + leafName() + "]: " + e.getMessage(), e);
357340
}
358341
}
359342

server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,11 @@
2323
import org.apache.lucene.search.Query;
2424
import org.apache.lucene.util.BytesRef;
2525
import org.apache.lucene.util.automaton.CompiledAutomaton;
26-
import org.elasticsearch.common.logging.DeprecationCategory;
27-
import org.elasticsearch.common.logging.DeprecationLogger;
2826
import org.elasticsearch.common.network.InetAddresses;
2927
import org.elasticsearch.common.network.NetworkAddress;
3028
import org.elasticsearch.core.Nullable;
3129
import org.elasticsearch.core.Tuple;
3230
import org.elasticsearch.index.IndexVersion;
33-
import org.elasticsearch.index.IndexVersions;
3431
import org.elasticsearch.index.fielddata.FieldDataContext;
3532
import org.elasticsearch.index.fielddata.IndexFieldData;
3633
import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData;
@@ -62,8 +59,6 @@
6259
*/
6360
public class IpFieldMapper extends FieldMapper {
6461

65-
private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(IpFieldMapper.class);
66-
6762
public static final String CONTENT_TYPE = "ip";
6863

6964
private static IpFieldMapper toType(FieldMapper in) {
@@ -134,20 +129,7 @@ private InetAddress parseNullValue() {
134129
try {
135130
return InetAddresses.forString(nullValueAsString);
136131
} catch (Exception e) {
137-
if (indexCreatedVersion.onOrAfter(IndexVersions.V_8_0_0)) {
138-
throw new MapperParsingException("Error parsing [null_value] on field [" + leafName() + "]: " + e.getMessage(), e);
139-
} else {
140-
DEPRECATION_LOGGER.warn(
141-
DeprecationCategory.MAPPINGS,
142-
"ip_mapper_null_field",
143-
"Error parsing ["
144-
+ nullValue.getValue()
145-
+ "] as IP in [null_value] on field ["
146-
+ leafName()
147-
+ "]); [null_value] will be ignored"
148-
);
149-
return null;
150-
}
132+
throw new MapperParsingException("Error parsing [null_value] on field [" + leafName() + "]: " + e.getMessage(), e);
151133
}
152134
}
153135

0 commit comments

Comments
 (0)