HHH-14567 Do not reuse query plans after session filters changed

yrodiere · Sanne · commit 0e2b19a6e2e0 · 2021-04-26T12:04:25.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryImpl.java
@@ -92,7 +92,9 @@ protected void appendQueryPlanToQueryParameters(
 		if ( queryPlan != null ) {
 			queryParameters.setQueryPlan( queryPlan );
 		}
-		else if ( hql.equals( getQueryString() ) ) {
+		else if ( hql.equals( getQueryString() )
+				&& getQueryPlan().getEnabledFilterNames()
+						.equals( getProducer().getLoadQueryInfluencers().getEnabledFilters().values() ) ) {
 			queryParameters.setQueryPlan( getQueryPlan() );
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,9 @@ protected void appendQueryPlanToQueryParameters(`
`92`	`92`	`if ( queryPlan != null ) {`
`93`	`93`	`queryParameters.setQueryPlan( queryPlan );`
`94`	`94`	`}`
`95`		`- else if ( hql.equals( getQueryString() ) ) {`
	`95`	`+ else if ( hql.equals( getQueryString() )`
	`96`	`+ && getQueryPlan().getEnabledFilterNames()`
	`97`	`+ .equals( getProducer().getLoadQueryInfluencers().getEnabledFilters().values() ) ) {`
`96`	`98`	`queryParameters.setQueryPlan( getQueryPlan() );`
`97`	`99`	`}`
`98`	`100`	`}`