HHH-18992 - Locking does not work with multiLoad #9681
Merged
+562
−7
Conversation
This file contains 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
gavinking
reviewed
Jan 29, 2025
There was a problem hiding this comment.
Thanks, @jrenaat!
I have left some very minor suggestions.
But on the test side of things, I have this additional feedback:
- This bug also affects
Session.findMultiple()when passed a lock mode as aFindOption, so we should test that too, since that's what we now recommend. - If you look at my commits on this issue, the bug also affected load by natural id, so we should test that too.
- I know that this is harder to test, but we really should test that the lock mode is actually affecting the generated SQL.
...nate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java
Outdated
Show resolved
Hide resolved
...c/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java
Outdated
Show resolved
Hide resolved
...c/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java
Outdated
Show resolved
Hide resolved
hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderStandard.java
Outdated
Show resolved
Hide resolved
hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadLockingTest.java
Outdated
Show resolved
Hide resolved
mbladel
reviewed
Jan 29, 2025
There was a problem hiding this comment.
Few minor comments, but the fix looks great!
Though not strictly necessary, it would be nice if you could also apply the correct code-style to the test class.
Edit: looks like @gavinking beat me to this, I agree it would be great to add more tests and perhaps the fixes could be similar.
...c/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java
Outdated
Show resolved
Hide resolved
...c/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java
Outdated
Show resolved
Hide resolved
...nate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java
Outdated
Show resolved
Hide resolved
hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderStandard.java
Outdated
Show resolved
Hide resolved
Closed
jrenaat
force-pushed
the
HHH-18992_lockmode
branch
3 times, most recently
from
e46b1f7 to
b5dcde4
Compare
- added an @AfterEach tearDown method - added tests also for findMultiple and byMultipleNaturalId - corrected the tests that use optimistic/optimistic_force_increment (they should use a versioned entity) - add statement inspection where applicable Signed-off-by: Jan Schatteman <[email protected]>
… by default to false, as otherwise an UnsupportedOperationException would be thrown by the MultiNaturalIdLoaderInPredicate Signed-off-by: Jan Schatteman <[email protected]>
Signed-off-by: Jan Schatteman <[email protected]>
jrenaat
force-pushed
the
HHH-18992_lockmode
branch
from
b5dcde4 to
8e575c4
Compare
mbladel
reviewed
Feb 7, 2025
| @@ -34,7 +34,7 @@ public class NaturalIdMultiLoadAccessStandard<T> implements NaturalIdMultiLoadAc | |||
|
|
|||
| private Integer batchSize; | |||
| private boolean returnOfDeletedEntitiesEnabled; | |||
| private boolean orderedReturnEnabled = true; | |||
| private boolean orderedReturnEnabled = false; | |||
There was a problem hiding this comment.
Why was this default changed? The jdoc of NaturalIdMultiLoadAccess#enableOrderedReturn says:
By default, the returned list is ordered and the positions of the
entities correspond to the positions of their ids. [...]
This seems to break that assumption, no?
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.
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-18992