Skip to content

Ingest DateProcessor (small) speedup, optimize collections code in DateFormatter.forPattern #91521

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

Merged
merged 6 commits into from
Nov 14, 2022
Merged

Ingest DateProcessor (small) speedup, optimize collections code in DateFormatter.forPattern #91521

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c60f67
Drop unnecessary parens here
joegallo Nov 10, 2022
120baa8
Rework splitCombinedPatterns to return an array
joegallo Nov 10, 2022
114421e
Unroll stream into an old fashioned foreach
joegallo Nov 10, 2022
a22a208
Merge branch 'main' into ingest-date-processor-speedup
joegallo Nov 10, 2022
6a4d151
Add an explanatory comment
joegallo Nov 14, 2022
8a3121a
Merge branch 'main' into ingest-date-processor-speedup
joegallo Nov 14, 2022
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
2 changes: 1 addition & 1 deletion modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private ZoneId newDateTimeZone(Map<String, Object> params) {
}

private Locale newLocale(Map<String, Object> params) {
return (locale == null) ? Locale.ROOT : LocaleUtils.parse(locale.newInstance(params).execute());
return locale == null ? Locale.ROOT : LocaleUtils.parse(locale.newInstance(params).execute());
}

@Override
Expand Down
19 changes: 9 additions & 10 deletions server/src/main/java/org/elasticsearch/common/time/DateFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;

public interface DateFormatter {

Expand Down Expand Up @@ -114,14 +113,15 @@ static DateFormatter forPattern(String input, Version supportedVersion) {
input = input.substring(1);
}

List<String> patterns = splitCombinedPatterns(input);
List<DateFormatter> formatters = patterns.stream().map(p -> {
String[] patterns = splitCombinedPatterns(input);
List<DateFormatter> formatters = new ArrayList<>(patterns.length);
for (String pattern : patterns) {
// make sure we still support camel case for indices created before 8.0
if (supportedVersion.before(Version.V_8_0_0)) {
return LegacyFormatNames.camelCaseToSnakeCase(p);
pattern = LegacyFormatNames.camelCaseToSnakeCase(pattern);
}
return p;
}).map(DateFormatters::forPattern).collect(Collectors.toList());
formatters.add(DateFormatters.forPattern(pattern));
}

if (formatters.size() == 1) {
return formatters.get(0);
Expand All @@ -130,13 +130,12 @@ static DateFormatter forPattern(String input, Version supportedVersion) {
return JavaDateFormatter.combined(input, formatters);
}

static List<String> splitCombinedPatterns(String input) {
List<String> patterns = new ArrayList<>();
for (String pattern : Strings.delimitedListToStringArray(input, "||")) {
static String[] splitCombinedPatterns(String input) {
String[] patterns = Strings.delimitedListToStringArray(input, "||");
for (String pattern : patterns) {
if (Strings.hasLength(pattern) == false) {
throw new IllegalArgumentException("Cannot have empty element in multi date format pattern: " + input);
}
patterns.add(pattern);
}
return patterns;
}
Expand Down
4 changes: 2 additions & 2 deletions ...deprecation/src/main/java/org/elasticsearch/xpack/deprecation/IndexDeprecationChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ static DeprecationIssue deprecatedCamelCasePattern(IndexMetadata indexMetadata)

private static boolean isDateFieldWithCamelCasePattern(Map<?, ?> property) {
if ("date".equals(property.get("type")) && property.containsKey("format")) {
List<String> patterns = DateFormatter.splitCombinedPatterns((String) property.get("format"));
String[] patterns = DateFormatter.splitCombinedPatterns((String) property.get("format"));
for (String pattern : patterns) {
LegacyFormatNames format = LegacyFormatNames.forName(pattern);
return format != null && format.isCamelCase(pattern);
Expand All @@ -239,7 +239,7 @@ private static boolean isDateFieldWithCamelCasePattern(Map<?, ?> property) {
private static String changeFormatToSnakeCase(String type, Map.Entry<?, ?> entry) {
Map<?, ?> value = (Map<?, ?>) entry.getValue();
final String formatFieldValue = (String) value.get("format");
List<String> patterns = DateFormatter.splitCombinedPatterns(formatFieldValue);
String[] patterns = DateFormatter.splitCombinedPatterns(formatFieldValue);
StringBuilder sb = new StringBuilder(
"Convert [" + entry.getKey() + "] format [" + formatFieldValue + "] " + "which contains deprecated camel case to snake case. "
);
Expand Down