Skip right-hand side of AND/OR expression if we already know result

qgis · Dec 4, 2019 · 11d5275 · 11d5275
1 parent f341b34
commit 11d5275
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/core/expression/qgsexpressionnodeimpl.cpp b/src/core/expression/qgsexpressionnodeimpl.cpp
@@ -298,14 +298,22 @@ QVariant QgsExpressionNodeBinaryOperator::evalNode( QgsExpression *parent, const
 
     case boAnd:
     {
-      QgsExpressionUtils::TVL tvlL = QgsExpressionUtils::getTVLValue( vL, parent ), tvlR = QgsExpressionUtils::getTVLValue( vR, parent );
+      QgsExpressionUtils::TVL tvlL = QgsExpressionUtils::getTVLValue( vL, parent );
+      ENSURE_NO_EVAL_ERROR;
+      if ( tvlL == QgsExpressionUtils::False )
+        return TVL_False;  // shortcut -- no need to evaluate right-hand side
+      QgsExpressionUtils::TVL tvlR = QgsExpressionUtils::getTVLValue( vR, parent );
       ENSURE_NO_EVAL_ERROR;
       return  QgsExpressionUtils::tvl2variant( QgsExpressionUtils::AND[tvlL][tvlR] );
     }
 
     case boOr:
     {
-      QgsExpressionUtils::TVL tvlL = QgsExpressionUtils::getTVLValue( vL, parent ), tvlR = QgsExpressionUtils::getTVLValue( vR, parent );
+      QgsExpressionUtils::TVL tvlL = QgsExpressionUtils::getTVLValue( vL, parent );
+      ENSURE_NO_EVAL_ERROR;
+      if ( tvlL == QgsExpressionUtils::True )
+        return TVL_True;  // shortcut -- no need to evaluate right-hand side
+      QgsExpressionUtils::TVL tvlR = QgsExpressionUtils::getTVLValue( vR, parent );
       ENSURE_NO_EVAL_ERROR;
       return  QgsExpressionUtils::tvl2variant( QgsExpressionUtils::OR[tvlL][tvlR] );
     }