Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-7841 - Redesign Loader

This commit is contained in:
Gail Badner 2013-05-13 13:28:01 -07:00
parent 4620ff4b4f
commit 4dac8052d5
3 changed files with 22 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hibernate-core/src/main/java/org/hibernate/loader/plan/spi/EntityFetch.java
View File

@ -60,9 +60,6 @@ public class EntityFetch extends AbstractSingularAttributeFetch implements Entit
super( sessionFactory, lockMode, owner, ownerProperty, fetchStrategy ); super( sessionFactory, lockMode, owner, ownerProperty, fetchStrategy );
this.associationType = entityType; this.associationType = entityType;
// (EntityType) owner.retrieveFetchSourcePersister().getPropertyType( ownerProperty );
//this.associationType =
// (EntityType) owner.retrieveFetchSourcePersister().getPropertyType( getPropertyPath().getFullPath() );
this.persister = sessionFactory.getEntityPersister( associationType.getAssociatedEntityName() ); this.persister = sessionFactory.getEntityPersister( associationType.getAssociatedEntityName() );
} }

55
hibernate-core/src/main/java/org/hibernate/loader/plan/spi/build/AbstractLoadPlanBuilderStrategy.java
View File

@ -85,8 +85,6 @@ public abstract class AbstractLoadPlanBuilderStrategy implements LoadPlanBuilder
private ArrayDeque<FetchOwner> fetchOwnerStack = new ArrayDeque<FetchOwner>(); private ArrayDeque<FetchOwner> fetchOwnerStack = new ArrayDeque<FetchOwner>();
private ArrayDeque<CollectionReference> collectionReferenceStack = new ArrayDeque<CollectionReference>(); private ArrayDeque<CollectionReference> collectionReferenceStack = new ArrayDeque<CollectionReference>();
//private AbstractIdentifierAttributeCollector currentIdentifierAttributeCollector = null;
protected AbstractLoadPlanBuilderStrategy(SessionFactoryImplementor sessionFactory) { protected AbstractLoadPlanBuilderStrategy(SessionFactoryImplementor sessionFactory) {
this.sessionFactory = sessionFactory; this.sessionFactory = sessionFactory;
} }
@ -121,7 +119,6 @@ public abstract class AbstractLoadPlanBuilderStrategy implements LoadPlanBuilder
MDC.remove( MDC_KEY ); MDC.remove( MDC_KEY );
fetchOwnerStack.clear(); fetchOwnerStack.clear();
collectionReferenceStack.clear(); collectionReferenceStack.clear();
// currentIdentifierAttributeCollector = null;
} }
@Override @Override
@ -418,21 +415,10 @@ public abstract class AbstractLoadPlanBuilderStrategy implements LoadPlanBuilder
); );
} }
// If we are collecting fetches for the identifier then
// currentIdentifierAttributeCollector will be non-null.
// In that case, we do not want to continue walking the association, so
// don't push associationFetch to the stack.
//final boolean continueWalk = currentIdentifierAttributeCollector == null;
//if ( continueWalk && FetchOwner.class.isInstance( associationFetch) ) {
if ( FetchOwner.class.isInstance( associationFetch) ) { if ( FetchOwner.class.isInstance( associationFetch) ) {
pushToStack( (FetchOwner) associationFetch ); pushToStack( (FetchOwner) associationFetch );
} }
//if ( ! continueWalk ) {
// popFromStack();
//}
//return continueWalk;
return true; return true;
} }
@ -447,21 +433,7 @@ public abstract class AbstractLoadPlanBuilderStrategy implements LoadPlanBuilder
} }
private void pushToStack(FetchOwner fetchOwner) { private void pushToStack(FetchOwner fetchOwner) {
// if ( fetchOwner instanceof AbstractIdentifierAttributeCollector ) { log.trace( "Pushing fetch owner to stack : " + fetchOwner );
// if ( currentIdentifierAttributeCollector != null ) {
// throw new WalkingException(
// String.format(
// "An AbstractIdentifierAttributeCollector is already being processed: %s",
// currentIdentifierAttributeCollector
// )
// );
// }
// currentIdentifierAttributeCollector = (AbstractIdentifierAttributeCollector) fetchOwner;
// log.trace( "Pushing AbstractIdentifierAttributeCollector fetch owner to stack : " + fetchOwner );
// }
// else {
log.trace( "Pushing fetch owner to stack : " + fetchOwner );
// }
mdcStack().push( fetchOwner.getPropertyPath() ); mdcStack().push( fetchOwner.getPropertyPath() );
fetchOwnerStack.addFirst( fetchOwner ); fetchOwnerStack.addFirst( fetchOwner );
} }
@ -472,30 +444,7 @@ public abstract class AbstractLoadPlanBuilderStrategy implements LoadPlanBuilder
private FetchOwner popFromStack() { private FetchOwner popFromStack() {
final FetchOwner last = fetchOwnerStack.removeFirst(); final FetchOwner last = fetchOwnerStack.removeFirst();
// if ( last instanceof AbstractIdentifierAttributeCollector ) { log.trace( "Popped fetch owner from stack : " + last );
// if ( currentIdentifierAttributeCollector == null ) {
// throw new WalkingException(
// String.format(
// "Popped fetch owner was an AbstractIdentifierAttributeCollector [%s], but none in process (currentIdentifierAttributeCollector == null)",
// last
// )
// );
// }
// else if ( currentIdentifierAttributeCollector != last ) {
// throw new WalkingException(
// String.format(
// "Expected popped fetch owner to be [%s], but instead it was [%s])",
// currentIdentifierAttributeCollector,
// last
// )
// );
// }
// currentIdentifierAttributeCollector = null;
// log.trace( "Popped AbstractIdentifierAttributeCollector fetch owner from stack : " + last );
// }
// else {
log.trace( "Popped fetch owner from stack : " + last );
// }
mdcStack().pop(); mdcStack().pop();
if ( FetchStackAware.class.isInstance( last ) ) { if ( FetchStackAware.class.isInstance( last ) ) {
( (FetchStackAware) last ).poppedFromStack(); ( (FetchStackAware) last ).poppedFromStack();

34
hibernate-core/src/main/java/org/hibernate/persister/walking/spi/MetadataDrivenModelGraphVisitor.java
View File

@ -123,10 +123,10 @@ public class MetadataDrivenModelGraphVisitor {
log.debug( "Visiting attribute path : " + subPath.getFullPath() ); log.debug( "Visiting attribute path : " + subPath.getFullPath() );
final boolean continueWalk; final boolean continueWalk;
if ( attributeDefinition.getType().isAssociationType() ) { if ( attributeDefinition.getType().isAssociationType() &&
continueWalk = isDuplicateAssociationKey( ( (AssociationAttributeDefinition) attributeDefinition ).getAssociationKey() ) ) {
! isDuplicateAssociationKey( ( (AssociationAttributeDefinition) attributeDefinition ).getAssociationKey() ) && log.debug( "Property path deemed to be circular : " + subPath.getFullPath() );
strategy.startingAttribute( attributeDefinition ); continueWalk = false;
} }
else { else {
continueWalk = strategy.startingAttribute( attributeDefinition ); continueWalk = strategy.startingAttribute( attributeDefinition );
@ -152,10 +152,7 @@ public class MetadataDrivenModelGraphVisitor {
private void visitAssociation(AssociationAttributeDefinition attribute) { private void visitAssociation(AssociationAttributeDefinition attribute) {
// todo : do "too deep" checks; but see note about adding depth to PropertyPath // todo : do "too deep" checks; but see note about adding depth to PropertyPath
if ( !addAssociationKey( attribute.getAssociationKey() ) ) { addAssociationKey( attribute.getAssociationKey() );
log.debug( "Property path deemed to be circular : " + currentPropertyPath.getFullPath() );
return;
}
if ( attribute.isCollection() ) { if ( attribute.isCollection() ) {
visitCollectionDefinition( attribute.toCollectionDefinition() ); visitCollectionDefinition( attribute.toCollectionDefinition() );
@ -227,17 +224,26 @@ public class MetadataDrivenModelGraphVisitor {
private final Set<AssociationKey> visitedAssociationKeys = new HashSet<AssociationKey>(); private final Set<AssociationKey> visitedAssociationKeys = new HashSet<AssociationKey>();
/** /**
* Add association key. * Add association key to indicate the association is being visited.
* @param associationKey - the association key. * @param associationKey - the association key.
* @return true, if the association key was added; * @throws WalkingException if the association with the specified association key
* false, otherwise (indicating the association key was already visited). * has already been visited.
*/ */
protected boolean addAssociationKey(AssociationKey associationKey) { protected void addAssociationKey(AssociationKey associationKey) {
return visitedAssociationKeys.add( associationKey ); if ( ! visitedAssociationKeys.add( associationKey ) ) {
throw new WalkingException(
String.format( "Association has already been visited: %s", associationKey )
);
}
} }
/**
* Has an association with the specified key been visited already?
* @param associationKey - the association key.
* @return true, if the association with the specified association key has already been visited;
* false, otherwise.
*/
protected boolean isDuplicateAssociationKey(AssociationKey associationKey) { protected boolean isDuplicateAssociationKey(AssociationKey associationKey) {
return visitedAssociationKeys.contains( associationKey ); return visitedAssociationKeys.contains( associationKey );
} }
} }