-
Notifications
You must be signed in to change notification settings - Fork 5.7k
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
8310241: OffsetDateTime compareTo redundant computation #14618
8310241: OffsetDateTime compareTo redundant computation #14618
Conversation
Covered by existing tests in test/jdk/java/time/tck/java/time/TCKOffsetDateTime.java
👋 Welcome back rriggs! A progress list of the required criteria for merging this PR into |
@RogerRiggs The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
* When two values represent the same instant, the local date-time is compared | ||
* to distinguish them. This step is needed to make the ordering | ||
* consistent with {@code equals()}. | ||
* |
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.
This method is also called from the public timeLineOrder()
method. Could this change cause a different order?
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.
Your are right; I missed that subtlety. With that in mind I don't think the performance impact is sufficient to duplicate more code.
Closing because this 'fix' a bigger issue than it fixes. |
Add a test for the specific condition being optimized, the test was missing in the original.
Reopening this to propose a different implementation and to |
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.
LGTM
@RogerRiggs This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 83 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
/integrate |
Going to push as commit 11fd34e.
Your commit was automatically rebased without conflicts. |
@RogerRiggs Pushed as commit 11fd34e. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Remove a redundant comparison in java.time
OffsetDateTime.compareTo()
.If the
compareInstant
utility method returns 0 (equal), it compares theLocalDateTime
.However,
compareInstant
has already done that comparison; if it found equal, thecompareTo
method unnecessarily does it again.The code is refactored in
compareTo
to do the comparison ofLocalDateTime
exactly once, if it is needed.This case is NOT covered by an existing test in test/jdk/java/time/tck/java/time/TCKOffsetDateTime.java
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14618/head:pull/14618
$ git checkout pull/14618
Update a local copy of the PR:
$ git checkout pull/14618
$ git pull https://git.openjdk.org/jdk.git pull/14618/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 14618
View PR using the GUI difftool:
$ git pr show -t 14618
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14618.diff
Webrev
Link to Webrev Comment