Fix caching aggregate expressions with @parent usage

m-kuhn · m-kuhn · commit 1b2158d85487 · 2016-10-31T12:15:14.000+01:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -701,8 +701,12 @@ static QVariant fcnAggregate( const QVariantList& values, const QgsExpressionCon
   {
     QString cacheKey = QStringLiteral( "aggfcn:%1:%2:%3:%4" ).arg( vl->id(), QString::number( aggregate ), subExpression, parameters.filter );
 
+    QgsExpression subExp( subExpression );
     QgsExpression filterExp( parameters.filter );
-    if ( filterExp.referencedVariables().contains( "parent" ) || filterExp.referencedVariables().contains( QString() ) )
+    if ( filterExp.referencedVariables().contains( "parent" )
+         || filterExp.referencedVariables().contains( QString() )
+         || subExp.referencedVariables().contains( "parent" )
+         || subExp.referencedVariables().contains( QString() ) )
     {
       cacheKey += ':' + qHash( context->feature() );
     }

Original file line number	Diff line number	Diff line change
`@@ -701,8 +701,12 @@ static QVariant fcnAggregate( const QVariantList& values, const QgsExpressionCon`
`701`	`701`	`{`
`702`	`702`	`QString cacheKey = QStringLiteral( "aggfcn:%1:%2:%3:%4" ).arg( vl->id(), QString::number( aggregate ), subExpression, parameters.filter );`
`703`	`703`
	`704`	`+ QgsExpression subExp( subExpression );`
`704`	`705`	`QgsExpression filterExp( parameters.filter );`
`705`		`- if ( filterExp.referencedVariables().contains( "parent" ) \|\| filterExp.referencedVariables().contains( QString() ) )`
	`706`	`+ if ( filterExp.referencedVariables().contains( "parent" )`
	`707`	`+ \|\| filterExp.referencedVariables().contains( QString() )`
	`708`	`+ \|\| subExp.referencedVariables().contains( "parent" )`
	`709`	`+ \|\| subExp.referencedVariables().contains( QString() ) )`
`706`	`710`	`{`
`707`	`711`	`cacheKey += ':' + qHash( context->feature() );`
`708`	`712`	`}`