make LAE extend PLE and clean up SQLStateConversionDelegate

- PessimisticLockException dupes the role of LockAcquisitionException
- We should not have database-specific codes on SQLStateConversionDelegate
- throw LAE instead of PLE on MySQL and Maria

Author: gavinking

hibernate-core/src/main/java/org/hibernate/PessimisticLockException.java

@@ -9,9 +9,13 @@
 /**
  * Thrown when a pessimistic locking conflict occurs.
  *
+ * @apiNote When a conflict is detected while acquiring a database-level lock,
+ * {@link org.hibernate.exception.LockAcquisitionException} is preferred.
+ *
  * @author Scott Marlow
  *
  * @see jakarta.persistence.PessimisticLockException
+ * @see org.hibernate.exception.LockAcquisitionException
  */
 public class PessimisticLockException extends JDBCException {
 	/**
@@ -24,4 +28,14 @@ public class PessimisticLockException extends JDBCException {
 	public PessimisticLockException(String message, SQLException sqlException, String sql) {
 		super( message, sqlException, sql );
 	}
+	/**
+	 * Constructs a {@code PessimisticLockException} using the specified information.
+	 *
+	 * @param message A message explaining the exception condition
+	 * @param sqlException The underlying SQL exception
+	 */
+	public PessimisticLockException(String message, SQLException sqlException) {
+		super( message, sqlException );
+
+	}
 }

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

@@ -9,7 +9,6 @@
 import java.sql.Types;
 import java.util.Set;
 
-import org.hibernate.PessimisticLockException;
 import org.hibernate.QueryTimeoutException;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
