introduce new infoString methods for batch loaders

gavinking · gavinking · commit 69bc8a13d9c2 · 2025-07-14T13:30:56.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java
@@ -82,7 +82,7 @@ public int getKeyJdbcCount() {
 	public PersistentCollection<?> load(Object key, SharedSessionContractImplementor session) {
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
 			MULTI_KEY_LOAD_LOGGER.trace( "Batch fetching collection: "
-					+ collectionInfoString( getLoadable().getNavigableRole().getFullPath(), key ) );
+					+ collectionInfoString( getLoadable(), key ) );
 		}
 
 		final Object[] keys = resolveKeysToInitialize( key, session );
@@ -108,7 +108,7 @@ protected void finishInitializingKey(Object key, SharedSessionContractImplemento
 
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
 			MULTI_KEY_LOAD_LOGGER.trace( "Finishing initializing batch-fetched collection: "
-					+ collectionInfoString( attributeMapping.getNavigableRole().getFullPath(), key ) );
+					+ collectionInfoString( attributeMapping, key ) );
 		}
 
 		final PersistenceContext persistenceContext = session.getPersistenceContext();
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractEntityBatchLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractEntityBatchLoader.java
@@ -47,7 +47,7 @@ public final T load(
 			SharedSessionContractImplementor session) {
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
 			MULTI_KEY_LOAD_LOGGER.trace( "Batch fetching entity: "
-					+ infoString( getLoadable().getEntityName(), id ) );
+					+ infoString( getLoadable(), id ) );
 		}
 
 		final Object[] ids = resolveIdsToInitialize( id, session );
