8346036: Unnecessary Hashtable usage in javax.swing.text.html.parser.Entity #21831

turbanoff · 2024-11-01T14:02:52Z

The Hashtable javax.swing.text.html.parser.Entity#entityTypes is modified only within <clinit> block.
We can replace it with immutable map to avoid Hashtable synchronization overhead.
Similar to what we did in #21825.

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-8346036: Unnecessary Hashtable usage in javax.swing.text.html.parser.Entity (Enhancement - P5)

Reviewers

Alexey Ivanov (@aivanov-jdk - Reviewer)
Alexander Zvegintsev (@azvegint - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21831

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…ntity

bridgekeeper · 2024-11-01T14:03:18Z

👋 Welcome back aturbanov! 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 · 2024-11-01T14:03:21Z

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

8346036: Unnecessary Hashtable usage in javax.swing.text.html.parser.Entity

Reviewed-by: aivanov, azvegint

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

a641932: 8346310: Duplicate !HAS_PENDING_EXCEPTION check in DynamicArchive::dump_at_exit
49ee4df: 8166983: Remove old/legacy unused tzdata files
3fe0818: 8346099: JFR: Query for 'jfr view' can't handle wildcard with multiple event types
55bcf4c: 8346047: JFR: Incorrect percentile value in 'jfr view'
ae3fc46: 8345580: Remove const from Node::_idx which is modified
4d18e5a: 8346872: tools/jpackage/windows/WinLongPathTest.java fails
92ad8a1: 8346052: JFR: Incorrect average value in 'jfr view'
672c413: 8345337: JFR: jfr view should display all direct subfields for an event type
afe5434: 8347163: Javadoc error in ConstantPoolBuilder after JDK-8342468
f696d9c: 8346239: Improve memory efficiency of JimageDiffGenerator
... and 956 more: https://git.openjdk.org/jdk/compare/751a914b0a377d4e1dd30d2501f0ab4e327dea34...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2024-11-01T14:03:51Z

@turbanoff The following label will be automatically applied to this pull request:

client

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.

bridgekeeper · 2024-11-29T19:14:36Z

@turbanoff This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

mlbridge · 2024-12-11T20:08:11Z

Webrevs

00: Full (1c73c52e)

bridgekeeper · 2024-12-27T23:20:27Z

@turbanoff This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

aivanov-jdk

This looks good to me. It aligns javax.swing.text.html.parser.Entity to javax.swing.text.html.parser.Element which you did in #21825.

@turbanoff Could you re-open the issue?
I'll run the tests with this change in our CI.

turbanoff · 2025-01-03T16:01:25Z

/open

openjdk · 2025-01-03T16:02:02Z

@turbanoff This pull request is now open

aivanov-jdk

Looks good to me.

All the client tests are green.

aivanov-jdk · 2025-01-07T21:59:37Z

src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.


Needs to be updated to 2025?

Leaving this as‑is is probably fine given that this PR hasn’t changed since then, just like #22854 (review) (commit 9a60f44)

The PR will be or is integrated in 2025, so the entire changeset is dated 2025 — thus, 2025 copyright year applies to all the files.

turbanoff · 2025-01-09T12:46:30Z

Thank you for review!
/integrate

openjdk · 2025-01-09T12:47:49Z

Going to push as commit 9c72ded.
Since your change was applied there have been 987 commits pushed to the master branch:

3024a73: 8345782: Refining the cases that libjsig deprecation warning is issued
2801bc6: 8346460: NotifyFramePop should return JVMTI_ERROR_DUPLICATE
ceae2b9: 8347121: Add missing @serial tags to module java.base
8c87ea2: 8346478: RISC-V: Refactor add/sub assembler routines
765b9e6: 8346706: RISC-V: Add available registers to hs_err
d66737e: 8341097: GHA: Demote Mac x86 jobs to build only
dff5719: 8347126: gc/stress/TestStressG1Uncommit.java gets OOM-killed
82e16ba: 8347268: [ubsan] logOutput.cpp:357:21: runtime error: applying non-zero offset 1 to null pointer
33f9be8: 8347083: Incomplete logging in nsk/jvmti/ResourceExhausted/resexhausted00* tests
8eddf67: 8346887: DrawFocusRect() may cause an assertion failure
... and 977 more: https://git.openjdk.org/jdk/compare/751a914b0a377d4e1dd30d2501f0ab4e327dea34...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-01-09T12:47:55Z

@turbanoff Pushed as commit 9c72ded.

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

[PATCH] Unnecessary Hashtable usage in javax.swing.text.html.parser.E…

1c73c52

…ntity

openjdk bot added the client client-libs-dev@openjdk.org label Nov 1, 2024

turbanoff changed the title ~~[PATCH] Unnecessary Hashtable usage in javax.swing.text.html.parser.Entity~~ 8346036: Unnecessary Hashtable usage in javax.swing.text.html.parser.Entity Dec 11, 2024

openjdk bot added the rfr Pull request is ready for review label Dec 11, 2024

bridgekeeper bot closed this Dec 27, 2024

aivanov-jdk reviewed Jan 3, 2025

View reviewed changes

openjdk bot reopened this Jan 3, 2025

aivanov-jdk approved these changes Jan 7, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 7, 2025

azvegint approved these changes Jan 8, 2025

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jan 9, 2025

openjdk bot closed this Jan 9, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8346036: Unnecessary Hashtable usage in javax.swing.text.html.parser.Entity #21831

8346036: Unnecessary Hashtable usage in javax.swing.text.html.parser.Entity #21831

turbanoff commented Nov 1, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 1, 2024

openjdk bot commented Nov 1, 2024 •

edited

Loading

openjdk bot commented Nov 1, 2024

bridgekeeper bot commented Nov 29, 2024

mlbridge bot commented Dec 11, 2024

bridgekeeper bot commented Dec 27, 2024

aivanov-jdk left a comment

turbanoff commented Jan 3, 2025

openjdk bot commented Jan 3, 2025

aivanov-jdk left a comment

aivanov-jdk Jan 7, 2025

ExE-Boss Jan 9, 2025

aivanov-jdk Jan 9, 2025

turbanoff commented Jan 9, 2025

openjdk bot commented Jan 9, 2025

openjdk bot commented Jan 9, 2025

8346036: Unnecessary Hashtable usage in javax.swing.text.html.parser.Entity #21831

8346036: Unnecessary Hashtable usage in javax.swing.text.html.parser.Entity #21831

Conversation

turbanoff commented Nov 1, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 1, 2024

openjdk bot commented Nov 1, 2024 • edited Loading

openjdk bot commented Nov 1, 2024

bridgekeeper bot commented Nov 29, 2024

mlbridge bot commented Dec 11, 2024

Webrevs

bridgekeeper bot commented Dec 27, 2024

aivanov-jdk left a comment

Choose a reason for hiding this comment

turbanoff commented Jan 3, 2025

openjdk bot commented Jan 3, 2025

aivanov-jdk left a comment

Choose a reason for hiding this comment

aivanov-jdk Jan 7, 2025

Choose a reason for hiding this comment

ExE-Boss Jan 9, 2025

Choose a reason for hiding this comment

aivanov-jdk Jan 9, 2025

Choose a reason for hiding this comment

turbanoff commented Jan 9, 2025

openjdk bot commented Jan 9, 2025

openjdk bot commented Jan 9, 2025

turbanoff commented Nov 1, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Nov 1, 2024 •

edited

Loading