Core: Rework multi date formatter merging #36447
Merged
Conversation
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 commit moves the MergedDateFormatter to a package private class and reworks joda DateFormatter instances to use that instead of a single DateTimeFormatter with multiple parsers. This will allow the java and joda multi formats to share the same format parsing method in a followup.
rjernst
added
:Core/Infra/Core
|
Pinging @elastic/es-core-infra |
spinscale
reviewed
Dec 10, 2018
| private final List<DateMathParser> dateMathParsers; | ||
|
|
||
| MergedDateFormatter(String pattern, List<DateFormatter> formatters) { | ||
| assert formatters.size() > 0; |
There was a problem hiding this comment.
the array was switched to a list while copying, I assume that was intentional?
There was a problem hiding this comment.
Yes that was intentional
spinscale
reviewed
Dec 10, 2018
| @@ -86,7 +87,7 @@ default DateTime parseJoda(String input) { | |||
| * Return the given millis-since-epoch formatted with this format. | |||
| */ | |||
| default String formatMillis(long millis) { | |||
| return format(Instant.ofEpochMilli(millis)); | |||
| return format(ZonedDateTime.ofInstant(Instant.ofEpochMilli(millis), ZoneOffset.UTC)); | |||
spinscale
approved these changes
Dec 10, 2018
|
@elasticmachine test this please |
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Dec 12, 2018
This commit moves the MergedDateFormatter to a package private class and reworks joda DateFormatter instances to use that instead of a single DateTimeFormatter with multiple parsers. This will allow the java and joda multi formats to share the same format parsing method in a followup.
rjernst
added a commit
that referenced
this pull request
Dec 13, 2018
This commit moves the MergedDateFormatter to a package private class and reworks joda DateFormatter instances to use that instead of a single DateTimeFormatter with multiple parsers. This will allow the java and joda multi formats to share the same format parsing method in a followup.
spinscale
added a commit
to spinscale/elasticsearch
that referenced
this pull request
Dec 13, 2018
Due to the change in exception handling in elastic#36447 the backport now used different exceptions on parser failures between java and joda time formatting. This uses now IllegalArgumentExceptions for formatting errors all over the place. Closes elastic#36598
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Dec 19, 2018
This commit partially reverts elastic#36447 by using the ability of Joda time's DateTimeFormatterBuilder to append multiple parsers instead of using the MergedDateFormatter. The MergedDateFormatter will be removed in a future change, as it is not as performant due to creating potentially many exceptions during heavy date parsing. This change is a stop-gap until that followup is ready. closes elastic#36602
rjernst
added a commit
that referenced
this pull request
Dec 19, 2018
This commit partially reverts #36447 by using the ability of Joda time's DateTimeFormatterBuilder to append multiple parsers instead of using the MergedDateFormatter. The MergedDateFormatter will be removed in a future change, as it is not as performant due to creating potentially many exceptions during heavy date parsing. This change is a stop-gap until that followup is ready. closes #36602
rjernst
added a commit
that referenced
this pull request
Dec 19, 2018
This commit partially reverts #36447 by using the ability of Joda time's DateTimeFormatterBuilder to append multiple parsers instead of using the MergedDateFormatter. The MergedDateFormatter will be removed in a future change, as it is not as performant due to creating potentially many exceptions during heavy date parsing. This change is a stop-gap until that followup is ready. closes #36602
rjernst
added a commit
that referenced
this pull request
Dec 19, 2018
This commit partially reverts #36447 by using the ability of Joda time's DateTimeFormatterBuilder to append multiple parsers instead of using the MergedDateFormatter. The MergedDateFormatter will be removed in a future change, as it is not as performant due to creating potentially many exceptions during heavy date parsing. This change is a stop-gap until that followup is ready. closes #36602
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This commit moves the MergedDateFormatter to a package private class and
reworks joda DateFormatter instances to use that instead of a single
DateTimeFormatter with multiple parsers. This will allow the java and
joda multi formats to share the same format parsing method in a
followup.