HHH-8276 - Integrate LoadPlans into UniqueEntityLoader (PoC)

Author: sebersole

hibernate-core/src/main/java/org/hibernate/loader/entity/plan/AbstractLoadPlanBasedEntityLoader.java

@@ -30,12 +30,12 @@
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.loader.entity.UniqueEntityLoader;
-import org.hibernate.loader.plan.exec.query.spi.NamedParameterContext;
-import org.hibernate.loader.plan.exec.query.spi.QueryBuildingParameters;
-import org.hibernate.loader.plan.exec.spi.EntityLoadQueryDetails;
-import org.hibernate.loader.plan.internal.SingleRootReturnLoadPlanBuilderStrategy;
-import org.hibernate.loader.plan.spi.LoadPlan;
-import org.hibernate.loader.plan.spi.build.MetadataDrivenLoadPlanBuilder;
+import org.hibernate.loader.plan2.build.internal.FetchStyleLoadPlanBuildingAssociationVisitationStrategy;
+import org.hibernate.loader.plan2.build.spi.MetamodelDrivenLoadPlanBuilder;
+import org.hibernate.loader.plan2.exec.query.spi.NamedParameterContext;
+import org.hibernate.loader.plan2.exec.query.spi.QueryBuildingParameters;
+import org.hibernate.loader.plan2.exec.spi.EntityLoadQueryDetails;
+import org.hibernate.loader.plan2.spi.LoadPlan;
 import org.hibernate.loader.spi.AfterLoadAction;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.OuterJoinLoadable;
