HHH-18885 Introduce DelayedOperation.getAddedEntry() for maps #10230
+13
−4
Conversation
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
Extra lazy maps need to persist the added entry (key and value), not the added value. Let PersistentMap.AbstractMapValueDelayedOperation return the added entry so OneToManyPersister.writeIndex() can execute the queued operation.
|
Thanks for your pull request! This pull request appears to follow the contribution rules. › This message was automatically generated. |
mbladel
reviewed
May 27, 2025
| @@ -1226,6 +1226,10 @@ protected interface DelayedOperation<E> { | |||
| void operate(); | |||
|
|
|||
| E getAddedInstance(); | |||
|
|
|||
| default E getAddedEntry() { | |||
There was a problem hiding this comment.
Suggested change
| default E getAddedEntry() { | |
| default Object getAddedEntry() { |
Comment on lines
531
to
534
| public E getAddedEntry() { | ||
| // The (E) cast is very hacky because E is not Map.Entry but we need it to conform to PersistentCollection.queuedAdditionIterator() | ||
| return (E) Map.entry( getIndex(), getAddedInstance() ); | ||
| } |
There was a problem hiding this comment.
Suggested change
| public E getAddedEntry() { | |
| // The (E) cast is very hacky because E is not Map.Entry but we need it to conform to PersistentCollection.queuedAdditionIterator() | |
| return (E) Map.entry( getIndex(), getAddedInstance() ); | |
| } | |
| public Object getAddedEntry() { | |
| return Map.entry( getIndex(), getAddedInstance() ); | |
| } |
| @@ -852,7 +852,7 @@ public final Iterator<E> queuedAdditionIterator() { | |||
|
|
|||
| @Override | |||
| public E next() { | |||
| return operationQueue.get( index++ ).getAddedInstance(); | |||
| return operationQueue.get( index++ ).getAddedEntry(); | |||
There was a problem hiding this comment.
Please change org.hibernate.collection.spi.PersistentCollection#queuedAdditionIterator to return an Iterator<?>, and this method to return Object.
There was a problem hiding this comment.
I have made the change to return an Iterator<?>
For maps the iterator operates over a collection of Map.Entry
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Same as #9331 minus the unit test (because extra lazy maps are gone in Hibernate 7), to keep branches aligned
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.
https://hibernate.atlassian.net/browse/HHH-18885