8268113: Re-use Long.hashCode() where possible #4309

stsypanov · 2021-06-02T14:10:38Z

There is a few JDK classes duplicating the contents of Long.hashCode() for hash code calculation. They should explicitly delegate to Long.hashCode().

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8268113: Re-use Long.hashCode() where possible

Reviewers

Claes Redestad (@cl4es - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4309/head:pull/4309
$ git checkout pull/4309

Update a local copy of the PR:
$ git checkout pull/4309
$ git pull https://git.openjdk.java.net/jdk pull/4309/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4309

View PR using the GUI difftool:
$ git pr show -t 4309

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4309.diff

stsypanov · 2021-06-02T14:11:07Z

src/java.base/share/classes/java/util/BitSet.java

@@ -1037,7 +1037,7 @@ public int hashCode() {
        for (int i = wordsInUse; --i >= 0; )
            h ^= words[i] * (i + 1);

-        return (int)((h >> 32) ^ h);
+        return Long.hashCode(h);


Here >> instead of >>> in original code seems to be a typo

It is specified as >> in JavaDoc just above the implementation. As the algorithm is part of the public API and thus part of the specification, I don't think you can change it just here in the implementation; you'd need to at least submit a CSR for it.

Good point! I'll then revert this change

bridgekeeper · 2021-06-02T14:12:32Z

👋 Welcome back stsypanov! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-06-02T14:14:46Z

@stsypanov The following labels will be automatically applied to this pull request:

awt
core-libs
i18n
kulla

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-06-02T14:19:42Z

Webrevs

src/java.base/share/classes/java/lang/Double.java

src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java

src/java.base/share/classes/java/util/BitSet.java

cl4es

All changes look good to me, though 3rd party sources like xerces/.../DoubleDV.java should probably be dealt with in the upstream first. @AlanBateman probably knows who maintains and downstreams this usually (or whether we are now practically maintaining a fork of xerces)?

openjdk · 2021-08-02T11:21:49Z

⚠️ @stsypanov the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout 8268113
$ git commit -c user.name='Preferred Full Name' --allow-empty -m 'Update full name'
$ git push

openjdk · 2021-08-02T11:21:52Z

@stsypanov 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:

8268113: Re-use Long.hashCode() where possible

Reviewed-by: redestad

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 72 new commits pushed to the master branch:

7cc1eb3: Merge
e351de3: 8271272: C2: assert(!had_error) failed: bad dominance
6180cf1: 8271512: ProblemList serviceability/sa/sadebugd/DebugdConnectTest.java due to 8270326
a1b5b81: 8271507: ProblemList SA tests that are failing with ZGC due to JDK-8248912
4bc9b04: 8263059: security/infra/java/security/cert/CertPathValidator/certification/ComodoCA.java fails due to revoked cert
d6bb846: 8248899: security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java fails, Certificate has been revoked
71ca0c0: 8270848: Redundant unsafe opmask register allocation in some instruction patterns.
6c68ce2: 8270947: AArch64: C1: use zero_words to initialize all objects
cd7e30e: 8271242: Add Arena regression tests
5b3c418: 8270321: Startup regressions in 18-b5 caused by JDK-8266310
... and 62 more: https://git.openjdk.java.net/jdk/compare/36aefa351afeb5fd6b87060e06c1e8060afb87a0...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@cl4es) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

stsypanov · 2021-08-02T12:16:59Z

/integrate

openjdk · 2021-08-02T12:18:05Z

@stsypanov
Your change (at version bd762b7) is now ready to be sponsored by a Committer.

cl4es · 2021-08-02T12:45:11Z

/sponsor

openjdk · 2021-08-02T12:49:50Z

Going to push as commit 6a3f834.
Since your change was applied there have been 75 commits pushed to the master branch:

2536e43: 8270160: Remove redundant bounds check from AbstractStringBuilder.charAt()
6c4c48f: 8266972: Use String.concat() in j.l.Class where invokedynamic-based String concatenation is not available
72145f3: 8269665: Clean-up toString() methods of some primitive wrappers
7cc1eb3: Merge
e351de3: 8271272: C2: assert(!had_error) failed: bad dominance
6180cf1: 8271512: ProblemList serviceability/sa/sadebugd/DebugdConnectTest.java due to 8270326
a1b5b81: 8271507: ProblemList SA tests that are failing with ZGC due to JDK-8248912
4bc9b04: 8263059: security/infra/java/security/cert/CertPathValidator/certification/ComodoCA.java fails due to revoked cert
d6bb846: 8248899: security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java fails, Certificate has been revoked
71ca0c0: 8270848: Redundant unsafe opmask register allocation in some instruction patterns.
... and 65 more: https://git.openjdk.java.net/jdk/compare/36aefa351afeb5fd6b87060e06c1e8060afb87a0...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-08-02T12:50:02Z

@cl4es @stsypanov Pushed as commit 6a3f834.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8268113: Re-use Long.hashCode() where possible

9c7ddc0

stsypanov commented Jun 2, 2021

View reviewed changes

openjdk bot added the rfr Pull request is ready for review label Jun 2, 2021

openjdk bot added core-libs core-libs-dev@openjdk.org kulla kulla-dev@openjdk.org i18n i18n-dev@openjdk.org awt client-libs-dev@openjdk.org labels Jun 2, 2021

liach reviewed Jun 2, 2021

View reviewed changes

src/java.base/share/classes/java/lang/Double.java Outdated Show resolved Hide resolved

liach reviewed Jun 2, 2021

View reviewed changes

src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java Outdated Show resolved Hide resolved

stsypanov added 2 commits June 2, 2021 19:29

8268113: Delegate to Double.hashCode()

3f5b431

8268113: Inline local vars where reasonable

df8be00

vyommani reviewed Jun 2, 2021

View reviewed changes

src/java.base/share/classes/java/util/BitSet.java Outdated Show resolved Hide resolved

stsypanov added 4 commits June 4, 2021 14:50

Merge branch 'master' into 8268113

7dc5020

Merge branch 'master' into 8268113

76af35c

Merge branch 'master' into 8268113

3a7b551

Merge branch 'master' into 8268113

f1c8cc7

stsypanov mentioned this pull request Jun 15, 2021

8268764: Use Long.hashCode() instead of int-cast where applicable #4491

Closed

3 tasks

stsypanov added 6 commits June 30, 2021 14:45

Merge branch 'master' into 8268113

4ec7c82

Merge branch 'master' into 8268113

a72a09b

8270160 Revert changes in BitSet.hashCode

1d0e5ba

Merge branch 'master' into 8268113

875a8a2

8270160 Revert changes in BitSet.hashCode

1d619c7

Merge branch 'master' into 8268113

bd762b7

cl4es approved these changes Aug 2, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 2, 2021

openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 2, 2021

openjdk bot closed this Aug 2, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Aug 2, 2021

stsypanov deleted the 8268113 branch August 2, 2021 12:55

stsypanov mentioned this pull request Oct 5, 2021

JDK-8274686 : java.util.UUID#hashCode() should use Long.hashCode() #5811

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8268113: Re-use Long.hashCode() where possible #4309

8268113: Re-use Long.hashCode() where possible #4309

stsypanov commented Jun 2, 2021 •

edited by openjdk bot

Loading

stsypanov Jun 2, 2021

szegedi Jul 13, 2021

stsypanov Jul 14, 2021

bridgekeeper bot commented Jun 2, 2021

openjdk bot commented Jun 2, 2021

mlbridge bot commented Jun 2, 2021 •

edited

Loading

cl4es left a comment

openjdk bot commented Aug 2, 2021

openjdk bot commented Aug 2, 2021 •

edited

Loading

stsypanov commented Aug 2, 2021

openjdk bot commented Aug 2, 2021

cl4es commented Aug 2, 2021

openjdk bot commented Aug 2, 2021

openjdk bot commented Aug 2, 2021

8268113: Re-use Long.hashCode() where possible #4309

8268113: Re-use Long.hashCode() where possible #4309

Conversation

stsypanov commented Jun 2, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

stsypanov Jun 2, 2021

Choose a reason for hiding this comment

szegedi Jul 13, 2021

Choose a reason for hiding this comment

stsypanov Jul 14, 2021

Choose a reason for hiding this comment

bridgekeeper bot commented Jun 2, 2021

openjdk bot commented Jun 2, 2021

mlbridge bot commented Jun 2, 2021 • edited Loading

Webrevs

cl4es left a comment

Choose a reason for hiding this comment

openjdk bot commented Aug 2, 2021

openjdk bot commented Aug 2, 2021 • edited Loading

stsypanov commented Aug 2, 2021

openjdk bot commented Aug 2, 2021

cl4es commented Aug 2, 2021

openjdk bot commented Aug 2, 2021

openjdk bot commented Aug 2, 2021

stsypanov commented Jun 2, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 2, 2021 •

edited

Loading

openjdk bot commented Aug 2, 2021 •

edited

Loading