Always cache values and add fid to feature hash

qgis · Oct 27, 2016 · c2b8424 · c2b8424
1 parent f80a33b
commit c2b8424
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -697,8 +697,7 @@ static QVariant fcnAggregate( const QVariantList& values, const QgsExpressionCon
     subContext.appendScope( subScope );
     result = vl->aggregate( aggregate, subExpression, parameters, &subContext, &ok );
 
-    if ( ok )
-      context->setCachedValue( cacheKey, result );
+    context->setCachedValue( cacheKey, result );
   }
   else
   {

diff --git a/src/core/qgsfeature.cpp b/src/core/qgsfeature.cpp
@@ -323,6 +323,7 @@ uint qHash( const QgsFeature& key, uint seed )
   }
 
   hash ^= qHash( key.geometry().exportToWkt() );
+  hash ^= qHash( key.id() );
 
   return hash;
 }