8305746: InitializeEncoding should cache Charset object instead of charset name

[peter-hofer]

Store Charset object in jnuEncoding and use String(byte[], Charset) and String.getBytes(Charset) instead of passing the charset name.

---

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

• JDK-8305746: InitializeEncoding should cache Charset object instead of charset name

Reviewers

• Naoto Sato (@naotoj - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13499

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

Hi @peter-hofer, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user peter-hofer" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

[peter-hofer]

/covered

[bridgekeeper]

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

[openjdk]

@peter-hofer The following label will be automatically applied to this pull request:

• core-libs

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.

[peter-hofer]

@naotoj please find here my changes to InitializeEncoding.

[mlbridge]

Webrevs

• 02: Full - Incremental (9d10b1da)
• 01: Full (9f2494d5)
• 00: Full (4f5aa514)

[openjdk]

@peter-hofer Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

[naotoj]

Looks good to me (with minor nits). Since it would be hard to write a regression test, what kind of tests have you done? Did you run your patch on platforms that made sure your new code path work?

[peter-hofer]

I have a test in GraalVM which passes with this change in place and will periodically run and start failing in case of a regression. Other issues with this code should become obvious quickly because the code paths are exercised even for non-7bit UTF-8 strings.

[naotoj]

Looks good to me. Thanks for the change.

[openjdk]

@peter-hofer 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:

8305746: InitializeEncoding should cache Charset object instead of charset name

Reviewed-by: naoto

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

• 6a7dff3: 8305880: Loom: Avoid putting stale object pointers in oops
• 310aa93: 8304291: [AIX] Broken build after JDK-8301998
• 64ed816: 8305943: Open source few AWT Focus related tests
• b8f0a66: 8041676: remove the java.compiler system property
• 781d6d7: 8306372: Open source AWT CardLayout and Checkbox tests
• d03128d: 8306280: Open source several choice AWT tests
• e764e9b: 8306452: Fix Amazon copyright in JDK-8305425 test
• ed34e7f: 8306321: Add an accessor for the top of a PLAB
• fdb4baf: 8306134: Open source some AWT tests relating to Button and a few other classes
• 4ad3ac6: 8306135: Clean up and open source some AWT tests
• ... and 10 more: https://git.openjdk.org/jdk/compare/c7faf60201a2401897e6159a5aaa03f22d4ae5d6...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 (@naotoj) 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).

[peter-hofer]

/integrate

[openjdk]

@peter-hofer
Your change (at version 9d10b1d) is now ready to be sponsored by a Committer.

[naotoj]

/sponsor

[openjdk]

Going to push as commit 20b1d19.
Since your change was applied there have been 25 commits pushed to the master branch:

• 955abca: 8306483: (ch) Channels.newReader(ReadableByteChannel,Charset) refers to csName
• c6a288d: 8305945: (zipfs) Opening a directory to get input stream produces incorrect exception message
• 73018b3: 8306284: G1: Remove assertion in G1ScanHRForRegionClosure::do_claimed_block
• 33a7978: 8306538: Zero variant build failure after JDK-8257967
• 9c2e5b3: 8306459: s390x: Replace NULL to nullptr
• 6a7dff3: 8305880: Loom: Avoid putting stale object pointers in oops
• 310aa93: 8304291: [AIX] Broken build after JDK-8301998
• 64ed816: 8305943: Open source few AWT Focus related tests
• b8f0a66: 8041676: remove the java.compiler system property
• 781d6d7: 8306372: Open source AWT CardLayout and Checkbox tests
• ... and 15 more: https://git.openjdk.org/jdk/compare/c7faf60201a2401897e6159a5aaa03f22d4ae5d6...master

Your commit was automatically rebased without conflicts.

[openjdk]

@naotoj @peter-hofer Pushed as commit 20b1d19.

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