HHH-18378 Check where clause before reusing existing joins for fetch

Author: mbellade

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java

@@ -63,6 +63,7 @@
 import org.hibernate.query.sqm.tree.from.SqmJoin;
 import org.hibernate.query.sqm.tree.from.SqmQualifiedJoin;
 import org.hibernate.query.sqm.tree.from.SqmRoot;
+import org.hibernate.query.sqm.tree.predicate.SqmWhereClause;
 import org.hibernate.query.sqm.tree.select.SqmOrderByClause;
 import org.hibernate.query.sqm.tree.select.SqmQueryPart;
 import org.hibernate.query.sqm.tree.select.SqmQuerySpec;
@@ -88,6 +89,7 @@
 
 import static java.util.stream.Collectors.toList;
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
+import static org.hibernate.internal.util.collections.CollectionHelper.arrayList;
 import static org.hibernate.query.sqm.tree.jpa.ParameterCollector.collectParameters;
 
 /**
@@ -215,6 +217,15 @@ public static boolean isFkOptimizationAllowed(SqmPath<?> sqmPath) {
 		return false;
 	}
 
+	public static List<NavigablePath> getWhereClauseNavigablePaths(SqmQuerySpec<?> querySpec) {
+		final SqmWhereClause where = querySpec.getWhereClause();
+		if ( where == null || where.getPredicate() == null ) {
+			return Collections.emptyList();
+		}
+
+		return collectNavigablePaths( List.of( where.getPredicate() ) );
+	}
+
 	public static List<NavigablePath> getGroupByNavigablePaths(SqmQuerySpec<?> querySpec) {
 		final List<SqmExpression<?>> expressions = querySpec.getGroupByClauseExpressions();
 		if ( expressions.isEmpty() ) {
@@ -238,7 +249,7 @@ public static List<NavigablePath> getOrderByNavigablePaths(SqmQuerySpec<?> query
 	}
 
 	private static List<NavigablePath> collectNavigablePaths(final List<SqmExpression<?>> expressions) {
-		final List<NavigablePath> navigablePaths = new ArrayList<>( expressions.size() );
+		final List<NavigablePath> navigablePaths = arrayList( expressions.size() );
 		final SqmPathVisitor pathVisitor = new SqmPathVisitor( path -> navigablePaths.add( path.getNavigablePath() ) );
 		for ( final SqmExpression<?> expression : expressions ) {
 			if ( expression instanceof SqmAliasedNodeRef ) {

hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java

@@ -8192,7 +8192,10 @@ else if ( getLoadQueryInfluencers().hasEnabledFetchProfiles() ) {
 									joinProducer,
 									joinProducer.determineSqlJoinType( lhs, null, true )
 							);
-							if ( compatibleTableGroup == null ) {
+							final SqmQueryPart<?> queryPart = getCurrentSqmQueryPart();
+							if ( compatibleTableGroup == null
+									// If the compatible table group is used in the where clause it cannot be reused for fetching
+									|| ( queryPart != null && queryPart.getFirstQuerySpec().whereClauseContains( compatibleTableGroup.getNavigablePath(), this ) ) ) {
 								final TableGroupJoin tableGroupJoin = joinProducer.createTableGroupJoin(
 										fetchablePath,
 										lhs,

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java

@@ -629,15 +629,26 @@ public void appendHqlString(StringBuilder sb) {
 		super.appendHqlString( sb );
 	}
 
+	@Internal
+	public boolean whereClauseContains(NavigablePath navigablePath, SqmToSqlAstConverter sqlAstConverter) {
+		if ( whereClause == null ) {
+			return false;
+		}
+		return isSameOrParent(
+				navigablePath,
+				sqlAstConverter.resolveMetadata( this, SqmUtil::getWhereClauseNavigablePaths )
+		);
+	}
+
 	@Internal
 	public boolean groupByClauseContains(NavigablePath navigablePath, SqmToSqlAstConverter sqlAstConverter) {
 		if ( groupByClauseExpressions.isEmpty() ) {
 			return false;
 		}
-		return navigablePathsContain( sqlAstConverter.resolveMetadata(
-				this,
-				SqmUtil::getGroupByNavigablePaths
-		), navigablePath );
+		return isSameOrChildren(
+				navigablePath,
+				sqlAstConverter.resolveMetadata( this, SqmUtil::getGroupByNavigablePaths )
+		);
 	}
 
 	@Internal
@@ -646,18 +657,27 @@ public boolean orderByClauseContains(NavigablePath navigablePath, SqmToSqlAstCon
 		if ( orderByClause == null || orderByClause.getSortSpecifications().isEmpty() ) {
 			return false;
 		}
-		return navigablePathsContain( sqlAstConverter.resolveMetadata(
-				this,
-				SqmUtil::getOrderByNavigablePaths
-		), navigablePath );
+		return isSameOrChildren(
+				navigablePath,
+				sqlAstConverter.resolveMetadata( this, SqmUtil::getOrderByNavigablePaths )
+		);
 	}
 
-	private boolean navigablePathsContain(List<NavigablePath> navigablePaths, NavigablePath navigablePath) {
+	private boolean isSameOrChildren(NavigablePath navigablePath, List<NavigablePath> navigablePaths) {
 		for ( NavigablePath path : navigablePaths ) {
 			if ( path.isParentOrEqual( navigablePath ) ) {
 				return true;
 			}
 		}
 		return false;
 	}
+
+	private boolean isSameOrParent(NavigablePath navigablePath, List<NavigablePath> navigablePaths) {
+		for ( NavigablePath path : navigablePaths ) {
+			if ( navigablePath.isParentOrEqual( path ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
 }