@@ -355,12 +354,11 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 			switch ( sqlException.getErrorCode() ) {
 				case 1205: // ER_LOCK_WAIT_TIMEOUT
 					return new LockTimeoutException( message, sqlException, sql );
-				case 3572: // ER_LOCK_NOWAIT
-					return new PessimisticLockException( message, sqlException, sql );
 				case 1020:
 					// If @@innodb_snapshot_isolation is set (default since 11.6.2),
 					// and an attempt to acquire a lock on a record that does not exist
 					// in the current read view is made, error DB_RECORD_CHANGED is raised.
+				case 3572: // ER_LOCK_NOWAIT
 				case 1207: // ER_READ_ONLY_TRANSACTION
 				case 1206: // ER_LOCK_TABLE_FULL
 					return new LockAcquisitionException( message, sqlException, sql );

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

@@ -17,7 +17,6 @@
 
 import org.hibernate.Length;
 import org.hibernate.LockOptions;
-import org.hibernate.PessimisticLockException;
 import org.hibernate.QueryTimeoutException;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
@@ -1247,11 +1246,11 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 				case 1205: // ER_LOCK_WAIT_TIMEOUT
 					return new LockTimeoutException( message, sqlException, sql );
 				case 3572: // ER_LOCK_NOWAIT
-					return new PessimisticLockException( message, sqlException, sql );
 				case 1207: // ER_READ_ONLY_TRANSACTION
 				case 1206: // ER_LOCK_TABLE_FULL
 					return new LockAcquisitionException( message, sqlException, sql );
 				case 3024: // ER_QUERY_TIMEOUT
+				case 1317: // ER_QUERY_INTERRUPTED
 					return new QueryTimeoutException( message, sqlException, sql );
 				case 1062:
 					// Unique constraint violation

hibernate-core/src/main/java/org/hibernate/exception/LockAcquisitionException.java

@@ -6,6 +6,7 @@
 
 import java.sql.SQLException;
 
+import org.hibernate.PessimisticLockException;
 import org.hibernate.JDBCException;
 
 /**
@@ -14,7 +15,7 @@
  *
  * @author Steve Ebersole
  */
-public class LockAcquisitionException extends JDBCException {
+public class LockAcquisitionException extends PessimisticLockException {
 	public LockAcquisitionException(String string, SQLException root) {
 		super( string, root );
 	}

hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java

@@ -7,8 +7,6 @@
 import java.sql.SQLException;
 
 import org.hibernate.JDBCException;
-import org.hibernate.PessimisticLockException;
-import org.hibernate.QueryTimeoutException;
 import org.hibernate.exception.AuthException;
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.exception.ConstraintViolationException.ConstraintKind;
@@ -22,7 +20,6 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import static org.hibernate.internal.util.JdbcExceptionHelper.determineSqlStateClassCode;
-import static org.hibernate.internal.util.JdbcExceptionHelper.extractErrorCode;
 import static org.hibernate.internal.util.JdbcExceptionHelper.extractSqlState;
 
 /**
@@ -53,17 +50,6 @@ public SQLStateConversionDelegate(ConversionContext conversionContext) {
 					return new AuthException( message, sqlException, sql );
 				case "40001":
 					return new LockAcquisitionException( message, sqlException, sql );
-				case "40XL1", "40XL2":
-					// Derby "A lock could not be obtained within the time requested."
-					return new PessimisticLockException( message, sqlException, sql );
-				case "70100":
-					// MySQL Query execution was interrupted
-					return new QueryTimeoutException(  message, sqlException, sql );
-				case "72000":
-					if ( extractErrorCode( sqlException ) == 1013 ) {
-						// Oracle user requested cancel of current operation
-						return new QueryTimeoutException(  message, sqlException, sql );
-					}
 			}
 			switch ( determineSqlStateClassCode( sqlState ) ) {
 				case

hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java

@@ -22,7 +22,6 @@
 import org.hibernate.dialect.lock.PessimisticEntityLockException;
 import org.hibernate.engine.spi.ExceptionConverter;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.exception.LockAcquisitionException;
 import org.hibernate.exception.TransactionSerializationException;
 import org.hibernate.loader.MultipleBagFetchException;
 import org.hibernate.query.IllegalQueryOperationException;
@@ -81,8 +80,8 @@ public RuntimeException convert(HibernateException exception, LockOptions lockOp
 			rollbackIfNecessary( converted );
 			return converted;
 		}
-		else if ( exception instanceof LockAcquisitionException lockAcquisitionException ) {
-			final PersistenceException converted = wrapLockException( lockAcquisitionException, lockOptions );
+		else if ( exception instanceof org.hibernate.PessimisticLockException pessimisticLockException ) {
+			final PersistenceException converted = wrapLockException( pessimisticLockException, lockOptions );
 			rollbackIfNecessary( converted );
 			return converted;
 		}
@@ -91,11 +90,6 @@ else if ( exception instanceof LockingStrategyException lockingStrategyException
 			rollbackIfNecessary( converted );
 			return converted;
 		}
-		else if ( exception instanceof org.hibernate.PessimisticLockException pessimisticLockException ) {
-			final PersistenceException converted = wrapLockException( pessimisticLockException, lockOptions );
-			rollbackIfNecessary( converted );
-			return converted;
-		}
 		else if ( exception instanceof org.hibernate.QueryTimeoutException ) {
 			final QueryTimeoutException converted = new QueryTimeoutException( exception.getMessage(), exception );
 			rollbackIfNecessary( converted );
@@ -203,15 +197,6 @@ protected PersistenceException wrapStaleStateException(StaleStateException excep
 		return new OptimisticLockException( exception.getMessage(), exception );
 	}
 
-	protected PersistenceException wrapLockException(LockAcquisitionException exception, LockOptions lockOptions) {
-		if ( exception instanceof org.hibernate.exception.LockTimeoutException ) {
-			return new LockTimeoutException( exception.getMessage(), exception );
-		}
-		else {
-			throw new PessimisticLockException( exception.getMessage(), exception );
-		}
-	}
-
 	protected PersistenceException wrapLockException(LockingStrategyException exception, LockOptions lockOptions) {
 		if ( exception instanceof OptimisticEntityLockException lockException ) {
 			return new OptimisticLockException( lockException.getMessage(), lockException, lockException.getEntity() );
@@ -228,10 +213,15 @@ else if ( exception instanceof PessimisticEntityLockException lockException ) {
 	}
 
 	protected PersistenceException wrapLockException(org.hibernate.PessimisticLockException exception, LockOptions lockOptions) {
-		// assume lock timeout occurred if a timeout or NO WAIT was specified
-		return lockOptions != null && lockOptions.getTimeOut() > -1
-				? new LockTimeoutException( exception.getMessage(), exception )
-				: new PessimisticLockException( exception.getMessage(), exception );
+		if ( exception instanceof org.hibernate.exception.LockTimeoutException ) {
+			return new LockTimeoutException( exception.getMessage(), exception );
+		}
+		else {
+			// assume lock timeout occurred if a timeout or NO WAIT was specified
+			return lockOptions != null && lockOptions.getTimeOut() > -1
+					? new LockTimeoutException( exception.getMessage(), exception )
+					: new PessimisticLockException( exception.getMessage(), exception );
+		}
 	}
 
 	private void rollbackIfNecessary(PersistenceException persistenceException) {