Merge branch '6.6' into timesten_dialect_updates

Author: carlblan

changelog.txt

@@ -3,6 +3,33 @@ Hibernate 6 Changelog
 
 Note: Please refer to JIRA to learn more about each issue.
 
+Changes in 6.6.19.Final (June 29, 2025)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/33968
+
+** Bug
+    * [HHH-18837] - Oracle epoch extraction doesn't work with dates
+    * [HHH-19547] - Misleading exception message at DefaultFlushEntityEventListener - mangled ID - misplaced Entity and EntityEntry ID
+    * [HHH-19560] - TupleTransformer and ResultListTransformer trash the query interpretation cache
+    * [HHH-19571] - CloningPropertyCall causes non-deterministic bytecode for AccessOptimizer
+    * [HHH-19573] - Presence of wrapper byte array pollutes BasicTypeRegistry
+    * [HHH-19577] - BytecodeProviderImpl.SetPropertyValues wrongly emits duplicate stack map frames
+
+
+Changes in 6.6.18.Final (June 13, 2025)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/33703
+
+** Bug
+    * [HHH-19533] - Implement equals() and hashCode() for NativeQueryConstructorTransformer
+    * [HHH-19529] - Check bytecode generated classes with stable names class loaders
+    * [HHH-18891] - java.lang.AssertionError generated in getResolvedInstance even though NotFound IGNORE set
+    * [HHH-18876] - ArrayInitializer#resolveInstanceSubInitializers should consider @ListIndexBase
+    * [HHH-18771] - ListInitializer should consistently consider @ListIndexBase
+
+
 Changes in 6.6.17.Final (May 28, 2025)
 ------------------------------------------------------------------------------------------------------------------------
 

ci/jpa-3.1-tck.Jenkinsfile

@@ -1,4 +1,4 @@
-@Library('hibernate-jenkins-pipeline-helpers@1.13') _
+@Library('hibernate-jenkins-pipeline-helpers') _
 
 // Avoid running the pipeline on branch indexing
 if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
