EagerCollectionFetch generates collection and index fetches twice

hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractBagSemantics.java

@@ -21,6 +21,7 @@
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.collection.internal.BagInitializerProducer;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
@@ -95,4 +96,45 @@ public CollectionInitializerProducer createInitializerProducer(
 				)
 		);
 	}
+
+	@Override
+	public CollectionInitializerProducer createInitializerProducer(
+			NavigablePath navigablePath,
+			PluralAttributeMapping attributeMapping,
+			FetchParent fetchParent,
+			boolean selected,
+			String resultVariable,
+			LockMode lockMode,
+			Fetch indexFetch,
+			Fetch elementFetch,
+			DomainResultCreationState creationState){
+		if ( indexFetch == null ) {
+			indexFetch = attributeMapping.getIdentifierDescriptor() == null ? null : attributeMapping.getIdentifierDescriptor().generateFetch(
+					fetchParent,
+					navigablePath.append( CollectionPart.Nature.ID.getName() ),
+					FetchTiming.IMMEDIATE,
+					selected,
+					lockMode,
+					null,
+					creationState
+			);
+		}
+		if ( elementFetch == null ) {
+			elementFetch = attributeMapping.getElementDescriptor().generateFetch(
+					fetchParent,
+					navigablePath.append( CollectionPart.Nature.ELEMENT.getName() ),
+					FetchTiming.IMMEDIATE,
+					selected,
+					lockMode,
+					null,
+					creationState
+			);
+		}
+		return new BagInitializerProducer(
+				attributeMapping,
+				indexFetch,
+				elementFetch
+		);
+	}
+
 }

hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractMapSemantics.java

@@ -19,7 +19,7 @@
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.query.NavigablePath;
-import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.collection.internal.MapInitializerProducer;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
@@ -108,4 +108,45 @@ public CollectionInitializerProducer createInitializerProducer(
 				)
 		);
 	}
+
+	@Override
+	public CollectionInitializerProducer createInitializerProducer(
+			NavigablePath navigablePath,
+			PluralAttributeMapping attributeMapping,
+			FetchParent fetchParent,
+			boolean selected,
+			String resultVariable,
+			LockMode lockMode,
+			Fetch indexFetch,
+			Fetch elementFetch,
+			DomainResultCreationState creationState){
+		if ( indexFetch == null ) {
+			indexFetch = attributeMapping.getIndexDescriptor().generateFetch(
+					fetchParent,
+					navigablePath.append( CollectionPart.Nature.INDEX.getName() ),
+					FetchTiming.IMMEDIATE,
+					selected,
+					lockMode,
+					null,
+					creationState
+			);
+		}
+		if ( elementFetch == null ) {
+			elementFetch = attributeMapping.getElementDescriptor().generateFetch(
+					fetchParent,
+					navigablePath.append( CollectionPart.Nature.ELEMENT.getName() ),
+					FetchTiming.IMMEDIATE,
+					selected,
+					lockMode,
+					null,
+					creationState
+			);
+		}
+		return new MapInitializerProducer(
+				attributeMapping,
+				indexFetch,
+				elementFetch
+		);
+	}
+
 }

hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractSetSemantics.java

@@ -17,6 +17,7 @@
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.query.NavigablePath;
+import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.collection.internal.SetInitializerProducer;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
@@ -69,4 +70,29 @@ public CollectionInitializerProducer createInitializerProducer(
 				)
 		);
 	}
+
+	@Override
+	public  CollectionInitializerProducer createInitializerProducer(
+			NavigablePath navigablePath,
+			PluralAttributeMapping attributeMapping,
+			FetchParent fetchParent,
+			boolean selected,
+			String resultVariable,
+			LockMode lockMode,
+			Fetch indexFetch,
+			Fetch elementFetch,
+			DomainResultCreationState creationState){
+		if ( elementFetch == null ) {
+			return createInitializerProducer(
+					navigablePath,
+					attributeMapping,
+					fetchParent,
+					selected,
+					resultVariable,
+					lockMode,
+					creationState
+			);
+		}
+		return new SetInitializerProducer( attributeMapping, elementFetch );
+	}
 }

hibernate-core/src/main/java/org/hibernate/collection/internal/StandardArraySemantics.java

