HHH-16981 Improve JdbcOperation caching

hibernate · Jul 25, 2023 · 0c7c68f · 0c7c68f
1 parent bf9a828
commit 0c7c68f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/...rnate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java b/...rnate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java
@@ -41,6 +41,7 @@ public class CollectionLoaderSingleKey implements CollectionLoader {
 	private final int keyJdbcCount;
 
 	private final SelectStatement sqlAst;
+	private final JdbcOperationQuerySelect jdbcSelect;
 	private final JdbcParametersList jdbcParameters;
 
 	public CollectionLoaderSingleKey(
@@ -64,6 +65,11 @@ public CollectionLoaderSingleKey(
 				sessionFactory
 		);
 		this.jdbcParameters = jdbcParametersBuilder.build();
+		this.jdbcSelect = sessionFactory.getJdbcServices()
+				.getJdbcEnvironment()
+				.getSqlAstTranslatorFactory()
+				.buildSelectTranslator( sessionFactory, sqlAst )
+				.translate( JdbcParameterBindings.NO_BINDINGS, QueryOptions.NONE );
 	}
 
 	@Override
@@ -87,10 +93,7 @@ public JdbcParametersList getJdbcParameters() {
 	public PersistentCollection<?> load(Object key, SharedSessionContractImplementor session) {
 		final CollectionKey collectionKey = new CollectionKey( attributeMapping.getCollectionDescriptor(), key );
 
-		final SessionFactoryImplementor sessionFactory = session.getFactory();
-		final JdbcServices jdbcServices = sessionFactory.getJdbcServices();
-		final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment();
-		final SqlAstTranslatorFactory sqlAstTranslatorFactory = jdbcEnvironment.getSqlAstTranslatorFactory();
+		final JdbcServices jdbcServices = session.getFactory().getJdbcServices();
 
 		final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl( keyJdbcCount );
 		int offset = jdbcParameterBindings.registerParametersForEachJdbcValue(
@@ -101,10 +104,6 @@ public PersistentCollection<?> load(Object key, SharedSessionContractImplementor
 		);
 		assert offset == jdbcParameters.size();
 
-		final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory
-				.buildSelectTranslator( sessionFactory, sqlAst )
-				.translate( jdbcParameterBindings, QueryOptions.NONE );
-
 		final SubselectFetch.RegistrationHandler subSelectFetchableKeysHandler = SubselectFetch.createRegistrationHandler(
 				session.getPersistenceContext().getBatchFetchQueue(),
 				sqlAst,

diff --git a/...core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java b/...core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java
@@ -22,7 +22,6 @@
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.query.spi.QueryOptions;
-import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
@@ -46,6 +45,7 @@
 @Incubating
 public class GeneratedValuesProcessor {
 	private final SelectStatement selectStatement;
+	private final JdbcOperationQuerySelect jdbcSelect;
 	private final List<AttributeMapping> generatedValuesToSelect;
 	private final JdbcParametersList jdbcParameters;
 
@@ -62,6 +62,7 @@ public GeneratedValuesProcessor(
 		generatedValuesToSelect = getGeneratedAttributes( entityDescriptor, timing );
 		if ( generatedValuesToSelect.isEmpty() ) {
 			selectStatement = null;
+			jdbcSelect = null;
 			this.jdbcParameters = JdbcParametersList.empty();
 		}
 		else {
@@ -78,6 +79,9 @@ public GeneratedValuesProcessor(
 					builder::add,
 					sessionFactory
 			);
+			jdbcSelect = sessionFactory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
+							.buildSelectTranslator( sessionFactory, selectStatement )
+							.translate( JdbcParameterBindings.NO_BINDINGS, QueryOptions.NONE );
 			this.jdbcParameters = builder.build();
 		}
 	}
@@ -116,10 +120,6 @@ public void processGeneratedValues(Object entity, Object id, Object[] state, Sha
 
 	private List<Object[]> executeSelect(Object id, SharedSessionContractImplementor session) {
 		final JdbcParameterBindings jdbcParamBindings = getJdbcParameterBindings( id, session );
-		final JdbcOperationQuerySelect jdbcSelect =
-				sessionFactory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
-						.buildSelectTranslator( sessionFactory, selectStatement )
-						.translate( jdbcParamBindings, QueryOptions.NONE );
 		return session.getFactory().getJdbcServices().getJdbcSelectExecutor()
 				.list( jdbcSelect, jdbcParamBindings, new NoCallbackExecutionContext(session), (row) -> row, FILTER );
 	}