HHH-8276 - Integrate LoadPlans into UniqueEntityLoader (PoC)

stliu · sebersole · commit c83fd30d2390 · 2013-10-08T22:09:42.000-05:00
diff --git a/hibernate-core/src/main/java/org/hibernate/LockMode.java b/hibernate-core/src/main/java/org/hibernate/LockMode.java
@@ -84,7 +84,7 @@ public enum LockMode {
 	WRITE( 10 ),
 
 	/**
-	 * Similiar to {@link #UPGRADE} except that, for versioned entities,
+	 * Similar to {@link #UPGRADE} except that, for versioned entities,
 	 * it results in a forced version increment.
 	 *
 	 * @deprecated instead use PESSIMISTIC_FORCE_INCREMENT
@@ -97,13 +97,13 @@ public enum LockMode {
 	 */
 
 	/**
-	 * Optimisticly assume that transaction will not experience contention for
+	 * Optimistically assume that transaction will not experience contention for
 	 * entities.  The entity version will be verified near the transaction end.
 	 */
 	OPTIMISTIC( 6 ),
 
 	/**
-	 * Optimisticly assume that transaction will not experience contention for
+	 * Optimistically assume that transaction will not experience contention for
 	 * entities.  The entity version will be verified and incremented near the transaction end.
 	 */
 	OPTIMISTIC_FORCE_INCREMENT( 7 ),
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
@@ -170,7 +170,7 @@ public boolean hasEnabledFetchProfiles() {
 		return !enabledFetchProfileNames.isEmpty();
 	}
 
-	public Set getEnabledFetchProfileNames() {
+	public Set<String> getEnabledFetchProfileNames() {
 		return enabledFetchProfileNames;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java
@@ -172,9 +172,7 @@ protected final boolean isJoinFetchEnabledByProfile(OuterJoinLoadable persister,
 				: rootPropertyName;
 		String fetchRole = persister.getEntityName() + "." + relativePropertyPath;
 
-		Iterator profiles = getLoadQueryInfluencers().getEnabledFetchProfileNames().iterator();
-		while ( profiles.hasNext() ) {
-			final String profileName = ( String ) profiles.next();
+		for ( String profileName : getLoadQueryInfluencers().getEnabledFetchProfileNames() ) {
 			final FetchProfile profile = getFactory().getFetchProfile( profileName );
 			final Fetch fetch = profile.getFetchByRole( fetchRole );
 			if ( fetch != null && Fetch.Style.JOIN == fetch.getStyle() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/plan/LegacyBatchingEntityLoaderBuilder.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/plan/LegacyBatchingEntityLoaderBuilder.java
@@ -63,7 +63,7 @@ protected UniqueEntityLoader buildBatchingLoader(
 		return new LegacyBatchingEntityLoader( persister, batchSize, lockOptions, factory, influencers );
 	}
 
-	public static class LegacyBatchingEntityLoader extends BatchingEntityLoader implements UniqueEntityLoader {
+	public static class LegacyBatchingEntityLoader extends BatchingEntityLoader  {
 		private final int[] batchSizes;
 		private final EntityLoader[] loaders;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/internal/SingleRootReturnLoadPlanBuilderStrategy.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/internal/SingleRootReturnLoadPlanBuilderStrategy.java
@@ -55,8 +55,7 @@
  * @author Steve Ebersole
  */
 public class SingleRootReturnLoadPlanBuilderStrategy
-		extends AbstractLoadPlanBuilderStrategy
-		implements LoadPlanBuilderStrategy {
+		extends AbstractLoadPlanBuilderStrategy {
 
 	private final LoadQueryInfluencers loadQueryInfluencers;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/FetchStyleLoadPlanBuildingAssociationVisitationStrategy.java b/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/FetchStyleLoadPlanBuildingAssociationVisitationStrategy.java
@@ -50,8 +50,7 @@
  * @author Steve Ebersole
  */
 public class FetchStyleLoadPlanBuildingAssociationVisitationStrategy
-		extends AbstractLoadPlanBuildingAssociationVisitationStrategy
-		implements LoadPlanBuildingAssociationVisitationStrategy {
+		extends AbstractLoadPlanBuildingAssociationVisitationStrategy {
 	private static final Logger log = CoreLogging.logger( FetchStyleLoadPlanBuildingAssociationVisitationStrategy.class );
 
 	private final LoadQueryInfluencers loadQueryInfluencers;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/spaces/QuerySpacesImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/spaces/QuerySpacesImpl.java
@@ -43,7 +43,7 @@
 /**
  * @author Steve Ebersole
  */
-public class QuerySpacesImpl implements QuerySpaces, ExpandingQuerySpaces {
+public class QuerySpacesImpl implements ExpandingQuerySpaces {
 	private static final Logger log = CoreLogging.logger( QuerySpacesImpl.class );
 
 	private final SessionFactoryImplementor sessionFactory;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/spi/LoadPlanTreePrinter.java b/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/spi/LoadPlanTreePrinter.java
@@ -53,11 +53,11 @@ public class LoadPlanTreePrinter {
 	 */
 	public static final LoadPlanTreePrinter INSTANCE = new LoadPlanTreePrinter();
 
-	public String toString(LoadPlan loadPlan) {
+	private String toString(LoadPlan loadPlan) {
 		return toString( loadPlan, null );
 	}
 
-	public String toString(LoadPlan loadPlan, AliasResolutionContextImpl aliasResolutionContext) {
+	private String toString(LoadPlan loadPlan, AliasResolutionContextImpl aliasResolutionContext) {
 		final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
 		final PrintStream printStream = new PrintStream( byteArrayOutputStream );
 		final PrintWriter printWriter = new PrintWriter( printStream );
@@ -83,8 +83,9 @@ public void logTree(LoadPlan loadPlan, AliasResolutionContextImpl aliasResolutio
 
 		printWriter.flush();
 		printStream.flush();
+		log.debug( new String( byteArrayOutputStream.toByteArray() ) );
 
-		log.debug( toString( loadPlan, aliasResolutionContext ) );
+//		log.debug( toString( loadPlan, aliasResolutionContext ) );
 	}
 
 	private void logTree(
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/spi/QuerySpaceTreePrinter.java b/hibernate-core/src/main/java/org/hibernate/loader/plan2/build/spi/QuerySpaceTreePrinter.java
@@ -102,7 +102,7 @@ private void writeQuerySpace(
 		writeJoins( querySpace.getJoins(), depth + 1, aliasResolutionContext, printWriter );
 	}
 
-	final int detailDepthOffset = 4;
+	final int detailDepthOffset = 1;
 
 	private void generateDetailLines(
 			QuerySpace querySpace,
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan2/exec/process/internal/ResultSetProcessorHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/plan2/exec/process/internal/ResultSetProcessorHelper.java
@@ -64,9 +64,14 @@ public EntityKey interpretEntityKey(
 			else {
 				entityPersister = session.getFactory().getEntityPersister( optionalEntityName );
 			}
-			if ( entityPersister.isInstance( optionalId ) ) {
+			if ( entityPersister.isInstance( optionalId ) && !entityPersister.getEntityMetamodel()
+					.getIdentifierProperty()
+					.isVirtual() && entityPersister.getEntityMetamodel().getIdentifierProperty().isEmbedded() ) {
 				// embedded (non-encapsulated) composite identifier
-				final Serializable identifierState = ( (CompositeType) entityPersister.getIdentifierType() ).getPropertyValues( optionalId, session );
+				final Serializable identifierState = ((CompositeType) entityPersister.getIdentifierType()).getPropertyValues(
+						optionalId,
+						session
+				);
 				return session.generateEntityKey( identifierState, entityPersister );
 			}
 			else {
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan2/exec/spi/EntityLoadQueryDetails.java b/hibernate-core/src/main/java/org/hibernate/loader/plan2/exec/spi/EntityLoadQueryDetails.java
@@ -121,10 +121,12 @@ protected EntityLoadQueryDetails(
 			QueryBuildingParameters buildingParameters,
 			SessionFactoryImplementor factory) {
 		this.loadPlan = loadPlan;
+		final AliasResolutionContextImpl aliasResolutionContext = new AliasResolutionContextImpl( factory );
 
-		if ( log.isDebugEnabled() ) {
-			log.debug( LoadPlanTreePrinter.INSTANCE.toString( loadPlan ) );
-		}
+//		LoadPlanTreePrinter.INSTANCE.logTree( loadPlan, aliasResolutionContext );
+//		if ( log.isDebugEnabled() ) {
+//			log.debug( LoadPlanTreePrinter.INSTANCE.toString( loadPlan ) );
+//		}
 
 		// There are 2 high-level requirements to perform here:
 		// 	1) Determine the SQL required to carry out the given LoadPlan (and fulfill
@@ -136,7 +138,6 @@ protected EntityLoadQueryDetails(
 
 		final SelectStatementBuilder select = new SelectStatementBuilder( factory.getDialect() );
 		final EntityReturn rootReturn = Helper.INSTANCE.extractRootReturn( loadPlan, EntityReturn.class );
-		final AliasResolutionContextImpl aliasResolutionContext = new AliasResolutionContextImpl( factory );
 		final ReaderCollectorImpl readerCollector = new ReaderCollectorImpl();
 
 		final LoadQueryJoinAndFetchProcessor helper = new LoadQueryJoinAndFetchProcessor( aliasResolutionContext , buildingParameters, factory );
@@ -386,7 +387,7 @@ public void setRootReturnReader(EntityReturnReader entityReturnReader) {
 		}
 	}
 
-	public static class EntityLoaderRowReader extends AbstractRowReader implements RowReader {
+	public static class EntityLoaderRowReader extends AbstractRowReader {
 		private final EntityReturnReader rootReturnReader;
 		private final List<EntityReferenceInitializer> entityReferenceInitializers;
 		private final List<CollectionReferenceInitializer> arrayReferenceInitializers;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan2/spi/FetchSource.java b/hibernate-core/src/main/java/org/hibernate/loader/plan2/spi/FetchSource.java
@@ -23,18 +23,8 @@
  */
 package org.hibernate.loader.plan2.spi;
 
-import org.hibernate.engine.FetchStrategy;
 import org.hibernate.loader.PropertyPath;
 
-import org.hibernate.loader.plan.spi.SqlSelectFragmentResolver;
-import org.hibernate.loader.plan.spi.build.LoadPlanBuildingContext;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.walking.spi.AnyMappingDefinition;
-import org.hibernate.persister.walking.spi.AssociationAttributeDefinition;
-import org.hibernate.persister.walking.spi.AttributeDefinition;
-import org.hibernate.persister.walking.spi.CompositionDefinition;
-import org.hibernate.type.Type;
-
 /**
  * Contract for a FetchSource (aka, the thing that owns the fetched attribute).
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan2/spi/QuerySpace.java b/hibernate-core/src/main/java/org/hibernate/loader/plan2/spi/QuerySpace.java
@@ -26,7 +26,7 @@
 import org.hibernate.persister.entity.PropertyMapping;
 
 /**
- * Defines a persister reference (either entity or collection) or a composite reference.  JPA terms this
+ * Defines a persister reference (either entity or collection) or a composite reference. In JPA terms this is
  * an "abstract schema type" when discussing JPQL or JPA Criteria queries.  This models a single source of attributes
  * (and fetches).
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -228,7 +228,7 @@ public abstract class AbstractEntityPersister
 	// dynamic filters attached to the class-level
 	private final FilterHelper filterHelper;
 
-	private final Set affectingFetchProfileNames = new HashSet();
+	private final Set<String> affectingFetchProfileNames = new HashSet<String>();
 
 	private final Map uniqueKeyLoaders = new HashMap();
 	private final Map lockers = new HashMap();
@@ -3973,9 +3973,8 @@ public void registerAffectingFetchProfile(String fetchProfileName) {
 	}
 
 	private boolean isAffectedByEnabledFetchProfiles(SessionImplementor session) {
-		Iterator itr = session.getLoadQueryInfluencers().getEnabledFetchProfileNames().iterator();
-		while ( itr.hasNext() ) {
-			if ( affectingFetchProfileNames.contains( itr.next() ) ) {
+		for ( String s : session.getLoadQueryInfluencers().getEnabledFetchProfileNames() ) {
+			if ( affectingFetchProfileNames.contains( s ) ) {
 				return true;
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/walking/internal/FetchStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/walking/internal/FetchStrategyHelper.java
@@ -76,9 +76,7 @@ public static FetchStyle determineFetchStyleByProfile(
 				: rootPropertyName;
 		final String fetchRole = persister.getEntityName() + "." + relativePropertyPath;
 
-		Iterator profiles = loadQueryInfluencers.getEnabledFetchProfileNames().iterator();
-		while ( profiles.hasNext() ) {
-			final String profileName = ( String ) profiles.next();
+		for ( String profileName : loadQueryInfluencers.getEnabledFetchProfileNames() ) {
 			final FetchProfile profile = loadQueryInfluencers.getSessionFactory().getFetchProfile( profileName );
 			final Fetch fetch = profile.getFetchByRole( fetchRole );
 			if ( fetch != null && Fetch.Style.JOIN == fetch.getStyle() ) {

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public boolean hasEnabledFetchProfiles() {`
`170`	`170`	`return !enabledFetchProfileNames.isEmpty();`
`171`	`171`	`}`
`172`	`172`
`173`		`- public Set getEnabledFetchProfileNames() {`
	`173`	`+ public Set<String> getEnabledFetchProfileNames() {`
`174`	`174`	`return enabledFetchProfileNames;`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected UniqueEntityLoader buildBatchingLoader(`
`63`	`63`	`return new LegacyBatchingEntityLoader( persister, batchSize, lockOptions, factory, influencers );`
`64`	`64`	`}`
`65`	`65`
`66`		`- public static class LegacyBatchingEntityLoader extends BatchingEntityLoader implements UniqueEntityLoader {`
	`66`	`+ public static class LegacyBatchingEntityLoader extends BatchingEntityLoader {`
`67`	`67`	`private final int[] batchSizes;`
`68`	`68`	`private final EntityLoader[] loaders;`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private void writeQuerySpace(`
`102`	`102`	`writeJoins( querySpace.getJoins(), depth + 1, aliasResolutionContext, printWriter );`
`103`	`103`	`}`
`104`	`104`
`105`		`- final int detailDepthOffset = 4;`
	`105`	`+ final int detailDepthOffset = 1;`
`106`	`106`
`107`	`107`	`private void generateDetailLines(`
`108`	`108`	`QuerySpace querySpace,`