HHH-19551 - Address deficiencies in pessimistic locking

Author: sebersole

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

@@ -227,7 +227,44 @@
 import static org.hibernate.internal.util.StringHelper.splitAtCommas;
 import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_STRING_ARRAY;
 import static org.hibernate.sql.ast.internal.NonLockingClauseStrategy.NON_CLAUSE_STRATEGY;
-import static org.hibernate.type.SqlTypes.*;
+import static org.hibernate.type.SqlTypes.ARRAY;
+import static org.hibernate.type.SqlTypes.BIGINT;
+import static org.hibernate.type.SqlTypes.BINARY;
+import static org.hibernate.type.SqlTypes.BLOB;
+import static org.hibernate.type.SqlTypes.BOOLEAN;
+import static org.hibernate.type.SqlTypes.CHAR;
+import static org.hibernate.type.SqlTypes.CLOB;
+import static org.hibernate.type.SqlTypes.DATE;
+import static org.hibernate.type.SqlTypes.DECIMAL;
+import static org.hibernate.type.SqlTypes.DOUBLE;
+import static org.hibernate.type.SqlTypes.FLOAT;
+import static org.hibernate.type.SqlTypes.INTEGER;
+import static org.hibernate.type.SqlTypes.LONG32NVARCHAR;
+import static org.hibernate.type.SqlTypes.LONG32VARBINARY;
+import static org.hibernate.type.SqlTypes.LONG32VARCHAR;
+import static org.hibernate.type.SqlTypes.NCHAR;
+import static org.hibernate.type.SqlTypes.NCLOB;
+import static org.hibernate.type.SqlTypes.NUMERIC;
+import static org.hibernate.type.SqlTypes.NVARCHAR;
+import static org.hibernate.type.SqlTypes.REAL;
+import static org.hibernate.type.SqlTypes.ROWID;
+import static org.hibernate.type.SqlTypes.SMALLINT;
+import static org.hibernate.type.SqlTypes.TIME;
+import static org.hibernate.type.SqlTypes.TIMESTAMP;
+import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC;
+import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
+import static org.hibernate.type.SqlTypes.TIME_UTC;
+import static org.hibernate.type.SqlTypes.TIME_WITH_TIMEZONE;
+import static org.hibernate.type.SqlTypes.TINYINT;
+import static org.hibernate.type.SqlTypes.VARBINARY;
+import static org.hibernate.type.SqlTypes.VARCHAR;
+import static org.hibernate.type.SqlTypes.isCharacterType;
+import static org.hibernate.type.SqlTypes.isEnumType;
+import static org.hibernate.type.SqlTypes.isFloatOrRealOrDouble;
+import static org.hibernate.type.SqlTypes.isIntegral;
+import static org.hibernate.type.SqlTypes.isNumericOrDecimal;
+import static org.hibernate.type.SqlTypes.isVarbinaryType;
+import static org.hibernate.type.SqlTypes.isVarcharType;
 import static org.hibernate.type.descriptor.DateTimeUtils.JDBC_ESCAPE_END;
 import static org.hibernate.type.descriptor.DateTimeUtils.JDBC_ESCAPE_START_DATE;
 import static org.hibernate.type.descriptor.DateTimeUtils.JDBC_ESCAPE_START_TIME;
@@ -2682,19 +2719,21 @@ public void setLockTimeout(Timeout timeout, Connection connection, SessionFactor
 		throw new UnsupportedOperationException( "Lock timeout on the JDBC connection is not supported for " + getClass().getSimpleName() );
 	}
 
+	private static final Timeout TESTER_TIMEOUT = Timeout.milliseconds( 2000 );
+
 	/**
 	 * Whether this dialect supports specifying timeouts when requesting locks.
 	 *
+	 * @return True if this dialect supports specifying lock timeouts.
+	 *
 	 * @apiNote Specifically, we are interested here in whether the Dialect supports
 	 * requesting a lock timeout as part of the {@linkplain LockTimeoutStyle#QUERY SQL query}.
 	 *
-	 * @return True if this dialect supports specifying lock timeouts.
-	 *
 	 * @deprecated Use {@linkplain #getLockTimeoutStyle(Timeout)} instead.
 	 */
 	@Deprecated
 	public boolean supportsLockTimeouts() {
-		return getLockTimeoutStyle( Timeouts.WAIT_FOREVER ) == LockTimeoutStyle.QUERY;
+		return getLockTimeoutStyle( TESTER_TIMEOUT ) == LockTimeoutStyle.QUERY;
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/dialect/lock/spi/ConnectionLockTimeoutType.java

@@ -4,11 +4,14 @@
  */
 package org.hibernate.dialect.lock.spi;
 
+import org.hibernate.Incubating;
+
 /**
  * Indicates a Dialect's support for lock timeouts on the JDBC connection.
  *
  * @author Steve Ebersole
  */
+@Incubating
 public enum ConnectionLockTimeoutType {
 	/**
 	 * Setting lock timeouts on the JDBC connection is not supported.

hibernate-core/src/main/java/org/hibernate/dialect/lock/spi/LockTimeoutStyle.java

@@ -4,13 +4,16 @@
  */
 package org.hibernate.dialect.lock.spi;
 
+import org.hibernate.Incubating;
+
 /**
  * Indicates a Dialect's level of support for applying lock timeouts.
  *
  * @see org.hibernate.dialect.Dialect#getLockTimeoutStyle(jakarta.persistence.Timeout)
  *
  * @author Steve Ebersole
  */
+@Incubating
 public enum LockTimeoutStyle {
 	/**
 	 * Indicates that the requested lock timeout is not supported.

hibernate-core/src/main/java/org/hibernate/dialect/lock/spi/OuterJoinLockingType.java

@@ -4,12 +4,15 @@
  */
 package org.hibernate.dialect.lock.spi;
 
+import org.hibernate.Incubating;
+
 /**
  * Indicates a Dialect's level of support for applying locks
  * to select statements with joins.
  *
  * @author Steve Ebersole
  */
+@Incubating
 public enum OuterJoinLockingType {
 	/**
 	 * Locks applied to joins are not supported, generally resulting in an