Backport "Deprecate MapOps.KeySet, replace with private (and more performant) strict/lazy KeySet implementations" to 3.8.1#24957
Merged
WojciechMazur merged 7 commits intorelease-3.8.1from Jan 13, 2026
Conversation
We need a data structure that both acts like a Set (queries membership efficiently), and has a stable iteration order. LinkedHashSet seems to fit this criteria. [Cherry-picked 5fcd43b]
LinkedHashMap's `keySet` has always been returning a LinkedKeySet, a private data structure that was extended from the generic MapOps.KeySet. Recently MapOps.KeySet was changed to a strict data structure, so we change the `keySet` method to use the lazy wrapper instead. Unfortunately we cannot change the hierarchy of `LinkedKeySet`, but the API never said we have to use it. [Cherry-picked d3ccb6d]
…old versions [Cherry-picked 482f864]
[Cherry-picked bd83196]
[Cherry-picked dc8a15b]
…base implementation This partially reverts `KeySet` and `GenKeySet` to their pre-capture-check implementation, with some unsafe annotations and a deprecation notice. This should cause MiMa to be happy with the previous implementations. [Cherry-picked 9a6a1fa][modified]
[Cherry-picked ae52e37]
Gedochao
approved these changes
Jan 13, 2026
Base automatically changed from
release-3.8.1_backport-24837
to
release-3.8.1
January 13, 2026 11:33
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backports #24767 to the 3.8.1-RC1.
PR submitted by the release tooling.
[skip ci]