introduce SnapshotIsolationException to fix tests on Maria

Author: gavinking

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

@@ -27,6 +27,7 @@
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.exception.ConstraintViolationException.ConstraintKind;
 import org.hibernate.exception.LockAcquisitionException;
+import org.hibernate.exception.SnapshotIsolationException;
 import org.hibernate.exception.LockTimeoutException;
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
@@ -348,6 +349,7 @@ public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
 				case 1048 -> extractUsingTemplate( "Column '", "'", sqle.getMessage() );
 				default -> null;
 			} );
+
 	@Override
 	public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 		return (sqlException, message, sql) -> {
@@ -357,7 +359,8 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 				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.
+					// in the current read view is made, error DB_RECORD_CHANGED is raised
+					return new SnapshotIsolationException( message, sqlException, sql );
 				case 3572: // ER_LOCK_NOWAIT
 				case 1207: // ER_READ_ONLY_TRANSACTION
 				case 1206: // ER_LOCK_TABLE_FULL

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

@@ -0,0 +1,25 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.exception;
+
+import org.hibernate.Incubating;
+import org.hibernate.JDBCException;
+
+import java.sql.SQLException;
+
+/**
+ * A {@link org.hibernate.JDBCException} indicating that a request failed due to snapshot isolation.
+ * This is a condition which indicates an <em>optimistic</em> failure.
+ *
+ * @apiNote At present, this is only used to represent {@code DB_RECORD_CHANGED} on MariaDB.
+ *
+ * @see jakarta.persistence.OptimisticLockException
+ */
+@Incubating
+public class SnapshotIsolationException extends JDBCException {
+	public SnapshotIsolationException(String string, SQLException root, String sql) {
+		super( string, root, sql );
+	}
+}

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

@@ -22,6 +22,7 @@
 import org.hibernate.dialect.lock.PessimisticEntityLockException;
 import org.hibernate.engine.spi.ExceptionConverter;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.exception.SnapshotIsolationException;
 import org.hibernate.exception.TransactionSerializationException;
 import org.hibernate.loader.MultipleBagFetchException;
 import org.hibernate.query.IllegalQueryOperationException;
@@ -90,6 +91,9 @@ else if ( exception instanceof LockingStrategyException lockingStrategyException
 			rollbackIfNecessary( converted );
 			return converted;
 		}
+		else if ( exception instanceof SnapshotIsolationException ) {
+			return new OptimisticLockException( exception.getMessage(), exception );
+		}
 		else if ( exception instanceof org.hibernate.QueryTimeoutException ) {
 			final QueryTimeoutException converted = new QueryTimeoutException( exception.getMessage(), exception );
 			rollbackIfNecessary( converted );

hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java

@@ -14,7 +14,7 @@
 import org.hibernate.cfg.AvailableSettings;
 
 import org.hibernate.dialect.MariaDBDialect;
-import org.hibernate.exception.LockAcquisitionException;
+import org.hibernate.exception.SnapshotIsolationException;
 import org.hibernate.exception.TransactionSerializationException;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -141,7 +141,7 @@ public void testFailedUpdate(SessionFactoryScope scope) {
 		catch (OptimisticLockException ole) {
 			if (getDialect() instanceof MariaDBDialect && getDialect().getVersion().isAfter( 11, 6, 2 )) {
 				// if @@innodb_snapshot_isolation is set, database throw an exception if record is not available anymore
-				assertTrue( ole.getCause() instanceof LockAcquisitionException );
+				assertTrue( ole.getCause() instanceof SnapshotIsolationException );
 			} else {
 				assertTrue( ole.getCause() instanceof StaleObjectStateException );
 			}