Skip to content

Optimize keySet / values for Map1 #24640

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

Conversation

kilink
Copy link
Contributor

@kilink kilink commented Apr 15, 2025

Override keySet and values methods for ImmutableCollections.Map1 to return singleton collections.

Map1 inherits from the keySet / values methods from AbstractMap, which both cache and return implementations based on the entrySet iterator. Provide overrides to return specialized implementations for singletons (Set.of / List.of).

Note: Collections.singletonMap already provides similar overrides.


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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24640

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

Using diff file

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

Override keySet and values methods for ImmutableCollections.Map1 to return
singleton collections.
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 15, 2025

👋 Welcome back kilink! 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 Apr 15, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk
Copy link

openjdk bot commented Apr 15, 2025

@kilink 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.

@liach
Copy link
Member

liach commented Apr 15, 2025

#18522 has the same optimizations. I personally believe that patch is more suitable because:

  1. Per 8316493: Remove the caching fields in AbstractMap #15614, we are seeking to remove these cache fields for project valhalla to make these immutable collection value objects, so we won't use the cache fields.
  2. 8328821: Map.of() derived view collection mutators should throw UnsupportedOperationException #18522 considers the behavioral changes between the key set and the values collections for Collection::remove(Object) when the argument object is absent (false return versus throwing UOE) or null (false return versus throwing UOE/NPE) more comprehensively.

@kilink
Copy link
Contributor Author

kilink commented Apr 15, 2025

#18522 has the same optimizations. I personally believe that patch is more suitable because:

  1. Per 8316493: Remove the caching fields in AbstractMap #15614, we are seeking to remove these cache fields for project valhalla to make these immutable collection value objects, so we won't use the cache fields.
  2. 8328821: Map.of() derived view collection mutators should throw UnsupportedOperationException #18522 considers the behavioral changes between the key set and the values collections for Collection::remove(Object) when the argument object is absent (false return versus throwing UOE) or null (false return versus throwing UOE/NPE) more comprehensively.

Thanks, I hadn't seen those. I'll close this in favor of those.

@kilink kilink closed this Apr 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

2 participants