Skip to content

Commit

Permalink
Always cache values and add fid to feature hash
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Oct 27, 2016
1 parent f80a33b commit c2b8424
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 1 addition & 2 deletions src/core/qgsexpression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsfeature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ uint qHash( const QgsFeature& key, uint seed )
}

hash ^= qHash( key.geometry().exportToWkt() );
hash ^= qHash( key.id() );

return hash;
}

0 comments on commit c2b8424

Please sign in to comment.