HHH-19551 - Address deficiencies in pessimistic locking

Author: sebersole

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java

@@ -50,8 +50,6 @@
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.type.SqlTypes;
 
-import static org.hibernate.Timeouts.NO_WAIT_MILLI;
-import static org.hibernate.Timeouts.SKIP_LOCKED_MILLI;
 
 /**
  * A SQL AST translator for SQL Server.

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereSqlAstTranslator.java

@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import org.hibernate.Internal;
 import org.hibernate.LockMode;
 import org.hibernate.dialect.sql.ast.SybaseSqlAstTranslator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;

hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java

@@ -45,7 +45,6 @@
 import org.hibernate.dialect.lock.OptimisticLockingStrategy;
 import org.hibernate.dialect.lock.PessimisticForceIncrementLockingStrategy;
 import org.hibernate.dialect.lock.PessimisticLockStyle;
-import org.hibernate.dialect.lock.PessimisticReadSelectLockingStrategy;
 import org.hibernate.dialect.lock.SelectLockingStrategy;
 import org.hibernate.dialect.lock.internal.SqlAstBasedLockingStrategy;
 import org.hibernate.dialect.lock.spi.OuterJoinLockingLevel;
@@ -2273,22 +2272,11 @@ protected LockingStrategy buildPessimisticForceIncrementStrategy(EntityPersister
 	}
 
 	protected LockingStrategy buildPessimisticWriteStrategy(EntityPersister lockable, LockMode lockMode, Locking.Scope lockScope) {
-//		if ( lockScope == Locking.Scope.ROOT_ONLY && !lockable.hasMultipleTables() ) {
-//			return new PessimisticWriteSelectLockingStrategy( lockable, lockMode );
-//		}
-//		else {
-//			return new SqlAstBasedLockingStrategy( lockable, lockMode, lockScope );
-//		}
 		return new SqlAstBasedLockingStrategy( lockable, lockMode, lockScope );
 	}
 
 	protected LockingStrategy buildPessimisticReadStrategy(EntityPersister lockable, LockMode lockMode, Locking.Scope lockScope) {
-		if ( lockScope == Locking.Scope.ROOT_ONLY && !lockable.hasMultipleTables() ) {
-			return new PessimisticReadSelectLockingStrategy( lockable, lockMode );
-		}
-		else {
-			return new SqlAstBasedLockingStrategy( lockable, lockMode, lockScope );
-		}
+		return new SqlAstBasedLockingStrategy( lockable, lockMode, lockScope );
 	}
 
 	protected LockingStrategy buildOptimisticForceIncrementStrategy(EntityPersister lockable, LockMode lockMode) {

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

@@ -38,6 +38,7 @@
 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.internal.ImmutableFetchList;
 import org.hibernate.sql.results.spi.NoRowException;
 import org.hibernate.sql.results.spi.SingleResultConsumer;
 import org.hibernate.stat.spi.StatisticsImplementor;
@@ -89,9 +90,7 @@ private void doLock(Object id, Object version, Object object, int timeout, Event
 				new SqlAliasBaseManager(),
 				new SimpleFromClauseAccessImpl(),
 				lockOptions,
-				(fetchParent, creationState) -> {
-					return null;
-				},
+				(fetchParent, creationState) -> ImmutableFetchList.EMPTY,
 				true,
 				new LoadQueryInfluencers( factory ),
 				factory.getSqlTranslationEngine()