@@ -62,7 +62,7 @@ public T load(
 			SharedSessionContractImplementor session) {
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
 			MULTI_KEY_LOAD_LOGGER.trace( "Batch fetching entity: "
-					+ infoString( getLoadable().getEntityName(), id ) );
+					+ infoString( getLoadable(), id ) );
 		}
 
 		final Object[] ids = resolveIdsToInitialize( id, session );
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java
@@ -92,7 +92,7 @@ private List<T> performUnorderedMultiLoad(
 		assert !loadOptions.isOrderReturnEnabled();
 		assert ids != null;
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
-			MULTI_KEY_LOAD_LOGGER.tracef( "Unordered MultiLoad starting: "
+			MULTI_KEY_LOAD_LOGGER.tracef( "Unordered batch load starting: "
 					+ getLoadable().getEntityName() );
 		}
 		return unorderedMultiLoad( ids, loadOptions, session );
@@ -105,7 +105,7 @@ private List<T> performOrderedMultiLoad(
 		assert loadOptions.isOrderReturnEnabled();
 		assert ids != null;
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
-			MULTI_KEY_LOAD_LOGGER.tracef( "Ordered MultiLoad starting: "
+			MULTI_KEY_LOAD_LOGGER.tracef( "Ordered batch load starting: "
 					+ getLoadable().getEntityName() );
 		}
 		return orderedMultiLoad( ids, loadOptions, session );
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiNaturalIdLoader.java
@@ -52,7 +52,7 @@ private <K> List<E> performUnorderedMultiLoad(
 			MultiNaturalIdLoadOptions loadOptions,
 			SharedSessionContractImplementor session) {
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
-			MULTI_KEY_LOAD_LOGGER.tracef( "Unordered MultiLoad starting: "
+			MULTI_KEY_LOAD_LOGGER.tracef( "Unordered batch load starting: "
 					+ getEntityDescriptor().getEntityName() );
 		}
 		return unorderedMultiLoad( naturalIds, loadOptions, session );
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.loader.ast.internal;
 
-import java.lang.reflect.Array;
 
 import org.hibernate.LockOptions;
 import org.hibernate.collection.spi.PersistentCollection;
@@ -33,6 +32,7 @@
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 
+import static java.lang.reflect.Array.newInstance;
 import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.hasSingleId;
 import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.trimIdBatch;
 import static org.hibernate.loader.ast.internal.MultiKeyLoadLogging.MULTI_KEY_LOAD_LOGGER;
@@ -118,19 +118,19 @@ private PersistentCollection<?> loadEmbeddable(
 			ForeignKeyDescriptor keyDescriptor) {
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
 			MULTI_KEY_LOAD_LOGGER.trace( "Batch fetching collection: "
-					+ collectionInfoString( getLoadable().getNavigableRole().getFullPath(), keyBeingLoaded ) );
+					+ collectionInfoString( getLoadable(), keyBeingLoaded ) );
 		}
 
 		final int length = getDomainBatchSize();
-		final Object[] keysToInitialize = (Object[]) Array.newInstance(
+		final Object[] keysToInitialize = (Object[]) newInstance(
 				jdbcParameter.getExpressionType()
 						.getSingleJdbcMapping()
 						.getJdbcJavaType()
 						.getJavaTypeClass()
 						.getComponentType(),
 				length
 		);
-		final Object[] embeddedKeys = (Object[]) Array.newInstance( keyDomainType, length );
+		final Object[] embeddedKeys = (Object[]) newInstance( keyDomainType, length );
 		session.getPersistenceContextInternal().getBatchFetchQueue()
 				.collectBatchLoadableCollectionKeys(
 						length,
@@ -168,7 +168,7 @@ private PersistentCollection<?> loadEmbeddable(
 	void initializeKeys(Object key, Object[] keysToInitialize, SharedSessionContractImplementor session) {
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
 			MULTI_KEY_LOAD_LOGGER.tracef( "Collection keys to initialize via batch fetching (%s) %s",
-					collectionInfoString( getLoadable().getNavigableRole().getFullPath(), key ),
+					collectionInfoString( getLoadable(), key ),
 					keysToInitialize );
 		}
 
@@ -214,7 +214,7 @@ Object[] resolveKeysToInitialize(Object keyBeingLoaded, SharedSessionContractImp
 		if( keyDescriptor.isEmbedded()){
 			assert keyDescriptor.getJdbcTypeCount() == 1;
 			final int length = getDomainBatchSize();
-			final Object[] keysToInitialize = (Object[]) Array.newInstance( keyDescriptor.getSingleJdbcMapping().getJdbcJavaType().getJavaTypeClass(), length );
+			final Object[] keysToInitialize = (Object[]) newInstance( keyDescriptor.getSingleJdbcMapping().getJdbcJavaType().getJavaTypeClass(), length );
 			session.getPersistenceContextInternal().getBatchFetchQueue()
 					.collectBatchLoadableCollectionKeys(
 							length,
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java
@@ -93,7 +93,7 @@ void initializeKeys(Object key, Object[] keysToInitialize, SharedSessionContract
 		if ( loggerDebugEnabled ) {
 			MULTI_KEY_LOAD_LOGGER.tracef(
 					"Collection keys to initialize via batch fetching (%s) %s",
-					collectionInfoString( getLoadable().getNavigableRole().getFullPath(), key ),
+					collectionInfoString( getLoadable(), key ),
 					keysToInitialize
 			);
 		}
@@ -128,7 +128,7 @@ void initializeKeys(Object key, Object[] keysToInitialize, SharedSessionContract
 					if ( loggerDebugEnabled ) {
 						MULTI_KEY_LOAD_LOGGER.tracef(
 								"Processing collection batch-fetch chunk (%s) %s - %s",
-								collectionInfoString( getLoadable().getNavigableRole().getFullPath(), key ),
+								collectionInfoString( getLoadable(), key ),
 								startIndex,
 								startIndex + (sqlBatchSize-1)
 						);
@@ -138,7 +138,7 @@ void initializeKeys(Object key, Object[] keysToInitialize, SharedSessionContract
 					if ( loggerDebugEnabled ) {
 						MULTI_KEY_LOAD_LOGGER.tracef(
 								"Finishing collection batch-fetch chunk (%s) %s - %s (%s)",
-								collectionInfoString( getLoadable().getNavigableRole().getFullPath(), key ),
+								collectionInfoString( getLoadable(), key ),
 								startIndex,
 								startIndex + (sqlBatchSize-1),
 								nonNullElementCount
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java
@@ -43,13 +43,13 @@
 import org.hibernate.type.BasicType;
 import org.hibernate.type.StandardBasicTypes;
 
-import org.jboss.logging.Logger;
+import static org.hibernate.loader.LoaderLogging.LOADER_LOGGER;
+import static org.hibernate.pretty.MessageHelper.infoString;
 
 /**
  * @author Steve Ebersole
  */
 class DatabaseSnapshotExecutor {
-	private static final Logger log = Logger.getLogger( DatabaseSnapshotExecutor.class );
 
 	private final EntityMappingType entityDescriptor;
 
@@ -154,8 +154,9 @@ class DatabaseSnapshotExecutor {
 	}
 
 	Object[] loadDatabaseSnapshot(Object id, SharedSessionContractImplementor session) {
-		if ( log.isTraceEnabled() ) {
-			log.tracef( "Getting current persistent state for `%s#%s`", entityDescriptor.getEntityName(), id );
+		if ( LOADER_LOGGER.isTraceEnabled() ) {
+			LOADER_LOGGER.trace( "Retrieving snapshot of current persistent state for "
+					+ infoString( entityDescriptor, id ) );
 		}
 
 		final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl(
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
@@ -129,7 +129,7 @@ protected void initializeEntities(
 			SharedSessionContractImplementor session) {
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
 			MULTI_KEY_LOAD_LOGGER.tracef( "Entity ids to initialize via batch fetching (%s) %s",
-					infoString( getLoadable().getEntityName(), id),
+					infoString( getLoadable(), id),
 					Arrays.toString( idsToInitialize ) );
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java
@@ -124,7 +124,7 @@ protected void initializeEntities(
 			SharedSessionContractImplementor session) {
 		if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
 			MULTI_KEY_LOAD_LOGGER.tracef( "Entity ids to initialize via batch fetching (%s) %s",
-					infoString( getLoadable().getEntityName(), pkValue ),
+					infoString( getLoadable(), pkValue ),
 					Arrays.toString(idsToInitialize) );
 		}
 
@@ -161,7 +161,7 @@ protected void initializeEntities(
 							if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {
 								MULTI_KEY_LOAD_LOGGER.tracef(
 										"Processing entity batch-fetch chunk (%s) %s - %s",
-										infoString( getLoadable().getEntityName(), pkValue ),
+										infoString( getLoadable(), pkValue ),
 										startIndex,
 										startIndex + ( sqlBatchSize - 1 )
 								);
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
@@ -100,7 +100,7 @@ public static void upgradeLock(
 					else {
 						throw new IllegalStateException( String.format(
 								"Trying to lock versioned entity %s but found null version",
-								infoString( persister.getEntityName(), entry.getId() )
+								infoString( persister, entry.getId() )
 						) );
 					}
 				}
diff --git a/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java b/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java
@@ -9,6 +9,8 @@
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.type.Type;
@@ -387,4 +389,13 @@ public static String collectionInfoString(@Nullable String role, @Nullable Objec
 		return info.toString();
 	}
 
+	public static String collectionInfoString(PluralAttributeMapping loadable, Object key) {
+		final CollectionPersister collectionDescriptor = loadable.getCollectionDescriptor();
+		return collectionInfoString( collectionDescriptor, key, collectionDescriptor.getFactory() );
+	}
+
+	public static String infoString(EntityMappingType loadable, Object id) {
+		final EntityPersister persister = loadable.getEntityPersister();
+		return infoString( persister, id, persister.getFactory() );
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public int getKeyJdbcCount() {`
`82`	`82`	`public PersistentCollection<?> load(Object key, SharedSessionContractImplementor session) {`
`83`	`83`	`if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {`
`84`	`84`	`MULTI_KEY_LOAD_LOGGER.trace( "Batch fetching collection: "`
`85`		`- + collectionInfoString( getLoadable().getNavigableRole().getFullPath(), key ) );`
	`85`	`+ + collectionInfoString( getLoadable(), key ) );`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`final Object[] keys = resolveKeysToInitialize( key, session );`
`@@ -108,7 +108,7 @@ protected void finishInitializingKey(Object key, SharedSessionContractImplemento`
`108`	`108`
`109`	`109`	`if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {`
`110`	`110`	`MULTI_KEY_LOAD_LOGGER.trace( "Finishing initializing batch-fetched collection: "`
`111`		`- + collectionInfoString( attributeMapping.getNavigableRole().getFullPath(), key ) );`
	`111`	`+ + collectionInfoString( attributeMapping, key ) );`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`final PersistenceContext persistenceContext = session.getPersistenceContext();`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private <K> List<E> performUnorderedMultiLoad(`
`52`	`52`	`MultiNaturalIdLoadOptions loadOptions,`
`53`	`53`	`SharedSessionContractImplementor session) {`
`54`	`54`	`if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {`
`55`		`- MULTI_KEY_LOAD_LOGGER.tracef( "Unordered MultiLoad starting: "`
	`55`	`+ MULTI_KEY_LOAD_LOGGER.tracef( "Unordered batch load starting: "`
`56`	`56`	`+ getEntityDescriptor().getEntityName() );`
`57`	`57`	`}`
`58`	`58`	`return unorderedMultiLoad( naturalIds, loadOptions, session );`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ protected void initializeEntities(`
`129`	`129`	`SharedSessionContractImplementor session) {`
`130`	`130`	`if ( MULTI_KEY_LOAD_LOGGER.isTraceEnabled() ) {`
`131`	`131`	`MULTI_KEY_LOAD_LOGGER.tracef( "Entity ids to initialize via batch fetching (%s) %s",`
`132`		`- infoString( getLoadable().getEntityName(), id),`
	`132`	`+ infoString( getLoadable(), id),`
`133`	`133`	`Arrays.toString( idsToInitialize ) );`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public static void upgradeLock(`
`100`	`100`	`else {`
`101`	`101`	`throw new IllegalStateException( String.format(`
`102`	`102`	`"Trying to lock versioned entity %s but found null version",`
`103`		`- infoString( persister.getEntityName(), entry.getId() )`
	`103`	`+ infoString( persister, entry.getId() )`
`104`	`104`	`) );`
`105`	`105`	`}`
`106`	`106`	`}`