HHH-19365 GaussDB Dialect Support-fix some test cases fail

Author: liubao68

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

@@ -6,12 +6,13 @@
 
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.TemporalType;
+import jakarta.persistence.Timeout;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Length;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
-import org.hibernate.PessimisticLockException;
 import org.hibernate.QueryTimeoutException;
+import org.hibernate.Timeouts;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.community.dialect.identity.GaussDBIdentityColumnSupport;
@@ -39,6 +40,7 @@
 import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.exception.LockAcquisitionException;
+import org.hibernate.exception.LockTimeoutException;
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
@@ -810,7 +812,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 						return new LockAcquisitionException( message, sqlException, sql );
 					case "55P03":
 						// LOCK NOT AVAILABLE
-						return new PessimisticLockException( message, sqlException, sql );
+						return new LockTimeoutException( message, sqlException, sql );
 					case "57014":
 						return new QueryTimeoutException( message, sqlException, sql );
 				}
@@ -1039,10 +1041,38 @@ public void appendDateTimeLiteral(
 		}
 	}
 
+	private String withTimeout(String lockString, Timeout timeout) {
+		return switch (timeout.milliseconds()) {
+			case Timeouts.NO_WAIT_MILLI -> supportsNoWait() ? lockString + " nowait" : lockString;
+			case Timeouts.SKIP_LOCKED_MILLI -> supportsSkipLocked() ? lockString + " skip locked" : lockString;
+			default -> lockString;
+		};
+	}
+
+	@Override
+	public String getWriteLockString(Timeout timeout) {
+		return withTimeout( getForUpdateString(), timeout );
+	}
+
+	@Override
+	public String getWriteLockString(String aliases, Timeout timeout) {
+		return withTimeout( getForUpdateString( aliases ), timeout );
+	}
+
+	@Override
+	public String getReadLockString(Timeout timeout) {
+		return withTimeout(" for share", timeout );
+	}
+
+	@Override
+	public String getReadLockString(String aliases, Timeout timeout) {
+		return withTimeout(" for share of " + aliases, timeout );
+	}
+
 	private String withTimeout(String lockString, int timeout) {
 		return switch (timeout) {
-			case LockOptions.NO_WAIT -> supportsNoWait() ? lockString + " nowait" : lockString;
-			case LockOptions.SKIP_LOCKED -> supportsSkipLocked() ? lockString + " skip locked" : lockString;
+			case Timeouts.NO_WAIT_MILLI -> supportsNoWait() ? lockString + " nowait" : lockString;
+			case Timeouts.SKIP_LOCKED_MILLI -> supportsSkipLocked() ? lockString + " skip locked" : lockString;
 			default -> lockString;
 		};
 	}

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

@@ -45,24 +45,6 @@ public GaussDBFunctionRegistry(FunctionContributions functionContributions) {
 	}
 
 	public void register() {
-		functionContributions.getFunctionRegistry().register( "min", new GaussDBMinMaxFunction( "min" ) );
-		functionContributions.getFunctionRegistry().register( "max", new GaussDBMinMaxFunction( "max" ) );
-
-		// uses # instead of ^ for XOR
-		functionContributions.getFunctionRegistry().patternDescriptorBuilder( "bitxor", "(?1 # ?2)" )
-				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
-				.register();
-
-		functionContributions.getFunctionRegistry().register(
-				"round", new GaussDBTruncRoundFunction( "round", true )
-		);
-		functionContributions.getFunctionRegistry().register(
-				"trunc",
-				new GaussDBTruncFunction( true, functionContributions.getTypeConfiguration() )
-		);
-		functionContributions.getFunctionRegistry().registerAlternateKey( "truncate", "trunc" );
-
 		CommonFunctionFactory functionFactory = new CommonFunctionFactory( functionContributions);
 		functionFactory.cot();
 		functionFactory.radians();
@@ -115,6 +97,24 @@ public void register() {
 		functionFactory.sha( "sha256(?1)" );
 		functionFactory.md5( "decode(md5(?1), 'hex')" );
 
+		functionContributions.getFunctionRegistry().register( "min", new GaussDBMinMaxFunction( "min" ) );
+		functionContributions.getFunctionRegistry().register( "max", new GaussDBMinMaxFunction( "max" ) );
+
+		// uses # instead of ^ for XOR
+		functionContributions.getFunctionRegistry().patternDescriptorBuilder( "bitxor", "(?1 # ?2)" )
+				.setExactArgumentCount( 2 )
+				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.register();
+
+		functionContributions.getFunctionRegistry().register(
+				"round", new GaussDBTruncRoundFunction( "round", true )
+		);
+		functionContributions.getFunctionRegistry().register(
+				"trunc",
+				new GaussDBTruncFunction( true, functionContributions.getTypeConfiguration() )
+		);
+		functionContributions.getFunctionRegistry().registerAlternateKey( "truncate", "trunc" );
+
 		format_toChar_gaussdb();
 		array_gaussdb();
 		arrayRemoveIndex_gaussdb();