fix typo in cache key

qgis · Oct 16, 2020 · 0170436 · 0170436
1 parent e1319a1
commit 0170436
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -907,7 +907,7 @@ static QVariant fcnAggregateGeneric( QgsAggregateCalculator::Aggregate aggregate
   QString cacheKey;
   if ( !isStatic )
   {
-    cacheKey = QStringLiteral( "aggfcn:%1:%2:%3:%4:%5%6:%7" ).arg( vl->id(), QString::number( aggregate ), subExpression, parameters.filter,
+    cacheKey = QStringLiteral( "agg:%1:%2:%3:%4:%5%6:%7" ).arg( vl->id(), QString::number( aggregate ), subExpression, parameters.filter,
                QString::number( context->feature().id() ), QString( qHash( context->feature() ) ), orderBy );
   }
   else

diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -2048,8 +2048,8 @@ class TestQgsExpression: public QObject
 
         // also test for generic aggregates
         exp = QString( "with_variable('my_var',\"col1\", sum(expression:=\"col1\", filter:=\"col1\"=@my_var))" );
-        res = exp.evaluate( &context ).toInt();
-        QCOMPARE( res, f.attribute( "col1" ).toInt() );
+        int res2 = exp.evaluate( &context ).toInt();
+        QCOMPARE( res2, f.attribute( "col1" ).toInt() );
       }
     }