HHH-19551 - Address deficiencies in pessimistic locking

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java

@@ -97,7 +97,7 @@ public void testQueryLocking(SessionFactoryScope scope, boolean followOnLocking)
 							statementInspector.assertExecutedCount( 1 );
 						}
 
-						TransactionUtil.deleteFromTable( scope, "employees", true);
+						TransactionUtil.updateTable( scope, "employees", "salary", true );
 					}
 			);
 		} );

hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ScopeTests.java

@@ -137,8 +137,9 @@ void testFindWithExtendedAndFetch(SessionFactoryScope factoryScope) {
 			if ( session.getDialect().supportsOuterJoinForUpdate() ) {
 				assertThat( sqlCollector.getSqlQueries() ).hasSize( 1 );
 				Helper.checkSql( sqlCollector.getSqlQueries().get( 0 ), session.getDialect(), BOOKS, BOOK_GENRES );
-				TransactionUtil.deleteFromTable( factoryScope, BOOKS.getTableName(), true );
-				TransactionUtil.deleteFromTable( factoryScope, BOOK_GENRES.getTableName(), true );
+
+				TransactionUtil.updateTable( factoryScope, BOOKS.getTableName(), "title", true );
+				TransactionUtil.updateTable( factoryScope, BOOK_GENRES.getTableName(), "genre", true );
 			}
 			else {
 				// should be 3, but follow-on locking is not locking collection tables...

hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java

@@ -166,36 +166,19 @@ public static void updateTable(SessionFactoryScope factoryScope, String tableNam
 			}
 		}
 		catch (RuntimeException re) {
-			if ( re.getCause() instanceof ConstraintViolationException cve ) {
-				throw cve;
+			if ( re.getCause() instanceof jakarta.persistence.LockTimeoutException
+					|| re.getCause() instanceof org.hibernate.exception.LockTimeoutException ) {
+				if ( !expectingToBlock ) {
+					fail( "Expecting update to " + tableName + " to succeed, but failed due to async timeout (presumably due to locks)", re.getCause() );
+				}
 			}
-			throw re;
-		}
-	}
-
-	public static void deleteFromTable(SessionFactoryScope factoryScope, String tableName, boolean expectingToBlock) {
-		try {
-			AsyncExecutor.executeAsync( 2, TimeUnit.SECONDS, () -> {
-				factoryScope.inTransaction( (session) -> {
-					//noinspection deprecation
-					session.createNativeQuery( "delete from " + tableName ).executeUpdate();
-					if ( expectingToBlock ) {
-						fail( "Expecting delete from " + tableName + " to block dues to locks" );
-					}
-				} );
-			} );
-		}
-		catch (AsyncExecutor.TimeoutException expected) {
-			if ( !expectingToBlock ) {
-				fail( "Expecting delete from " + tableName + " to succeed, but failed due to async timeout (presumably due to locks)", expected );
+			else if ( re.getCause() instanceof ConstraintViolationException cve ) {
+				throw cve;
 			}
-		}
-		catch (RuntimeException re) {
-			if ( re.getCause() instanceof ConstraintViolationException cve ) {
-				log.debug( "deleting from table did not block, but did lead to ConstraintViolationException", cve );
-				return;
+			else {
+				throw re;
 			}
-			throw re;
 		}
 	}
+
 }