Fix unknown camel case date-time mappings #88400
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| pr: 88400 | ||
| summary: Fix unknown camel case date-time mappings | ||
| area: Infra/Core | ||
| type: bug | ||
| issues: | ||
| - 84199 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| package org.elasticsearch.common.time; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public enum LegacyFormatNames { | ||
| ISO8601(null, "iso8601"), | ||
| BASIC_DATE("basicDate", "basic_date"), | ||
| BASIC_DATE_TIME("basicDateTime", "basic_date_time"), | ||
| BASIC_DATE_TIME_NO_MILLIS("basicDateTimeNoMillis", "basic_date_time_no_millis"), | ||
| BASIC_ORDINAL_DATE("basicOrdinalDate", "basic_ordinal_date"), | ||
| BASIC_ORDINAL_DATE_TIME("basicOrdinalDateTime", "basic_ordinal_date_time"), | ||
| BASIC_ORDINAL_DATE_TIME_NO_MILLIS("basicOrdinalDateTimeNoMillis", "basic_ordinal_date_time_no_millis"), | ||
| BASIC_TIME("basicTime", "basic_time"), | ||
| BASIC_TIME_NO_MILLIS("basicTimeNoMillis", "basic_time_no_millis"), | ||
| BASIC_T_TIME("basicTTime", "basic_t_time"), | ||
| BASIC_T_TIME_NO_MILLIS("basicTTimeNoMillis", "basic_t_time_no_millis"), | ||
| BASIC_WEEK_DATE("basicWeekDate", "basic_week_date"), | ||
| BASIC_WEEK_DATE_TIME("basicWeekDateTime", "basic_week_date_time"), | ||
| BASIC_WEEK_DATE_TIME_NO_MILLIS("basicWeekDateTimeNoMillis", "basic_week_date_time_no_millis"), | ||
| DATE(null, "date"), | ||
| DATE_HOUR("dateHour", "date_hour"), | ||
| DATE_HOUR_MINUTE("dateHourMinute", "date_hour_minute"), | ||
| DATE_HOUR_MINUTE_SECOND("dateHourMinuteSecond", "date_hour_minute_second"), | ||
| DATE_HOUR_MINUTE_SECOND_FRACTION("dateHourMinuteSecondFraction", "date_hour_minute_second_fraction"), | ||
| DATE_HOUR_MINUTE_SECOND_MILLIS("dateHourMinuteSecondMillis", "date_hour_minute_second_millis"), | ||
| DATE_OPTIONAL_TIME("dateOptionalTime", "date_optional_time"), | ||
| DATE_TIME("dateTime", "date_time"), | ||
| DATE_TIME_NO_MILLIS("dateTimeNoMillis", "date_time_no_millis"), | ||
| HOUR(null, "hour"), | ||
| HOUR_MINUTE("hourMinute", "hour_minute"), | ||
| HOUR_MINUTE_SECOND("hourMinuteSecond", "hour_minute_second"), | ||
| HOUR_MINUTE_SECOND_FRACTION("hourMinuteSecondFraction", "hour_minute_second_fraction"), | ||
| HOUR_MINUTE_SECOND_MILLIS("hourMinuteSecondMillis", "hour_minute_second_millis"), | ||
| ORDINAL_DATE("ordinalDate", "ordinal_date"), | ||
| ORDINAL_DATE_TIME("ordinalDateTime", "ordinal_date_time"), | ||
| ORDINAL_DATE_TIME_NO_MILLIS("ordinalDateTimeNoMillis", "ordinal_date_time_no_millis"), | ||
| TIME(null, "time"), | ||
| TIME_NO_MILLIS("timeNoMillis", "time_no_millis"), | ||
| T_TIME("tTime", "t_time"), | ||
| T_TIME_NO_MILLIS("tTimeNoMillis", "t_time_no_millis"), | ||
| WEEK_DATE("weekDate", "week_date"), | ||
| WEEK_DATE_TIME("weekDateTime", "week_date_time"), | ||
| WEEK_DATE_TIME_NO_MILLIS("weekDateTimeNoMillis", "week_date_time_no_millis"), | ||
| WEEK_YEAR(null, "week_year"), | ||
| WEEKYEAR(null, "weekyear"), | ||
| WEEK_YEAR_WEEK("weekyearWeek", "weekyear_week"), | ||
| WEEKYEAR_WEEK_DAY("weekyearWeekDay", "weekyear_week_day"), | ||
| YEAR(null, "year"), | ||
| YEAR_MONTH("yearMonth", "year_month"), | ||
| YEAR_MONTH_DAY("yearMonthDay", "year_month_day"), | ||
| EPOCH_SECOND(null, "epoch_second"), | ||
| EPOCH_MILLIS(null, "epoch_millis"), | ||
| // strict date formats here, must be at least 4 digits for year and two for months and two for day | ||
| STRICT_BASIC_WEEK_DATE("strictBasicWeekDate", "strict_basic_week_date"), | ||
| STRICT_BASIC_WEEK_DATE_TIME("strictBasicWeekDateTime", "strict_basic_week_date_time"), | ||
| STRICT_BASIC_WEEK_DATE_TIME_NO_MILLIS("strictBasicWeekDateTimeNoMillis", "strict_basic_week_date_time_no_millis"), | ||
| STRICT_DATE("strictDate", "strict_date"), | ||
| STRICT_DATE_HOUR("strictDateHour", "strict_date_hour"), | ||
| STRICT_DATE_HOUR_MINUTE("strictDateHourMinute", "strict_date_hour_minute"), | ||
| STRICT_DATE_HOUR_MINUTE_SECOND("strictDateHourMinuteSecond", "strict_date_hour_minute_second"), | ||
| STRICT_DATE_HOUR_MINUTE_SECOND_FRACTION("strictDateHourMinuteSecondFraction", "strict_date_hour_minute_second_fraction"), | ||
| STRICT_DATE_HOUR_MINUTE_SECOND_MILLIS("strictDateHourMinuteSecondMillis", "strict_date_hour_minute_second_millis"), | ||
| STRICT_DATE_OPTIONAL_TIME("strictDateOptionalTime", "strict_date_optional_time"), | ||
| STRICT_DATE_OPTIONAL_TIME_NANOS("strictDateOptionalTimeNanos", "strict_date_optional_time_nanos"), | ||
| STRICT_DATE_TIME("strictDateTime", "strict_date_time"), | ||
| STRICT_DATE_TIME_NO_MILLIS("strictDateTimeNoMillis", "strict_date_time_no_millis"), | ||
| STRICT_HOUR("strictHour", "strict_hour"), | ||
| STRICT_HOUR_MINUTE("strictHourMinute", "strict_hour_minute"), | ||
| STRICT_HOUR_MINUTE_SECOND("strictHourMinuteSecond", "strict_hour_minute_second"), | ||
| STRICT_HOUR_MINUTE_SECOND_FRACTION("strictHourMinuteSecondFraction", "strict_hour_minute_second_fraction"), | ||
| STRICT_HOUR_MINUTE_SECOND_MILLIS("strictHourMinuteSecondMillis", "strict_hour_minute_second_millis"), | ||
| STRICT_ORDINAL_DATE("strictOrdinalDate", "strict_ordinal_date"), | ||
| STRICT_ORDINAL_DATE_TIME("strictOrdinalDateTime", "strict_ordinal_date_time"), | ||
| STRICT_ORDINAL_DATE_TIME_NO_MILLIS("strictOrdinalDateTimeNoMillis", "strict_ordinal_date_time_no_millis"), | ||
| STRICT_TIME("strictTime", "strict_time"), | ||
| STRICT_TIME_NO_MILLIS("strictTimeNoMillis", "strict_time_no_millis"), | ||
| STRICT_T_TIME("strictTTime", "strict_t_time"), | ||
| STRICT_T_TIME_NO_MILLIS("strictTTimeNoMillis", "strict_t_time_no_millis"), | ||
| STRICT_WEEK_DATE("strictWeekDate", "strict_week_date"), | ||
| STRICT_WEEK_DATE_TIME("strictWeekDateTime", "strict_week_date_time"), | ||
| STRICT_WEEK_DATE_TIME_NO_MILLIS("strictWeekDateTimeNoMillis", "strict_week_date_time_no_millis"), | ||
| STRICT_WEEKYEAR("strictWeekyear", "strict_weekyear"), | ||
| STRICT_WEEKYEAR_WEEK("strictWeekyearWeek", "strict_weekyear_week"), | ||
| STRICT_WEEKYEAR_WEEK_DAY("strictWeekyearWeekDay", "strict_weekyear_week_day"), | ||
| STRICT_YEAR("strictYear", "strict_year"), | ||
| STRICT_YEAR_MONTH("strictYearMonth", "strict_year_month"), | ||
| STRICT_YEAR_MONTH_DAY("strictYearMonthDay", "strict_year_month_day"); | ||
|
|
||
| private static final Map<String, String> ALL_NAMES = Arrays.stream(values()) | ||
| .filter(n -> n.camelCaseName != null) | ||
| .collect(Collectors.toMap(n -> n.camelCaseName, n -> n.snakeCaseName)); | ||
|
|
||
| private final String camelCaseName; | ||
| private final String snakeCaseName; | ||
|
|
||
| LegacyFormatNames(String camelCaseName, String snakeCaseName) { | ||
| this.camelCaseName = camelCaseName; | ||
| this.snakeCaseName = snakeCaseName; | ||
| } | ||
|
|
||
| public static String camelCaseToSnakeCase(String format) { | ||
| return ALL_NAMES.getOrDefault(format, format); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| package org.elasticsearch.index.mapper; | ||
|
|
||
| import org.elasticsearch.cluster.metadata.MappingMetadata; | ||
| import org.elasticsearch.common.compress.CompressedXContent; | ||
| import org.elasticsearch.common.xcontent.XContentHelper; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Contains a collection of helper methods for index mapping upgrades | ||
| */ | ||
| public class MapperServiceUpgraders { | ||
| @SuppressWarnings("unchecked") | ||
| private static Map<String, Object> getMappingsForType(Map<String, Object> mappingMap, String type) { | ||
| // Check for MappingMap without type and ignore it | ||
| if (mappingMap.size() != 1) { | ||
| return null; | ||
| } | ||
| // Fetch the mappings for the encoded type | ||
| return (Map<String, Object>) mappingMap.get(type); | ||
| } | ||
|
|
||
| @SuppressWarnings({ "unchecked", "rawtypes" }) | ||
| private static boolean upgradeDateFormatProperties(Map<String, Object> properties, Map<String, Object> parsedProperties) { | ||
| boolean anyChanges = false; | ||
|
|
||
| if (properties != null && parsedProperties != null) { | ||
| for (var property : properties.entrySet()) { | ||
| if (property.getValue()instanceof Map map) { | ||
| var parsedProperty = parsedProperties.get(property.getKey()); | ||
| if (parsedProperty instanceof Map parsedMap) { | ||
| Object format = map.get("format"); | ||
| if (format != null) { | ||
| Object parsedFormat = parsedMap.get("format"); | ||
| if (parsedFormat != null && parsedFormat.equals(format) == false) { | ||
| map.put("format", parsedFormat); | ||
| anyChanges = true; | ||
| } | ||
| } else { | ||
| var anyNestedChanges = upgradeDateFormatProperties(map, parsedMap); | ||
| anyChanges = anyChanges || anyNestedChanges; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return anyChanges; | ||
| } | ||
|
|
||
| /** | ||
| * Upgrades the date format field of mapping properties | ||
| * <p> | ||
| * This method checks if the new mapping source has a different format than the original mapping, and if it | ||
| * does, then it returns the original mapping source with updated format field. We cannot simply replace the | ||
| * MappingMetadata mappingSource with the new parsedSource, because the parsed source contains additional | ||
| * properties which cannot be serialized and reread. | ||
| * | ||
| * @param mappingMetadata the current mapping metadata | ||
| * @param parsedSource the mapping source as it was parsed | ||
| */ | ||
| @SuppressWarnings({ "unchecked", "rawtypes" }) | ||
| public static CompressedXContent upgradeDateFormatsIfNeeded(MappingMetadata mappingMetadata, CompressedXContent parsedSource) { | ||
| Map<String, Object> sourceMap = mappingMetadata.rawSourceAsMap(); | ||
| Map<String, Object> newMap = XContentHelper.convertToMap(parsedSource.compressedReference(), true).v2(); | ||
|
|
||
| Map<String, Object> mappings = getMappingsForType(sourceMap, mappingMetadata.type()); | ||
| Map<String, Object> parsedMappings = getMappingsForType(newMap, mappingMetadata.type()); | ||
|
|
||
| if (mappings == null || parsedMappings == null) { | ||
| return mappingMetadata.source(); | ||
| } | ||
|
|
||
| boolean anyPropertiesChanges = upgradeDateFormatProperties( | ||
| (Map<String, Object>) mappings.get("properties"), | ||
| (Map<String, Object>) parsedMappings.get("properties") | ||
| ); | ||
|
|
||
| boolean anyRuntimeChanges = upgradeDateFormatProperties( | ||
|
There was a problem hiding this comment. I didn't do anything here for dynamic_templates, they don't seem to trigger a parse of a Date field in the same way it's happening for 'properties' and 'runtime'. |
||
| (Map<String, Object>) mappings.get("runtime"), | ||
| (Map<String, Object>) parsedMappings.get("runtime") | ||
| ); | ||
|
|
||
| if (anyRuntimeChanges == false && anyPropertiesChanges == false) { | ||
| return mappingMetadata.source(); | ||
| } | ||
|
|
||
| try { | ||
| return new CompressedXContent(sourceMap); | ||
|
There was a problem hiding this comment. Could you keep track of whether any change was made above, so that the original parsedSource can be returned here and reference equality could be used by the caller to detect changes? That would make it less expensive when there aren't any changes (which is most of the time). |
||
| } catch (IOException e) { | ||
| throw new IllegalStateException("Unexpected error remapping source map", e); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copied back from 7.17, with removed unnecessary methods.