Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore v7 support in DateFieldMapper and IPFieldMapper #119050

Merged
merged 2 commits into from
Dec 19, 2024
Merged

Restore v7 support in DateFieldMapper and IPFieldMapper #119050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b67169
Revert "Remove version based logic from IpFieldMapper and DateFieldMa…
cbuescher Dec 19, 2024
05859bb
Restore v7 support in DateFieldMapper and IPFieldMapper
cbuescher Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.apache.lucene.search.Query;
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.common.geo.ShapeRelation;
import org.elasticsearch.common.logging.DeprecationCategory;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.lucene.BytesRefs;
import org.elasticsearch.common.time.DateFormatter;
import org.elasticsearch.common.time.DateFormatters;
Expand All @@ -34,6 +36,7 @@
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.index.IndexVersion;
import org.elasticsearch.index.IndexVersions;
import org.elasticsearch.index.fielddata.FieldDataContext;
import org.elasticsearch.index.fielddata.IndexFieldData;
import org.elasticsearch.index.fielddata.IndexNumericFieldData.NumericType;
Expand Down Expand Up @@ -76,6 +79,7 @@
/** A {@link FieldMapper} for dates. */
public final class DateFieldMapper extends FieldMapper {

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

public static final String CONTENT_TYPE = "date";
Expand Down Expand Up @@ -342,7 +346,20 @@ private Long parseNullValue(DateFieldType fieldType) {
try {
return fieldType.parse(nullValue.getValue());
} catch (Exception e) {
throw new MapperParsingException("Error parsing [null_value] on field [" + leafName() + "]: " + e.getMessage(), e);
if (indexCreatedVersion.onOrAfter(IndexVersions.V_8_0_0)) {
throw new MapperParsingException("Error parsing [null_value] on field [" + leafName() + "]: " + e.getMessage(), e);
} else {
DEPRECATION_LOGGER.warn(
DeprecationCategory.MAPPINGS,
"date_mapper_null_field",
"Error parsing ["
+ nullValue.getValue()
+ "] as date in [null_value] on field ["
+ leafName()
+ "]); [null_value] will be ignored"
);
return null;
}
}
}

Expand Down
20 changes: 19 additions & 1 deletion server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@
import org.apache.lucene.search.Query;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.automaton.CompiledAutomaton;
import org.elasticsearch.common.logging.DeprecationCategory;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.network.InetAddresses;
import org.elasticsearch.common.network.NetworkAddress;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.Tuple;
import org.elasticsearch.index.IndexVersion;
import org.elasticsearch.index.IndexVersions;
import org.elasticsearch.index.fielddata.FieldDataContext;
import org.elasticsearch.index.fielddata.IndexFieldData;
import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData;
Expand Down Expand Up @@ -59,6 +62,8 @@
*/
public class IpFieldMapper extends FieldMapper {

private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(IpFieldMapper.class);

public static final String CONTENT_TYPE = "ip";

private static IpFieldMapper toType(FieldMapper in) {
Expand Down Expand Up @@ -129,7 +134,20 @@ private InetAddress parseNullValue() {
try {
return InetAddresses.forString(nullValueAsString);
} catch (Exception e) {
throw new MapperParsingException("Error parsing [null_value] on field [" + leafName() + "]: " + e.getMessage(), e);
if (indexCreatedVersion.onOrAfter(IndexVersions.V_8_0_0)) {
throw new MapperParsingException("Error parsing [null_value] on field [" + leafName() + "]: " + e.getMessage(), e);
} else {
DEPRECATION_LOGGER.warn(
DeprecationCategory.MAPPINGS,
"ip_mapper_null_field",
"Error parsing ["
+ nullValue.getValue()
+ "] as IP in [null_value] on field ["
+ leafName()
+ "]); [null_value] will be ignored"
);
return null;
}
}
}

Expand Down
54 changes: 54 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import org.elasticsearch.index.IndexVersions;
import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType;
import org.elasticsearch.script.DateFieldScript;
import org.elasticsearch.script.ScriptService;
import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.test.index.IndexVersionUtils;
import org.elasticsearch.xcontent.XContentBuilder;

import java.io.IOException;
Expand All @@ -44,6 +46,7 @@
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.notNullValue;
import static org.mockito.Mockito.mock;

public class DateFieldMapperTests extends MapperTestCase {

Expand Down Expand Up @@ -245,6 +248,10 @@ public void testBadNullValue() throws IOException {
+ "failed to parse date field [foo] with format [strict_date_optional_time||epoch_millis]"
)
);

createDocumentMapper(IndexVersions.V_7_9_0, fieldMapping(b -> b.field("type", "date").field("null_value", "foo")));

assertWarnings("Error parsing [foo] as date in [null_value] on field [field]); [null_value] will be ignored");
}

public void testNullConfigValuesFail() {
Expand Down Expand Up @@ -757,4 +764,51 @@ public void testLegacyField() throws Exception {
assertNotEquals(DEFAULT_DATE_TIME_FORMATTER, ((DateFieldType) service.fieldType("mydate")).dateTimeFormatter);
}

public void testLegacyDateFormatName() {
DateFieldMapper.Builder builder = new DateFieldMapper.Builder(
"format",
DateFieldMapper.Resolution.MILLISECONDS,
null,
mock(ScriptService.class),
true,
// BWC compatible index, e.g 7.x
IndexVersionUtils.randomVersionBetween(
random(),
IndexVersions.V_7_0_0,
IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0)
)
);

// Check that we allow the use of camel case date formats on 7.x indices
@SuppressWarnings("unchecked")
FieldMapper.Parameter<String> formatParam = (FieldMapper.Parameter<String>) builder.getParameters()[3];
formatParam.parse("date_time_format", mock(MappingParserContext.class), "strictDateOptionalTime");
builder.buildFormatter(); // shouldn't throw exception

formatParam.parse("date_time_format", mock(MappingParserContext.class), "strictDateOptionalTime||strictDateOptionalTimeNanos");
builder.buildFormatter(); // shouldn't throw exception

DateFieldMapper.Builder newFieldBuilder = new DateFieldMapper.Builder(
"format",
DateFieldMapper.Resolution.MILLISECONDS,
null,
mock(ScriptService.class),
true,
IndexVersion.current()
);

@SuppressWarnings("unchecked")
final FieldMapper.Parameter<String> newFormatParam = (FieldMapper.Parameter<String>) newFieldBuilder.getParameters()[3];

// Check that we don't allow the use of camel case date formats on 8.x indices
assertEquals(
"Error parsing [format] on field [format]: Invalid format: [strictDateOptionalTime]: Unknown pattern letter: t",
expectThrows(IllegalArgumentException.class, () -> {
newFormatParam.parse("date_time_format", mock(MappingParserContext.class), "strictDateOptionalTime");
assertEquals("strictDateOptionalTime", newFormatParam.getValue());
newFieldBuilder.buildFormatter();
}).getMessage()
);

}
}
7 changes: 7 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.elasticsearch.core.Tuple;
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.index.IndexVersion;
import org.elasticsearch.index.IndexVersions;
import org.elasticsearch.script.IpFieldScript;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down Expand Up @@ -208,6 +209,12 @@ public void testNullValue() throws IOException {
e.getMessage(),
"Failed to parse mapping: Error parsing [null_value] on field [field]: ':1' is not an IP string literal."
);

createDocumentMapper(IndexVersions.V_7_9_0, fieldMapping(b -> {
b.field("type", "ip");
b.field("null_value", ":1");
}));
assertWarnings("Error parsing [:1] as IP in [null_value] on field [field]); [null_value] will be ignored");
}

public void testDimension() throws IOException {
Expand Down