@@ -21,7 +21,7 @@
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.query.NavigablePath;
-import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.collection.internal.ArrayInitializerProducer;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
@@ -126,4 +126,45 @@ public CollectionInitializerProducer createInitializerProducer(
 				)
 		);
 	}
+
+	@Override
+	public CollectionInitializerProducer createInitializerProducer(
+			NavigablePath navigablePath,
+			PluralAttributeMapping attributeMapping,
+			FetchParent fetchParent,
+			boolean selected,
+			String resultVariable,
+			LockMode lockMode,
+			Fetch indexFetch,
+			Fetch elementFetch,
+			DomainResultCreationState creationState){
+		if ( indexFetch == null ) {
+			indexFetch = attributeMapping.getIndexDescriptor().generateFetch(
+					fetchParent,
+					navigablePath.append( CollectionPart.Nature.INDEX.getName() ),
+					FetchTiming.IMMEDIATE,
+					selected,
+					lockMode,
+					null,
+					creationState
+			);
+		}
+		if ( elementFetch == null ) {
+			elementFetch = attributeMapping.getElementDescriptor().generateFetch(
+					fetchParent,
+					navigablePath.append( CollectionPart.Nature.ELEMENT.getName() ),
+					FetchTiming.IMMEDIATE,
+					selected,
+					lockMode,
+					null,
+					creationState
+			);
+		}
+		return new ArrayInitializerProducer(
+				attributeMapping,
+				indexFetch,
+				elementFetch
+		);
+	}
+
 }

hibernate-core/src/main/java/org/hibernate/collection/internal/StandardListSemantics.java

@@ -22,7 +22,7 @@
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.query.NavigablePath;
-import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.collection.internal.ListInitializerProducer;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
@@ -101,6 +101,46 @@ public CollectionInitializerProducer createInitializerProducer(
 		);
 	}
 
+	@Override
+	public CollectionInitializerProducer createInitializerProducer(
+			NavigablePath navigablePath,
+			PluralAttributeMapping attributeMapping,
+			FetchParent fetchParent,
+			boolean selected,
+			String resultVariable,
+			LockMode lockMode,
+			Fetch indexFetch,
+			Fetch elementFetch,
+			DomainResultCreationState creationState) {
+		if ( indexFetch == null ) {
+			indexFetch = attributeMapping.getIndexDescriptor().generateFetch(
+					fetchParent,
+					navigablePath.append( CollectionPart.Nature.INDEX.getName() ),
+					FetchTiming.IMMEDIATE,
+					selected,
+					lockMode,
+					null,
+					creationState
+			);
+		}
+		if ( elementFetch == null ) {
+			elementFetch = attributeMapping.getElementDescriptor().generateFetch(
+					fetchParent,
+					navigablePath.append( CollectionPart.Nature.ELEMENT.getName() ),
+					FetchTiming.IMMEDIATE,
+					selected,
+					lockMode,
+					null,
+					creationState
+			);
+		}
+		return new ListInitializerProducer(
+				attributeMapping,
+				indexFetch,
+				elementFetch
+		);
+	}
+
 	@Override
 	public PersistentCollection instantiateWrapper(
 			Object key,

hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemantics.java

@@ -17,6 +17,7 @@
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
+import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.FetchParent;
 
 /**
@@ -66,4 +67,15 @@ CollectionInitializerProducer createInitializerProducer(
 			String resultVariable,
 			LockMode lockMode,
 			DomainResultCreationState creationState);
+
+	CollectionInitializerProducer createInitializerProducer(
+			NavigablePath navigablePath,
+			PluralAttributeMapping attributeMapping,
+			FetchParent fetchParent,
+			boolean selected,
+			String resultVariable,
+			LockMode lockMode,
+			Fetch indexFetch,
+			Fetch elementFetch,
+			DomainResultCreationState creationState);
 }

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java

@@ -12,7 +12,6 @@
 import org.hibernate.engine.FetchTiming;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Value;
-import org.hibernate.metamodel.mapping.Association;
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.EntityAssociationMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;

hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java

@@ -98,6 +98,8 @@ public EagerCollectionFetch(
 				null,
 				// todo (6.0) : we need to propagate these lock modes
 				LockMode.READ,
+				indexFetch,
+				elementFetch,
 				creationState
 		);
 	}