HHH-18992 pass LockOptions correctly to multiple natural id loaders

Author: gavinking

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java

@@ -7,7 +7,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -18,7 +17,7 @@
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.SimpleNaturalIdMapping;
-import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.query.spi.QueryOptionsAdapter;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterImpl;
@@ -73,9 +72,10 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions loadOptio
 		final SessionFactoryImplementor sessionFactory = session.getFactory();
 		naturalIds = LoaderHelper.normalizeKeys( naturalIds, getNaturalIdAttribute(), session, sessionFactory );
 
-		final LockOptions lockOptions = (loadOptions.getLockOptions() == null)
-				? new LockOptions( LockMode.NONE )
-				: loadOptions.getLockOptions();
+		final LockOptions lockOptions =
+				loadOptions.getLockOptions() == null
+						? LockOptions.NONE
+						: loadOptions.getLockOptions();
 
 		final BasicTypeRegistry basicTypeRegistry = sessionFactory.getTypeConfiguration().getBasicTypeRegistry();
 		final BasicType<?> arrayBasicType = basicTypeRegistry.getRegisteredType( keyArrayClass );
@@ -99,8 +99,12 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions loadOptio
 				.getJdbcEnvironment()
 				.getSqlAstTranslatorFactory()
 				.buildSelectTranslator( sessionFactory, sqlAst )
-				// TODO: do we need to pass the LockOptions here?
-				.translate( JdbcParameterBindings.NO_BINDINGS, QueryOptions.NONE );
+				.translate( JdbcParameterBindings.NO_BINDINGS, new QueryOptionsAdapter() {
+					@Override
+					public LockOptions getLockOptions() {
+						return lockOptions;
+					}
+				} );
 
 		return LoaderHelper.loadByArrayParameter(
 				naturalIds,

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderInPredicate.java

@@ -7,7 +7,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -48,24 +47,27 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions options,
 			maxBatchSize = options.getBatchSize();
 		}
 		else {
-			maxBatchSize = session.getJdbcServices().getJdbcEnvironment().getDialect().getMultiKeyLoadSizingStrategy().determineOptimalBatchLoadSize(
-					entityDescriptor.getNaturalIdMapping().getJdbcTypeCount(),
-					naturalIds.length,
-					sessionFactory.getSessionFactoryOptions().inClauseParameterPaddingEnabled()
-			);
+			maxBatchSize =
+					session.getJdbcServices().getJdbcEnvironment().getDialect()
+							.getMultiKeyLoadSizingStrategy().determineOptimalBatchLoadSize(
+									entityDescriptor.getNaturalIdMapping().getJdbcTypeCount(),
+									naturalIds.length,
+									sessionFactory.getSessionFactoryOptions().inClauseParameterPaddingEnabled()
+							);
 		}
 
 		final int batchSize = Math.min( maxBatchSize, naturalIds.length );
 
-		final LockOptions lockOptions = (options.getLockOptions() == null)
-				? new LockOptions( LockMode.NONE )
-				: options.getLockOptions();
+		final LockOptions lockOptions =
+				options.getLockOptions() == null
+						? LockOptions.NONE
+						: options.getLockOptions();
 
 		final MultiNaturalIdLoadingBatcher batcher = new MultiNaturalIdLoadingBatcher(
 				entityDescriptor,
 				entityDescriptor.getNaturalIdMapping(),
 				batchSize,
-				(naturalId, session1) -> {
+				(naturalId, s) -> {
 					// `naturalId` here is the one passed in by the API as part of the values array
 					// todo (6.0) : use this to help create the ordered results
 					return entityDescriptor.getNaturalIdMapping().normalizeInput( naturalId );
@@ -75,7 +77,7 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions options,
 				sessionFactory
 		);
 
-		final List<E> results = batcher.multiLoad( naturalIds, options, session );
+		final List<E> results = batcher.multiLoad( naturalIds, session );
 
 		if ( results.size() == 1 ) {
 			return results;

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java

@@ -13,10 +13,9 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.SubselectFetch;
 import org.hibernate.internal.util.collections.CollectionHelper;
-import org.hibernate.loader.ast.spi.MultiNaturalIdLoadOptions;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
-import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.query.spi.QueryOptionsAdapter;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
@@ -83,11 +82,15 @@ public MultiNaturalIdLoadingBatcher(
 		final SqlAstTranslatorFactory sqlAstTranslatorFactory =
 				sessionFactory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory();
 		this.jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlSelect )
-				//TODO: do we need to pass the LockOptions here?
-				.translate( null, QueryOptions.NONE );
+				.translate( null, new QueryOptionsAdapter() {
+					@Override
+					public LockOptions getLockOptions() {
+						return lockOptions;
+					}
+				} );
 	}
 
-	public <E> List<E> multiLoad(Object[] naturalIdValues, MultiNaturalIdLoadOptions options, SharedSessionContractImplementor session) {
+	public <E> List<E> multiLoad(Object[] naturalIdValues, SharedSessionContractImplementor session) {
 		final ArrayList<E> multiLoadResults = CollectionHelper.arrayList( naturalIdValues.length );
 		final JdbcParameterBindingsImpl jdbcParamBindings = new JdbcParameterBindingsImpl( jdbcParameters.size() );