Skip to content

8327391: Add SipHash attribution file #18129

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

Closed
wants to merge 5 commits into from

Conversation

JesperIRL
Copy link
Member

@JesperIRL JesperIRL commented Mar 5, 2024

SipHash attribution file added in src/hotspot/share/legal/


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/18129/head:pull/18129
$ git checkout pull/18129

Update a local copy of the PR:
$ git checkout pull/18129
$ git pull https://git.openjdk.org/jdk.git pull/18129/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18129

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/18129.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 5, 2024

👋 Welcome back jwilhelm! 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
Copy link

openjdk bot commented Mar 5, 2024

@JesperIRL To determine the appropriate audience for reviewing this pull request, one or more labels corresponding to different subsystems will normally be applied automatically. However, no automatic labelling rule matches the changes in this pull request. In order to have an "RFR" email sent to the correct mailing list, you will need to add one or more applicable labels manually using the /label pull request command.

Applicable Labels
  • build
  • client
  • compiler
  • core-libs
  • graal
  • hotspot
  • hotspot-compiler
  • hotspot-gc
  • hotspot-jfr
  • hotspot-runtime
  • i18n
  • ide-support
  • javadoc
  • jdk
  • jmx
  • kulla
  • net
  • nio
  • security
  • serviceability
  • shenandoah

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 5, 2024
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay.

@openjdk
Copy link

openjdk bot commented Mar 5, 2024

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

8327391: Add SipHash attribution file

Reviewed-by: dholmes, lfoltan

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 1 new commit pushed to the master branch:

  • b665fe3: 6801704: ChoiceFormat::applyPattern inconsistency for invalid patterns

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 5, 2024
Copy link
Member

@lfoltan lfoltan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.
Lois

@JesperIRL
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 5, 2024

Going to push as commit fcf48ab.
Since your change was applied there has been 1 commit pushed to the master branch:

  • b665fe3: 6801704: ChoiceFormat::applyPattern inconsistency for invalid patterns

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 5, 2024
@openjdk openjdk bot closed this Mar 5, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 5, 2024
@openjdk
Copy link

openjdk bot commented Mar 5, 2024

@JesperIRL Pushed as commit fcf48ab.

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

@JesperIRL JesperIRL deleted the JDK-8327391 branch March 5, 2024 23:03
@JesperIRL
Copy link
Member Author

/backport jdk22u

@openjdk
Copy link

openjdk bot commented Mar 5, 2024

@JesperIRL the backport was successfully created on the branch backport-JesperIRL-fcf48ab3 in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit fcf48ab3 from the openjdk/jdk repository.

The commit being backported was authored by Jesper Wilhelmsson on 5 Mar 2024 and was reviewed by David Holmes and Lois Foltan.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-JesperIRL-fcf48ab3:backport-JesperIRL-fcf48ab3
$ git checkout backport-JesperIRL-fcf48ab3
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-JesperIRL-fcf48ab3

⚠️ @JesperIRL You are not yet a collaborator in my fork openjdk-bots/jdk22u. An invite will be sent out and you need to accept it before you can proceed.

@gnu-andrew
Copy link
Member

The copyright notice in the attribution file seems to be out of sync with that in altHashing.cpp.

The one in altHashing.cpp has gone back and forth between the two, and was most recently updated by JDK-8297887 to the single 2016 copyright which matches the upstream halfsiphash.c

This commit adds the copyright from siphash.c as was also done in JDK-8273341: Update Siphash to version 1.0 before being changed back in JDK-8297887.

I believe the one from halfsiphash.c is what we want as that's what is used in altHashing.cpp.

@JesperIRL
Copy link
Member Author

@gnu-andrew Thanks! See https://bugs.openjdk.org/browse/JDK-8328812

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants