HHH-8276 - Integrate LoadPlans into UniqueEntityLoader (PoC)

Author: sebersole

hibernate-core/src/main/java/org/hibernate/PropertyAccessException.java

@@ -71,9 +71,13 @@ public String getPropertyName() {
 		return propertyName;
 	}
 
+	protected String originalMessage() {
+		return super.getMessage();
+	}
+
 	@Override
 	public String getMessage() {
-		return super.getMessage()
+		return originalMessage()
 				+ ( wasSetter ? " setter of " : " getter of " )
 				+ StringHelper.qualify( persistentClass.getName(), propertyName );
 	}

hibernate-core/src/main/java/org/hibernate/PropertySetterAccessException.java

@@ -0,0 +1,68 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2013, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate;
+
+/**
+ * @author Steve Ebersole
+ */
+public class PropertySetterAccessException extends PropertyAccessException {
+	/**
+	 * Constructs a PropertyAccessException using the specified information.
+	 *
+	 * @param cause The underlying cause
+	 * @param persistentClass The class which is supposed to contain the property in question
+	 * @param propertyName The name of the property.
+	 * @param expectedType The expected property type
+	 * @param target The target, which should be of type 'persistentClass'
+	 * @param value The property value we are trying to set
+	 */
+	public PropertySetterAccessException(
+			Throwable cause,
+			Class persistentClass,
+			String propertyName,
+			Class expectedType,
+			Object target,
+			Object value) {
+		super(
+				cause,
+				String.format(
+						"IllegalArgumentException occurred while calling setter for property [%s.%s (expected type = %s)]; " +
+								"target = [%s], property value = [%s]",
+						persistentClass.getName(),
+						propertyName,
+						expectedType.getName(),
+						target,
+						value
+				),
+				true,
+				persistentClass,
+				propertyName
+		);
+	}
+
+	@Override
+	public String toString() {
+		return super.originalMessage();
+	}
+}

hibernate-core/src/main/java/org/hibernate/annotations/Any.java

@@ -57,6 +57,8 @@
  *
  * @author Emmanuel Bernard
  * @author Steve Ebersole
+ *
+ * @see AnyMetaDef
  */
 @java.lang.annotation.Target({METHOD, FIELD})
 @Retention(RUNTIME)

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java

@@ -28,6 +28,7 @@
 import java.util.Set;
 
 import org.hibernate.CustomEntityDirtinessStrategy;
+import org.hibernate.EntityNameResolver;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.MappingException;
@@ -290,4 +291,6 @@ public interface SessionFactoryImplementor extends Mapping, SessionFactory {
 	 * @return
 	 */
 	public NamedQueryRepository getNamedQueryRepository();
+
+	Iterable<EntityNameResolver> iterateEntityNameResolvers();
 }

hibernate-core/src/main/java/org/hibernate/hql/internal/NameGenerator.java

@@ -52,12 +52,22 @@ public static String[][] generateColumnNames(Type[] types, SessionFactoryImpleme
 	}
 
 	public static String scalarName(int x, int y) {
-		return new StringBuilder()
-				.append( "col_" )
-				.append( x )
-				.append( '_' )
-				.append( y )
-				.append( '_' )
-				.toString();
+		return scalarName( "col_" + x, y );
+	}
+
+	public static String scalarName(String base, int num) {
+		return base + '_' + num + '_';
+	}
+
+	public static String[] scalarNames(String base, int count) {
+		final String[] names = new String[count];
+		for ( int j = 0; j < count; j++ ) {
+			names[j] = scalarName( base, j );
+		}
+		return names;
+	}
+
+	public static String[] scalarNames(int uniqueness, int count) {
+		return scalarNames( "col_" + uniqueness, count );
 	}
 }

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java

@@ -378,6 +378,11 @@ protected void createFromJoinElement(
 
 		final FromElement fromElement;
 		if ( dot.getDataType() != null && dot.getDataType().isComponentType() ) {
+			if ( dot.getDataType().isAnyType() ) {
+				throw new SemanticException( "An AnyType attribute cannot be join fetched" );
+				// ^^ because the discriminator (aka, the "meta columns") must be known to the SQL in
+				// 		a non-parameterized way.
+			}
 			FromElementFactory factory = new FromElementFactory(
 					getCurrentFromClause(),
 					dot.getLhs().getFromElement(),

hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java

@@ -35,7 +35,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -268,7 +267,6 @@ public void handleEntityNotFound(String entityName, Serializable id) {
         this.jdbcServices = this.serviceRegistry.getService( JdbcServices.class );
         this.dialect = this.jdbcServices.getDialect();
 		this.cacheAccess = this.serviceRegistry.getService( CacheImplementor.class );
-		final RegionFactory regionFactory = cacheAccess.getRegionFactory();
 		this.sqlFunctionRegistry = new SQLFunctionRegistry( getDialect(), cfg.getSqlFunctions() );
 		if ( observer != null ) {
 			this.observer.addObserver( observer );
@@ -329,15 +327,22 @@ public void sessionFactoryClosed(SessionFactory factory) {
 			}
 		}
 
+		imports = new HashMap<String,String>( cfg.getImports() );
 
 		///////////////////////////////////////////////////////////////////////
 		// Prepare persisters and link them up with their cache
 		// region/access-strategy
 
+		final RegionFactory regionFactory = cacheAccess.getRegionFactory();
 		final String cacheRegionPrefix = settings.getCacheRegionPrefix() == null ? "" : settings.getCacheRegionPrefix() + ".";
-
 		final PersisterFactory persisterFactory = serviceRegistry.getService( PersisterFactory.class );
 
+		// todo : consider removing this silliness and just have EntityPersister directly implement ClassMetadata
+		//		EntityPersister.getClassMetadata() for the internal impls simply "return this";
+		//		collapsing those would allow us to remove this "extra" Map
+		//
+		// todo : similar for CollectionPersister/CollectionMetadata
+
 		entityPersisters = new HashMap();
 		Map entityAccessStrategies = new HashMap();
 		Map<String,ClassMetadata> classMeta = new HashMap<String,ClassMetadata>();
@@ -358,15 +363,15 @@ public void sessionFactoryClosed(SessionFactory factory) {
 					cacheAccess.addCacheRegion( cacheRegionName, entityRegion );
 				}
 			}
-			
+
 			NaturalIdRegionAccessStrategy naturalIdAccessStrategy = null;
 			if ( model.hasNaturalId() && model.getNaturalIdCacheRegionName() != null ) {
 				final String naturalIdCacheRegionName = cacheRegionPrefix + model.getNaturalIdCacheRegionName();
 				naturalIdAccessStrategy = ( NaturalIdRegionAccessStrategy ) entityAccessStrategies.get( naturalIdCacheRegionName );
-				
+
 				if ( naturalIdAccessStrategy == null && settings.isSecondLevelCacheEnabled() ) {
 					final CacheDataDescriptionImpl cacheDataDescription = CacheDataDescriptionImpl.decode( model );
-					
+
 					NaturalIdRegion naturalIdRegion = null;
 					try {
 						naturalIdRegion = regionFactory.buildNaturalIdRegion( naturalIdCacheRegionName, properties,
@@ -380,15 +385,15 @@ public void sessionFactoryClosed(SessionFactory factory) {
 								model.getEntityName()
 						);
 					}
-					
+
 					if (naturalIdRegion != null) {
 						naturalIdAccessStrategy = naturalIdRegion.buildAccessStrategy( regionFactory.getDefaultAccessType() );
 						entityAccessStrategies.put( naturalIdCacheRegionName, naturalIdAccessStrategy );
 						cacheAccess.addCacheRegion(  naturalIdCacheRegionName, naturalIdRegion );
 					}
 				}
 			}
-			
+
 			EntityPersister cp = persisterFactory.createEntityPersister(
 					model,
 					accessStrategy,
@@ -462,19 +467,13 @@ public void sessionFactoryClosed(SessionFactory factory) {
 				cfg.getSqlResultSetMappings().values(),
 				toProcedureCallMementos( cfg.getNamedProcedureCallMap(), cfg.getSqlResultSetMappings() )
 		);
-		imports = new HashMap<String,String>( cfg.getImports() );
 
 		// after *all* persisters and named queries are registered
-		Iterator iter = entityPersisters.values().iterator();
-		while ( iter.hasNext() ) {
-			final EntityPersister persister = ( ( EntityPersister ) iter.next() );
+		for ( EntityPersister persister : entityPersisters.values() ) {
 			persister.postInstantiate();
 			registerEntityNameResolvers( persister );
-
 		}
-		iter = collectionPersisters.values().iterator();
-		while ( iter.hasNext() ) {
-			final CollectionPersister persister = ( ( CollectionPersister ) iter.next() );
+		for ( CollectionPersister persister : collectionPersisters.values() ) {
 			persister.postInstantiate();
 		}
 
@@ -1070,6 +1069,7 @@ public void registerEntityNameResolver(EntityNameResolver resolver) {
 		entityNameResolvers.put( resolver, ENTITY_NAME_RESOLVER_MAP_VALUE );
 	}
 
+	@Override
 	public Iterable<EntityNameResolver> iterateEntityNameResolvers() {
 		return entityNameResolvers.keySet();
 	}

hibernate-core/src/main/java/org/hibernate/loader/GeneratedCollectionAliases.java

@@ -51,20 +51,22 @@ public GeneratedCollectionAliases(Map userProvidedAliases, CollectionPersister p
 		this.keyAliases = getUserProvidedAliases(
 				"key", 
 				persister.getKeyColumnAliases( suffix )
-			);
+		);
 
 		this.indexAliases = getUserProvidedAliases(
 				"index",
 				persister.getIndexColumnAliases( suffix )
-				);
+		);
 
-		this.elementAliases = getUserProvidedAliases( "element", 
+		this.elementAliases = getUserProvidedAliases(
+				"element",
 				persister.getElementColumnAliases( suffix )
-				);
+		);
 
-		this.identifierAlias = getUserProvidedAlias( "id", 
+		this.identifierAlias = getUserProvidedAlias(
+				"id",
 				persister.getIdentifierColumnAlias( suffix )
-				);
+		);
 	}
 
 	public GeneratedCollectionAliases(CollectionPersister persister, String string) {

hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java

@@ -24,6 +24,7 @@
 package org.hibernate.loader;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -91,6 +92,9 @@ protected JoinWalker(
 
 	}
 
+	public List getAssociations() {
+		return Collections.unmodifiableList( associations );
+	}
 
 	public String[] getCollectionSuffixes() {
 		return collectionSuffixes;

hibernate-core/src/main/java/org/hibernate/loader/entity/BatchingEntityLoaderBuilder.java

@@ -72,11 +72,19 @@ public UniqueEntityLoader buildLoader(
 			LoadQueryInfluencers influencers) {
 		if ( batchSize <= 1 ) {
 			// no batching
-			return new EntityLoader( persister, lockMode, factory, influencers );
+			return buildNonBatchingLoader( persister, lockMode, factory, influencers );
 		}
 		return buildBatchingLoader( persister, batchSize, lockMode, factory, influencers );
 	}
 
+	protected UniqueEntityLoader buildNonBatchingLoader(
+			OuterJoinLoadable persister,
+			LockMode lockMode,
+			SessionFactoryImplementor factory,
+			LoadQueryInfluencers influencers) {
+		return new EntityLoader( persister, lockMode, factory, influencers );
+	}
+
 	protected abstract UniqueEntityLoader buildBatchingLoader(
 			OuterJoinLoadable persister,
 			int batchSize,
@@ -103,11 +111,19 @@ public UniqueEntityLoader buildLoader(
 			LoadQueryInfluencers influencers) {
 		if ( batchSize <= 1 ) {
 			// no batching
-			return new EntityLoader( persister, lockOptions, factory, influencers );
+			return buildNonBatchingLoader( persister, lockOptions, factory, influencers );
 		}
 		return buildBatchingLoader( persister, batchSize, lockOptions, factory, influencers );
 	}
 
+	protected UniqueEntityLoader buildNonBatchingLoader(
+			OuterJoinLoadable persister,
+			LockOptions lockOptions,
+			SessionFactoryImplementor factory,
+			LoadQueryInfluencers influencers) {
+		return new EntityLoader( persister, lockOptions, factory, influencers );
+	}
+
 	protected abstract UniqueEntityLoader buildBatchingLoader(
 			OuterJoinLoadable persister,
 			int batchSize,