HHH-16982 Avoid unnecessary registerReloadedEntity calls

hibernate · Jul 24, 2023 · b9e5d3a · b9e5d3a
1 parent 7915ad6
commit b9e5d3a
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 2 deletions.
diff --git a/...ore/src/main/java/org/hibernate/query/internal/DelegatingDomainQueryExecutionContext.java b/...ore/src/main/java/org/hibernate/query/internal/DelegatingDomainQueryExecutionContext.java
@@ -37,6 +37,11 @@ public Callback getCallback() {
 		return delegate.getCallback();
 	}
 
+	@Override
+	public boolean hasCallbackActions() {
+		return delegate.hasCallbackActions();
+	}
+
 	@Override
 	public SharedSessionContractImplementor getSession() {
 		return delegate.getSession();

diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
@@ -621,6 +621,11 @@ public Callback getCallback() {
 		return callback;
 	}
 
+	@Override
+	public boolean hasCallbackActions() {
+		return callback != null && callback.hasAfterLoadActions();
+	}
+
 	protected void resetCallback() {
 		callback = null;
 	}

diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/DomainQueryExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/query/spi/DomainQueryExecutionContext.java
@@ -29,6 +29,11 @@ public interface DomainQueryExecutionContext {
 	 */
 	Callback getCallback();
 
+	default boolean hasCallbackActions() {
+		final Callback callback = getCallback();
+		return callback != null && callback.hasAfterLoadActions();
+	}
+
 	/**
 	 * The underlying session
 	 */

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
@@ -433,6 +433,11 @@ public Callback getCallback() {
 		return callback;
 	}
 
+	@Override
+	public boolean hasCallbackActions() {
+		return callback != null && callback.hasAfterLoadActions();
+	}
+
 	@Override
 	public QueryParameterBindings getQueryParameterBindings() {
 		return parameterBindings;

diff --git a/...e-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java b/...e-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java
@@ -65,6 +65,11 @@ public Callback getCallback() {
 		return sqmExecutionContext.getCallback();
 	}
 
+	@Override
+	public boolean hasCallbackActions() {
+		return sqmExecutionContext.hasCallbackActions();
+	}
+
 	@Override
 	public boolean hasQueryExecutionToBeAddedToStatistics() {
 		return true;

diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackImpl.java
@@ -37,4 +37,9 @@ public void invokeAfterLoadActions(Object entity, EntityMappingType entityMappin
 			afterLoadActions.get( i ).afterLoad( entity, entityMappingType, session );
 		}
 	}
+
+	@Override
+	public boolean hasAfterLoadActions() {
+		return !afterLoadActions.isEmpty();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackNoOp.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackNoOp.java
@@ -29,4 +29,9 @@ public void registerAfterLoadAction(AfterLoadAction afterLoadAction) {
 	public void invokeAfterLoadActions(Object entity, EntityMappingType entityMappingType, SharedSessionContractImplementor session) {
 		// don't do anything
 	}
+
+	@Override
+	public boolean hasAfterLoadActions() {
+		return false;
+	}
 }
diff --git a/...te-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java b/...te-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java
@@ -798,6 +798,11 @@ public Callback getCallback() {
 			return context.getCallback();
 		}
 
+		@Override
+		public boolean hasCallbackActions() {
+			return context.hasCallbackActions();
+		}
+
 		@Override
 		public Set<String> getEnabledFetchProfiles() {
 			return null;

diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/Callback.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/Callback.java
@@ -36,4 +36,6 @@ public interface Callback {
 	default void invokeAfterLoadActions(SharedSessionContractImplementor session, Object entity, org.hibernate.persister.entity.Loadable persister) {
 		invokeAfterLoadActions( entity, persister, session );
 	}
+
+	boolean hasAfterLoadActions();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java
@@ -36,6 +36,11 @@ default boolean isScrollResult(){
 
 	Callback getCallback();
 
+	default boolean hasCallbackActions() {
+		final Callback callback = getCallback();
+		return callback != null && callback.hasAfterLoadActions();
+	}
+
 	String getQueryIdentifier(String sql);
 
 	/**

diff --git a/...in/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java b/...in/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java
@@ -105,6 +105,11 @@ public Callback getCallback() {
 		return processingState.getCallback();
 	}
 
+	@Override
+	public boolean hasCallbackActions() {
+		return processingState.hasCallbackActions();
+	}
+
 	@Override
 	public CollectionKey getCollectionKey() {
 		return processingState.getCollectionKey();

diff --git a/...-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java b/...-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java
@@ -60,7 +60,6 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
 import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
 import org.hibernate.stat.spi.StatisticsImplementor;
-import org.hibernate.type.AssociationType;
 import org.hibernate.type.Type;
 
 import static org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer.UNFETCHED_PROPERTY;
@@ -717,7 +716,7 @@ protected void registerLoadingEntity(RowProcessingState rowProcessingState, Obje
 	}
 
 	protected void registerReloadedEntity(RowProcessingState rowProcessingState, Object instance) {
-		if ( rowProcessingState.getCallback() != null ) {
+		if ( rowProcessingState.hasCallbackActions() ) {
 			// This is only needed for follow-on locking, so skip registering the entity if there is no callback
 			rowProcessingState.getJdbcValuesSourceProcessingState()
 					.registerReloadedEntity(

diff --git a/...core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java b/...core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java
@@ -153,6 +153,11 @@ public Callback getCallback() {
 		return executionContext.getCallback();
 	}
 
+	@Override
+	public boolean hasCallbackActions() {
+		return executionContext.hasCallbackActions();
+	}
+
 	@Override
 	public CollectionKey getCollectionKey() {
 		return executionContext.getCollectionKey();

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BaseSqmUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BaseSqmUnitTest.java
@@ -55,6 +55,11 @@ public void registerAfterLoadAction(AfterLoadAction afterLoadAction) {
 	public void invokeAfterLoadActions(Object entity, EntityMappingType entityMappingType, SharedSessionContractImplementor session) {
 	}
 
+	@Override
+	public boolean hasAfterLoadActions() {
+		return false;
+	}
+
 	protected SqmSelectStatement<?> interpretSelect(String hql) {
 		return interpretSelect( hql, sessionFactory() );
 	}