Skip to content
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

8287924: Avoid redundant HashMap.containsKey call in EnvHelp.mapToHashtable #9031

Conversation

turbanoff
Copy link
Member

@turbanoff turbanoff commented Jun 4, 2022

No need to separately perform HashMap.containsKey before HashMap.remove call. If key is present - it will be removed anyway. If it's not present, nothing will be deleted.

public static <K, V> Hashtable<K, V> mapToHashtable(Map<K, V> map) {
HashMap<K, V> m = new HashMap<K, V>(map);
if (m.containsKey(null)) m.remove(null);
for (Iterator<?> i = m.values().iterator(); i.hasNext(); )
if (i.next() == null) i.remove();
return new Hashtable<K, V>(m);
}


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-8287924: Avoid redundant HashMap.containsKey call in EnvHelp.mapToHashtable

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9031

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 4, 2022

👋 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
Copy link

openjdk bot commented Jun 4, 2022

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

  • serviceability

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.

@openjdk openjdk bot added the serviceability serviceability-dev@openjdk.org label Jun 4, 2022
@turbanoff turbanoff changed the title [PATCH] Avoid redundant HashMap.containsKey call in EnvHelp.mapToHashtable 8287924: Avoid redundant HashMap.containsKey call in EnvHelp.mapToHashtable Jun 7, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 7, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 7, 2022

Webrevs

Copy link
Contributor

@sspitsyn sspitsyn 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.
Thanks,
Serguei

@openjdk
Copy link

openjdk bot commented Jun 8, 2022

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

8287924: Avoid redundant HashMap.containsKey call in EnvHelp.mapToHashtable

Reviewed-by: sspitsyn, cjplummer

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

  • 130ce7c: 8288052: Small logging clarification during failed heap shrinkage
  • b623398: 8287901: Loom: Failures with -XX:+VerifyStack
  • 04f02ac: 8214976: Warn about uses of functions replaced for portability
  • 024a240: 8287333: Clean up ParamTaglet and ThrowsTaglet
  • c8cff1b: 8202449: overflow handling in Random.doubles
  • c15e10f: 8233760: Result of BigDecimal.toString throws overflow exception on new BigDecimal(str)
  • b92ce26: 8281001: Class::forName(String) defaults to system class loader if the caller is null
  • c68419f: 8286990: Add compiler name to warning messages in Compiler Directive
  • 6fb84e2: 8287541: Files.writeString fails to throw IOException for charset "windows-1252"
  • a9b9831: 8286663: Resolve IDE warnings in WTrayIconPeer and SystemTray
  • ... and 74 more: https://git.openjdk.java.net/jdk/compare/a113e166e91b9b3d3f74a284888a5135b48dad44...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 openjdk bot added the ready Pull request is ready to be integrated label Jun 8, 2022
@turbanoff
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 9, 2022

Going to push as commit 900d967.
Since your change was applied there have been 102 commits pushed to the master branch:

  • d482d7f: 8286160: (fs) Files.exists returns unexpected results with C:\pagefile.sys because it's not readable
  • edff51e: 8284858: Start of release updates for JDK 20
  • 2671443: 8286171: HttpClient/2 : Expect:100-Continue blocks indefinitely when response is not 100
  • 59b0de6: 8288048: Build failure with GCC 6 after JDK-8286562
  • db4405d: 8288078: linux-aarch64-optimized build fails in Tier5 after JDK-8287567
  • 7e948f7: 8287903: Reduce runtime of java.math microbenchmarks
  • 3fa9984: 8287854: Dangling reference in ClassVerifier::verify_class
  • 4285e3d: 8288023: AArch64: disable PAC-RET when preview is enabled
  • 560e292: 8287738: [PPC64] jdk/incubator/vector/*VectorTests failing
  • e5b56ba: 8288040: x86: Loom: Improve cont/monitor-count helper methods
  • ... and 92 more: https://git.openjdk.org/jdk/compare/a113e166e91b9b3d3f74a284888a5135b48dad44...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 9, 2022

@turbanoff Pushed as commit 900d967.

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

@turbanoff turbanoff deleted the redundant_HashMap.containsKey_EnvHelp.mapToHashtable branch October 27, 2022 18:42
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 serviceability serviceability-dev@openjdk.org
3 participants