Use single loader to load single instance on multiloading

hibernate · Dec 15, 2021 · 647c2a9 · 647c2a9
1 parent cef98f6
commit 647c2a9
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java
@@ -9,6 +9,7 @@
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.hibernate.LockMode;
@@ -234,6 +235,9 @@ private List<T> loadEntitiesById(
 		assert ! idsInBatch.isEmpty();
 
 		final int numberOfIdsInBatch = idsInBatch.size();
+		if ( numberOfIdsInBatch == 1 ) {
+			return performSingleMultiLoad( idsInBatch.get( 0 ), lockOptions, session );
+		}
 
 		if ( log.isTraceEnabled() ) {
 			log.tracef( "#loadEntitiesById(`%s`, `%s`, ..)", entityDescriptor.getEntityName(), numberOfIdsInBatch );
@@ -333,6 +337,11 @@ public void registerLoadingEntityEntry(EntityKey entityKey, LoadingEntityEntry e
 		);
 	}
 
+	private List<T> performSingleMultiLoad(Object id, LockOptions lockOptions, SharedSessionContractImplementor session) {
+		T loaded = (T) entityDescriptor.load( id, null, lockOptions, session );
+		return Collections.singletonList( loaded );
+	}
+
 	private List<T> performUnorderedMultiLoad(
 			Object[] ids,
 			SharedSessionContractImplementor session,