HHH-19551 - Address deficiencies in pessimistic locking

Author: sebersole

hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/SqlAstBasedLockingStrategy.java

@@ -15,7 +15,6 @@
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.event.spi.EventSource;
 import org.hibernate.exception.LockTimeoutException;
 import org.hibernate.loader.ast.internal.LoaderSqlAstCreationState;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
@@ -27,6 +26,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SimpleFromClauseAccessImpl;
 import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
+import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
@@ -37,7 +37,7 @@
 import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcSelectExecutor;
-import org.hibernate.sql.results.graph.DomainResult;
+import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.graph.internal.ImmutableFetchList;
 import org.hibernate.sql.results.spi.NoRowException;
 import org.hibernate.sql.results.spi.SingleResultConsumer;
@@ -67,30 +67,33 @@ public void lock(
 			Object object,
 			int timeout,
 			SharedSessionContractImplementor session) throws StaleObjectStateException, LockingStrategyException {
-		if ( session instanceof EventSource eventSource ) {
-			doLock( id, version, object, timeout, eventSource );
-		}
-		else {
-			throw new UnsupportedOperationException( "Optimistic locking strategies not supported in stateless session" );
-		}
-	}
-
-	private void doLock(Object id, Object version, Object object, int timeout, EventSource eventSource) {
-		final SessionFactoryImplementor factory = eventSource.getFactory();
+		final SessionFactoryImplementor factory = session.getFactory();
 
 		final LockOptions lockOptions = new LockOptions( lockMode );
 		lockOptions.setScope( lockScope );
 		lockOptions.setTimeOut( timeout );
 
 		final QuerySpec rootQuerySpec = new QuerySpec( true );
 		final NavigablePath entityPath = new NavigablePath( entityToLock.getRootPathName() );
+		final EntityIdentifierMapping idMapping = entityToLock.getIdentifierMapping();
 
+		// NOTE: there are 2 possible ways to handle the select list for the query...
+		// 		1) use normal `idMapping.createDomainResult`.  for simple ids, this is fine; however,
+		//			for composite ids, this would require a proper implementation of `FetchProcessor`
+		//			(the parts of the composition are considered `Fetch`es). `FetchProcessor` is not
+		//			a trivial thing to implement though.  this would be the "best" approach though.
+		//			look at simplifying LoaderSelectBuilder.visitFetches for reusability
+		//		2) for now, we'll just manually build the selection list using "one of" the id columns
+		//			and manually build a simple `BasicResult`
 		final LoaderSqlAstCreationState sqlAstCreationState = new LoaderSqlAstCreationState(
 				rootQuerySpec,
 				new SqlAliasBaseManager(),
 				new SimpleFromClauseAccessImpl(),
 				lockOptions,
-				(fetchParent, creationState) -> ImmutableFetchList.EMPTY,
+				(fetchParent, creationState) -> {
+					// todo (db-locking) : look to simplify LoaderSelectBuilder.visitFetches for reusability
+					return ImmutableFetchList.EMPTY;
+				},
 				true,
 				new LoadQueryInfluencers( factory ),
 				factory.getSqlTranslationEngine()
@@ -108,13 +111,15 @@ private void doLock(Object id, Object version, Object object, int timeout, Event
 		rootQuerySpec.getFromClause().addRoot( rootTableGroup );
 		sqlAstCreationState.getFromClauseAccess().registerTableGroup( entityPath, rootTableGroup );
 
-		final EntityIdentifierMapping idMapping = entityToLock.getIdentifierMapping();
-		final DomainResult<?> idResult = idMapping.createDomainResult(
-				entityPath.append( idMapping.getPartName() ),
-				rootTableGroup,
+		final SqlExpressionResolver sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
+		final SelectableMapping firstIdColumn = idMapping.getSelectable( 0 );
+		sqlExpressionResolver.resolveSqlSelection(
+				sqlExpressionResolver.resolveSqlExpression( rootTableGroup.getPrimaryTableReference(), firstIdColumn ),
+				firstIdColumn.getJdbcMapping().getJdbcJavaType(),
 				null,
-				sqlAstCreationState
+				session.getTypeConfiguration()
 		);
+		final BasicResult<Object> idResult = new BasicResult<>( 0, null, idMapping.getJdbcMapping( 0 ) );
 
 		final int jdbcParamCount = entityToLock.getVersionMapping() != null
 				? idMapping.getJdbcTypeCount() + 1
@@ -130,7 +135,7 @@ private void doLock(Object id, Object version, Object object, int timeout, Event
 						rootTableGroup,
 						jdbcParameterBindings
 				),
-				eventSource
+				session
 		);
 
 		if ( entityToLock.getVersionMapping() != null ) {
@@ -144,19 +149,19 @@ private void doLock(Object id, Object version, Object object, int timeout, Event
 							rootTableGroup,
 							jdbcParameterBindings
 					),
-					eventSource
+					session
 			);
 		}
 
 		final SelectStatement selectStatement = new SelectStatement( rootQuerySpec, List.of( idResult ) );
-		final JdbcOperationQuerySelect selectOperation = eventSource
+		final JdbcOperationQuerySelect selectOperation = session
 				.getDialect()
 				.getSqlAstTranslatorFactory()
 				.buildSelectTranslator( factory, selectStatement )
 				.translate( jdbcParameterBindings, sqlAstCreationState );
 
 		final JdbcSelectExecutor jdbcSelectExecutor = factory.getJdbcServices().getJdbcSelectExecutor();
-		final LockingExecutionContext lockingExecutionContext = new LockingExecutionContext( eventSource );
+		final LockingExecutionContext lockingExecutionContext = new LockingExecutionContext( session );
 
 		try {
 			jdbcSelectExecutor.executeQuery(
@@ -178,7 +183,7 @@ private void doLock(Object id, Object version, Object object, int timeout, Event
 		}
 		catch (NoRowException e) {
 			if ( entityToLock.optimisticLockStyle() != OptimisticLockStyle.NONE ) {
-				final StatisticsImplementor statistics = eventSource.getFactory().getStatistics();
+				final StatisticsImplementor statistics = session.getFactory().getStatistics();
 				if ( statistics.isStatisticsEnabled() ) {
 					statistics.optimisticFailure( entityToLock.getEntityName() );
 				}