[Backport 4.0.x] Optimize computeLocations() and simplify ModelObjectPool location handling - #13042
Merged
Merged
Conversation
…dling (#13031) Two targeted optimizations in the model building pipeline: 1. computeLocations(): replace Stream.concat().collect(toUnmodifiableMap) with HashMap.putAll() + Map.copyOf(). Also return oldlocs directly when newlocs is empty (avoids unnecessary Map.copyOf since base locations are already immutable). Add getLocations() accessor for direct map access. 2. ModelObjectPool.PoolKey: the original code used getLocationKeys() + getLocation(key) to iterate locations because getLocations() did not exist. Add getLocations() to the model and use Objects.equals() on the map directly, replacing both the per-key iteration in locationsEqual() and the separate locationsHashCode() helper. Remove redundant getLocationKeys() equality check (subsumed by map equality).
gnodet
commented
Sep 4, 2026
gnodet
left a comment
gnodet
left a comment
Contributor
Author
There was a problem hiding this comment.
✅ LGTM. Solid backport. The computeLocations() optimization correctly preserves merge semantics (newlocs overrides oldlocs via HashMap.putAll — equivalent to the previous Stream.concat with (v1, v2) -> v1). Skipping Map.copyOf(oldlocs) when newlocs is empty is safe because base.locations is always unmodifiable (set by a prior computeLocations() or Map.of()). New getLocations() accessor correctly exposes the already-unmodifiable map.
This review was generated by an AI agent, Hermès, on behalf of @gnodet.
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
1 participant
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.
Backport of #13031 from
mastertomaven-4.0.x.Only the
model.vmchanges apply —DefaultModelObjectPool.javadoes not exist onmaven-4.0.x(removed/refactored).