@@ -80,6 +80,7 @@ pipeline {
                             docker volume create tck-vol
                             docker run -v ~/.m2/repository/org/hibernate:/root/.m2/repository/org/hibernate:z -v tck-vol:/tck/persistence-tck/tmp/:z -e NO_SLEEP=${params.NO_SLEEP} -e HIBERNATE_VERSION=$HIBERNATE_VERSION --name tck jakarta-tck-runner
                             docker cp tck:/tck/persistence-tck/tmp/ ./results
+                            rm -Rf ./results/jdk-bundles
                         """
                         archiveArtifacts artifacts: 'results/**'
                         script {

ci/release/Jenkinsfile

@@ -209,15 +209,7 @@ pipeline {
 							configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: "${env.HOME}/.ssh/known_hosts")
 					]) {
 						withCredentials([
-							// https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
-							// TODO: HHH-19309:
-							//  Once we switch to maven-central publishing (from nexus2) we need to add a new credentials
-							//  to use the following env variable names to set the user/password:
-							//  - JRELEASER_MAVENCENTRAL_USERNAME
-							//  - JRELEASER_MAVENCENTRAL_TOKEN
-							//  Also use the new `credentialsId` for Maven Central, e.g.:
-							//  usernamePassword(credentialsId: '???????', passwordVariable: 'JRELEASER_MAVENCENTRAL_TOKEN', usernameVariable: 'JRELEASER_MAVENCENTRAL_USERNAME'),
-							usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'JRELEASER_NEXUS2_PASSWORD', usernameVariable: 'JRELEASER_NEXUS2_USERNAME'),
+							usernamePassword(credentialsId: 'central.sonatype.com', passwordVariable: 'JRELEASER_MAVENCENTRAL_TOKEN', usernameVariable: 'JRELEASER_MAVENCENTRAL_USERNAME'),
 							// https://docs.gradle.org/current/userguide/publishing_gradle_plugins.html#account_setup
 							usernamePassword(credentialsId: 'gradle-plugin-portal-api-key', passwordVariable: 'GRADLE_PUBLISH_SECRET', usernameVariable: 'GRADLE_PUBLISH_KEY'),
 							gitUsernamePassword(credentialsId: 'username-and-token.Hibernate-CI.github.com', gitToolName: 'Default'),

ci/snapshot-publish.Jenkinsfile

@@ -41,10 +41,8 @@ pipeline {
                 script {
                     withCredentials([
                             // https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
-                            // TODO: HHH-19309:
-                            //  Once we switch to maven-central publishing (from nexus2) we need to update credentialsId:
                             // https://docs.gradle.org/current/samples/sample_publishing_credentials.html#:~:text=via%20environment%20variables
-                            usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'ORG_GRADLE_PROJECT_snapshotsPassword', usernameVariable: 'ORG_GRADLE_PROJECT_snapshotsUsername'),
+                            usernamePassword(credentialsId: 'central.sonatype.com', passwordVariable: 'ORG_GRADLE_PROJECT_snapshotsPassword', usernameVariable: 'ORG_GRADLE_PROJECT_snapshotsUsername'),
                             string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN'),
                             // https://docs.gradle.org/current/userguide/publishing_gradle_plugins.html#account_setup
                             usernamePassword(credentialsId: 'gradle-plugin-portal-api-key', passwordVariable: 'GRADLE_PUBLISH_SECRET', usernameVariable: 'GRADLE_PUBLISH_KEY'),

gradle/publishing-pom.gradle

@@ -66,7 +66,7 @@ publishing {
 		}
 		maven {
 			name = 'snapshots'
-			url = "https://oss.sonatype.org/content/repositories/snapshots/"
+			url = "https://central.sonatype.com/repository/maven-snapshots/"
 			// So that Gradle uses the `ORG_GRADLE_PROJECT_snapshotsPassword` / `ORG_GRADLE_PROJECT_snapshotsUsername`
 			//  env variables to read the username/password for the `snapshots` repository publishing:
 			credentials(PasswordCredentials)

gradle/version.properties

@@ -1 +1 @@
-hibernateVersion=6.6.18-SNAPSHOT
+hibernateVersion=6.6.20-SNAPSHOT

hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java

@@ -229,7 +229,10 @@ void clearState() {
 	 */
 	public Class<?> load(Class<?> referenceClass, String className, BiFunction<ByteBuddy, NamingStrategy, DynamicType.Builder<?>> makeClassFunction) {
 		try {
-			return referenceClass.getClassLoader().loadClass( className );
+			Class<?> result = referenceClass.getClassLoader().loadClass(className);
+			if ( result.getClassLoader() == referenceClass.getClassLoader() ) {
+				return result;
+			}
 		}
 		catch (ClassNotFoundException e) {
 			// Ignore

hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java

@@ -18,7 +18,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
 
 import org.hibernate.HibernateException;
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerClassLocator;
@@ -184,7 +183,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 				.method( setPropertyValuesMethodName )
 				.intercept( new Implementation.Simple( new SetPropertyValues( clazz, getterNames, setters ) ) )
 				.method( getPropertyNamesMethodName )
-				.intercept( MethodCall.call( new CloningPropertyCall( getterNames ) ) )
+				.intercept( new Implementation.Simple( new GetPropertyNames( getterNames ) ) )
 		);
 
 		try {
@@ -253,7 +252,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 					.method( setPropertyValuesMethodName )
 					.intercept( new Implementation.Simple( new SetPropertyValues( clazz, propertyNames, setters ) ) )
 					.method( getPropertyNamesMethodName )
-					.intercept( MethodCall.call( new CloningPropertyCall( propertyNames ) ) )
+					.intercept( new Implementation.Simple( new GetPropertyNames( propertyNames ) ) )
 			);
 		}
 		else {
@@ -266,7 +265,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 					.method( setPropertyValuesMethodName )
 					.intercept( new Implementation.Simple( new SetPropertyValues( clazz, propertyNames, setters ) ) )
 					.method( getPropertyNamesMethodName )
-					.intercept( MethodCall.call( new CloningPropertyCall( propertyNames ) ) )
+					.intercept( new Implementation.Simple( new GetPropertyNames( propertyNames ) ) )
 			);
 		}
 
@@ -887,17 +886,17 @@ public Size apply(
 			Label nextLabel = new Label();
 			for ( int index = 0; index < setters.length; index++ ) {
 				final Member setterMember = setters[index];
-				if ( enhanced && currentLabel != null ) {
+				if ( setterMember == EMBEDDED_MEMBER ) {
+					// The embedded property access does a no-op
+					continue;
+				}
+				if ( currentLabel != null ) {
 					methodVisitor.visitLabel( currentLabel );
 					implementationContext.getFrameGeneration().same(
 							methodVisitor,
 							instrumentedMethod.getParameters().asTypeList()
 					);
 				}
-				if ( setterMember == EMBEDDED_MEMBER ) {
-					// The embedded property access does a no-op
-					continue;
-				}
 				// Push entity on stack
 				methodVisitor.visitVarInsn( Opcodes.ALOAD, 1 );
 				methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, Type.getInternalName( clazz ) );
@@ -1029,6 +1028,7 @@ else if ( setterMember instanceof Field ) {
 				}
 				if ( enhanced ) {
 					final boolean compositeTracker = CompositeTracker.class.isAssignableFrom( type );
+					boolean alreadyHasFrame = false;
 					// The composite owner check and setting only makes sense if
 					//  * the value type is a composite tracker
 					//  * a value subtype can be a composite tracker
@@ -1110,6 +1110,7 @@ else if ( setterMember instanceof Field ) {
 						// Clean stack after the if block
 						methodVisitor.visitLabel( compositeTrackerEndLabel );
 						implementationContext.getFrameGeneration().same(methodVisitor, instrumentedMethod.getParameters().asTypeList());
+						alreadyHasFrame = true;
 					}
 					if ( persistentAttributeInterceptable ) {
 						// Load the owner
@@ -1174,9 +1175,20 @@ else if ( setterMember instanceof Field ) {
 						// Clean stack after the if block
 						methodVisitor.visitLabel( instanceofEndLabel );
 						implementationContext.getFrameGeneration().same(methodVisitor, instrumentedMethod.getParameters().asTypeList());
+						alreadyHasFrame = true;
 					}
 
-					currentLabel = nextLabel;
+					if ( alreadyHasFrame ) {
+						// Usually, the currentLabel is visited as well generating a frame,
+						// but if a frame was already generated, only visit the label here,
+						// otherwise two frames for the same bytecode index are generated,
+						// which is wrong and will produce an error when the JDK ClassFile API is used
+						methodVisitor.visitLabel( nextLabel );
+						currentLabel = null;
+					}
+					else {
+						currentLabel = nextLabel;
+					}
 					nextLabel = new Label();
 				}
 			}
@@ -1346,17 +1358,29 @@ private static Constructor<?> findConstructor(Class<?> clazz) {
 		}
 	}
 
-	public static class CloningPropertyCall implements Callable<String[]> {
+	public static class GetPropertyNames implements ByteCodeAppender {
 
 		private final String[] propertyNames;
 
-		private CloningPropertyCall(String[] propertyNames) {
+		private GetPropertyNames(String[] propertyNames) {
 			this.propertyNames = propertyNames;
 		}
 
 		@Override
-		public String[] call() {
-			return propertyNames.clone();
+		public Size apply(
+				MethodVisitor methodVisitor,
+				Implementation.Context implementationContext,
+				MethodDescription instrumentedMethod) {
+			methodVisitor.visitLdcInsn( propertyNames.length );
+			methodVisitor.visitTypeInsn( Opcodes.ANEWARRAY, Type.getInternalName( String.class ) );
+			for ( int i = 0; i < propertyNames.length; i++ ) {
+				methodVisitor.visitInsn( Opcodes.DUP );
+				methodVisitor.visitLdcInsn( i );
+				methodVisitor.visitLdcInsn( propertyNames[i] );
+				methodVisitor.visitInsn( Opcodes.AASTORE );
+			}
+			methodVisitor.visitInsn( Opcodes.ARETURN );
+			return new Size( 4, instrumentedMethod.getStackSize() + 1 );
 		}
 	}
 

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

@@ -5774,4 +5774,26 @@ public FunctionalDependencyAnalysisSupport getFunctionalDependencyAnalysisSuppor
 		return FunctionalDependencyAnalysisSupportImpl.NONE;
 	}
 
+	/**
+	 * Does this dialect support binding {@link Types#NULL} for {@link PreparedStatement#setNull(int, int)}?
+	 * if it does, then call of {@link PreparedStatement#getParameterMetaData()} could be eliminated for better performance.
+	 *
+	 * @return {@code true} indicates it does; {@code false} indicates it does not;
+	 * @see org.hibernate.type.descriptor.jdbc.ObjectNullResolvingJdbcType
+	 */
+	public boolean supportsBindingNullSqlTypeForSetNull() {
+		return false;
+	}
+
+	/**
+	 * Does this dialect support binding {@code null} for {@link PreparedStatement#setObject(int, Object)}?
+	 * if it does, then call of {@link PreparedStatement#getParameterMetaData()} could be eliminated for better performance.
+	 *
+	 * @return {@code true} indicates it does; {@code false} indicates it does not;
+	 * @see org.hibernate.type.descriptor.jdbc.ObjectNullResolvingJdbcType
+	 */
+	public boolean supportsBindingNullForSetObject() {
+		return false;
+	}
+
 }

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

@@ -1028,4 +1028,9 @@ public String getDual() {
 		return "dual";
 	}
 
+	@Override
+	public boolean supportsBindingNullSqlTypeForSetNull() {
+		return true;
+	}
+
 }