Skip to content

[7.1] HHH-19977 Relax scope to allo HR to run a reactive flush #11383

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.

Sign up for GitHub

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

Open
DavideD wants to merge 2 commits into
base: 7.1
Choose a base branch
from
+28 −6
Open

[7.1] HHH-19977 Relax scope to allo HR to run a reactive flush #11383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34c86a4
HHH-19977 Relax scope to allow HR to run a reactive flush
DavideD Dec 4, 2025
74d0c24
Update hibernate-core/src/main/java/org/hibernate/query/spi/AbstractS…
gavinking Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,28 @@ protected void beforeQuery() {

session.prepareForQueryExecution( requiresTxn( options.getLockOptions().getLockMode() ) );
prepareForExecution();
prepareSessionFlushMode( session );
prepareSessionCacheMode( session );
}

/*
* Used by Hibernate Reactive
*/
protected void prepareSessionFlushMode(SharedSessionContractImplementor session) {
assert sessionFlushMode == null;
assert sessionCacheMode == null;

final FlushMode effectiveFlushMode = getQueryOptions().getFlushMode();
final var effectiveFlushMode = getQueryOptions().getFlushMode();
if ( effectiveFlushMode != null && session instanceof SessionImplementor statefulSession ) {
sessionFlushMode = statefulSession.getHibernateFlushMode();
statefulSession.setHibernateFlushMode( effectiveFlushMode );
}
}

final CacheMode effectiveCacheMode = getCacheMode();
/*
* Used by Hibernate Reactive
*/
protected void prepareSessionCacheMode(SharedSessionContractImplementor session) {
assert sessionCacheMode == null;
final var effectiveCacheMode = getCacheMode();
if ( effectiveCacheMode != null ) {
sessionCacheMode = session.getCacheMode();
session.setCacheMode( effectiveCacheMode );
Expand Down
15 changes: 13 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,14 @@ public boolean hasCallbackActions() {
return callback != null && callback.hasAfterLoadActions();
}

/*
* Used by Hibernate Reactive
*/
@Override
protected void resetCallback() {
callback = null;
}

@Override
public QueryParameterBindings getQueryParameterBindings() {
return parameterBindings;
Expand Down Expand Up @@ -736,14 +744,17 @@ protected void prepareForExecution() {
getSession().flush();
}
// Reset the callback before every execution
callback = null;
resetCallback();
}
// Otherwise, the application specified query spaces via the Hibernate
// SynchronizeableQuery and so the query will already perform a partial
// flush according to the defined query spaces - no need for a full flush.
}

private boolean shouldFlush() {
/*
* Used by Hibernate Reactive
*/
protected boolean shouldFlush() {
if ( getSession().isTransactionInProgress() ) {
final FlushMode flushMode = getQueryOptions().getFlushMode();
return switch ( flushMode == null ? getSession().getHibernateFlushMode() : flushMode ) {
Expand Down
Loading