-
Notifications
You must be signed in to change notification settings - Fork 24.9k
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.
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
Core: Fix epoch millis java time formatter #33302
Merged
spinscale
merged 4 commits into
elastic:master
from
spinscale:1808-java-time-fix-epoch-millis-formatter
Sep 3, 2018
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
73 changes: 73 additions & 0 deletions
73
server/src/test/java/org/elasticsearch/common/time/DateFormattersTests.java
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,73 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.common.time; | ||
|
||
import org.elasticsearch.test.ESTestCase; | ||
|
||
import java.time.ZoneId; | ||
import java.time.ZonedDateTime; | ||
import java.time.format.DateTimeParseException; | ||
import java.time.temporal.TemporalAccessor; | ||
|
||
import static org.hamcrest.Matchers.containsString; | ||
import static org.hamcrest.Matchers.is; | ||
|
||
public class DateFormattersTests extends ESTestCase { | ||
|
||
// the epoch milli parser is a bit special, as it does not use date formatter, see comments in DateFormatters | ||
public void testEpochMilliParser() { | ||
CompoundDateTimeFormatter formatter = DateFormatters.forPattern("epoch_millis"); | ||
|
||
DateTimeParseException e = expectThrows(DateTimeParseException.class, () -> formatter.parse("invalid")); | ||
assertThat(e.getMessage(), containsString("invalid number")); | ||
|
||
// different zone, should still yield the same output, as epoch is time zoned independent | ||
ZoneId zoneId = randomZone(); | ||
CompoundDateTimeFormatter zonedFormatter = formatter.withZone(zoneId); | ||
assertThat(zonedFormatter.printer.getZone(), is(zoneId)); | ||
|
||
// test with negative and non negative values | ||
assertThatSameDateTime(formatter, zonedFormatter, randomNonNegativeLong() * -1); | ||
assertThatSameDateTime(formatter, zonedFormatter, randomNonNegativeLong()); | ||
assertThatSameDateTime(formatter, zonedFormatter, 0); | ||
assertThatSameDateTime(formatter, zonedFormatter, -1); | ||
assertThatSameDateTime(formatter, zonedFormatter, 1); | ||
|
||
// format() output should be equal as well | ||
assertSameFormat(formatter, randomNonNegativeLong() * -1); | ||
assertSameFormat(formatter, randomNonNegativeLong()); | ||
assertSameFormat(formatter, 0); | ||
assertSameFormat(formatter, -1); | ||
assertSameFormat(formatter, 1); | ||
} | ||
|
||
private void assertThatSameDateTime(CompoundDateTimeFormatter formatter, CompoundDateTimeFormatter zonedFormatter, long millis) { | ||
String millisAsString = String.valueOf(millis); | ||
ZonedDateTime formatterZonedDateTime = DateFormatters.toZonedDateTime(formatter.parse(millisAsString)); | ||
ZonedDateTime zonedFormatterZonedDateTime = DateFormatters.toZonedDateTime(zonedFormatter.parse(millisAsString)); | ||
assertThat(formatterZonedDateTime.toInstant().toEpochMilli(), is(zonedFormatterZonedDateTime.toInstant().toEpochMilli())); | ||
} | ||
|
||
private void assertSameFormat(CompoundDateTimeFormatter formatter, long millis) { | ||
String millisAsString = String.valueOf(millis); | ||
TemporalAccessor accessor = formatter.parse(millisAsString); | ||
assertThat(millisAsString, is(formatter.format(accessor))); | ||
} | ||
} |
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.
The SignStyle made me curious so I tried outputting a parsed negative instance using this formatter like:
This gives me
So the parsed instance is what I would expect, but the formatted value looks odd. I think this means the format method might be overwritten somehow, or maybe this can be done with the DateTimeFormatterBuilder()?
In any case, I think a test that parses negative values and outputs them using this formatter and checks for equality might be useful in any case.
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.
Good call. It seems that the date time formatter cannot deal with negative dates... overwriting the
format()
is something we can do in the custom implementation though., which I just did