@@ -72,12 +72,12 @@ public AbstractLoadPlanBasedEntityLoader(
 		this.uniqueKeyType = uniqueKeyType;
 		this.entityName = entityPersister.getEntityName();
 
-		final SingleRootReturnLoadPlanBuilderStrategy strategy = new SingleRootReturnLoadPlanBuilderStrategy(
+		final FetchStyleLoadPlanBuildingAssociationVisitationStrategy strategy = new FetchStyleLoadPlanBuildingAssociationVisitationStrategy(
 				factory,
 				buildingParameters.getQueryInfluencers()
 		);
 
-		this.plan = MetadataDrivenLoadPlanBuilder.buildRootEntityLoadPlan( strategy, entityPersister );
+		this.plan = MetamodelDrivenLoadPlanBuilder.buildRootEntityLoadPlan( strategy, entityPersister );
 		this.staticLoadQuery = EntityLoadQueryDetails.makeForBatching(
 				plan,
 				uniqueKeyColumnNames,

hibernate-core/src/main/java/org/hibernate/loader/entity/plan/EntityLoader.java

@@ -32,7 +32,7 @@
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.CoreLogging;
-import org.hibernate.loader.plan.exec.query.spi.QueryBuildingParameters;
+import org.hibernate.loader.plan2.exec.query.spi.QueryBuildingParameters;
 import org.hibernate.persister.entity.OuterJoinLoadable;
 import org.hibernate.type.Type;
 

hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AliasResolutionContextImpl.java

@@ -23,13 +23,19 @@
  */
 package org.hibernate.loader.plan.exec.internal;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.jboss.logging.Logger;
+
 import org.hibernate.cfg.NotYetImplementedException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.hql.internal.NameGenerator;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.loader.CollectionAliases;
 import org.hibernate.loader.DefaultEntityAliases;
@@ -50,6 +56,9 @@
 import org.hibernate.loader.plan.spi.Return;
 import org.hibernate.loader.plan.spi.ScalarReturn;
 import org.hibernate.loader.plan.spi.SourceQualifiable;
+import org.hibernate.loader.plan2.build.spi.TreePrinterHelper;
+import org.hibernate.loader.plan2.spi.LoadPlan;
+import org.hibernate.loader.plan2.spi.QuerySpace;
 import org.hibernate.loader.spi.JoinableAssociation;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
@@ -64,6 +73,8 @@
  * @author Steve Ebersole
  */
 public class AliasResolutionContextImpl implements AliasResolutionContext {
+	private static final Logger log = CoreLogging.logger( AliasResolutionContextImpl.class );
+
 	private final SessionFactoryImplementor sessionFactory;
 
 	private final Map<Return,String> sourceAliasByReturnMap;

hibernate-core/src/main/java/org/hibernate/loader/plan/exec/process/internal/EntityIdentifierReaderImpl.java

@@ -107,7 +107,6 @@ public void hydrate(ResultSet resultSet, ResultSetProcessingContext context) thr
 			// broadcast the fact that a hydrated identifier value just became associated with
 			// this entity reference
 			processingState.registerIdentifierHydratedForm( identifierHydratedForm );
-//			hydrateIdentifierFetchIdentifiers( resultSet, context, identifierHydratedForm );
 			for ( EntityReferenceReader reader : identifierFetchReaders ) {
 				reader.hydrateIdentifier( resultSet, context );
 			}

hibernate-core/src/main/java/org/hibernate/loader/plan/spi/build/MetadataDrivenLoadPlanBuilder.java

@@ -26,15 +26,15 @@
 import org.hibernate.loader.plan.spi.LoadPlan;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.walking.spi.MetadataDrivenModelGraphVisitor;
+import org.hibernate.persister.walking.spi.MetamodelGraphWalker;
 
 /**
- * A metadata-driven builder of LoadPlans.  Coordinates between the {@link MetadataDrivenModelGraphVisitor} and
+ * A metadata-driven builder of LoadPlans.  Coordinates between the {@link org.hibernate.persister.walking.spi.MetamodelGraphWalker} and
  * {@link LoadPlanBuilderStrategy}.
  *
  * @author Steve Ebersole
  *
- * @see MetadataDrivenModelGraphVisitor
+ * @see org.hibernate.persister.walking.spi.MetamodelGraphWalker
  */
 public class MetadataDrivenLoadPlanBuilder {
 	/**
@@ -48,7 +48,7 @@ public class MetadataDrivenLoadPlanBuilder {
 	 * @return The built load plan.
 	 */
 	public static LoadPlan buildRootEntityLoadPlan(LoadPlanBuilderStrategy strategy, EntityPersister persister) {
-		MetadataDrivenModelGraphVisitor.visitEntity( strategy, persister );
+		MetamodelGraphWalker.visitEntity( strategy, persister );
 		return strategy.buildLoadPlan();
 	}
 
@@ -61,7 +61,7 @@ public static LoadPlan buildRootEntityLoadPlan(LoadPlanBuilderStrategy strategy,
 	 * @return The built load plan.
 	 */
 	public static LoadPlan buildRootCollectionLoadPlan(LoadPlanBuilderStrategy strategy, CollectionPersister persister) {
-		MetadataDrivenModelGraphVisitor.visitCollection( strategy, persister );
+		MetamodelGraphWalker.visitCollection( strategy, persister );
 		return strategy.buildLoadPlan();
 	}
 }

hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/CascadeLoadPlanBuilderStrategy.java renamed to hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/CascadeStyleLoadPlanBuildingAssociationVisitationStrategy.java

@@ -37,13 +37,14 @@
  *
  * @author Steve Ebersole
  */
-public class CascadeLoadPlanBuilderStrategy extends StandardFetchBasedLoadPlanBuilderStrategy {
+public class CascadeStyleLoadPlanBuildingAssociationVisitationStrategy
+		extends FetchStyleLoadPlanBuildingAssociationVisitationStrategy {
 	private static final FetchStrategy EAGER = new FetchStrategy( FetchTiming.IMMEDIATE, FetchStyle.JOIN );
 	private static final FetchStrategy DELAYED = new FetchStrategy( FetchTiming.DELAYED, FetchStyle.SELECT );
 
 	private final CascadingAction cascadeActionToMatch;
 
-	public CascadeLoadPlanBuilderStrategy(
+	public CascadeStyleLoadPlanBuildingAssociationVisitationStrategy(
 			CascadingAction cascadeActionToMatch,
 			SessionFactoryImplementor sessionFactory,
 			LoadQueryInfluencers loadQueryInfluencers) {