HHH-18571 Fix bug and correctly report effective batching

noetro · mbellade · commit 8a88ad7f59f2 · 2024-09-05T14:53:02.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java
@@ -325,7 +325,7 @@ public int effectiveBatchSize(CollectionPersister persister) {
 	}
 
 	public boolean effectivelyBatchLoadable(CollectionPersister persister) {
-		return batchSize > 1 || persister.isBatchLoadable();
+		return persister.isBatchLoadable() || effectiveBatchSize( persister ) > 1;
 	}
 
 	public int effectiveBatchSize(EntityPersister persister) {
@@ -336,7 +336,7 @@ public int effectiveBatchSize(EntityPersister persister) {
 	}
 
 	public boolean effectivelyBatchLoadable(EntityPersister persister) {
-		return batchSize > 1 || persister.isBatchLoadable();
+		return persister.isBatchLoadable() || effectiveBatchSize( persister ) > 1;
 	}
 
 	public boolean getSubselectFetchEnabled() {

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public int effectiveBatchSize(CollectionPersister persister) {`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`public boolean effectivelyBatchLoadable(CollectionPersister persister) {`
`328`		`- return batchSize > 1 \|\| persister.isBatchLoadable();`
	`328`	`+ return persister.isBatchLoadable() \|\| effectiveBatchSize( persister ) > 1;`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`public int effectiveBatchSize(EntityPersister persister) {`
`@@ -336,7 +336,7 @@ public int effectiveBatchSize(EntityPersister persister) {`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`public boolean effectivelyBatchLoadable(EntityPersister persister) {`
`339`		`- return batchSize > 1 \|\| persister.isBatchLoadable();`
	`339`	`+ return persister.isBatchLoadable() \|\| effectiveBatchSize( persister ) > 1;`
`340`	`340`	`}`
`341`	`341`
`342`	`342`	`public boolean getSubselectFetchEnabled() {`