Browse Source

HPCC-12515 Minor changes following review

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 10 years ago
parent
commit
eebb5a8e5c
2 changed files with 3 additions and 2 deletions
  1. 1 0
      ecl/hqlcpp/hqlcpputil.cpp
  2. 2 2
      ecl/hqlcpp/hqlinline.cpp

+ 1 - 0
ecl/hqlcpp/hqlcpputil.cpp

@@ -478,6 +478,7 @@ bool worthGeneratingRowAsSingleActivity(IHqlExpression * expr)
         case no_if:
             return worthGeneratingRowAsSingleActivity(expr->queryChild(1)) && worthGeneratingRowAsSingleActivity(expr->queryChild(2));
         default:
+            //Do not generate no_getgraph result - better as separate activities
             return false;
         }
         expr = expr->queryChild(0);

+ 2 - 2
ecl/hqlcpp/hqlinline.cpp

@@ -860,7 +860,7 @@ static GraphLocalisation doGetGraphLocalisation(IHqlExpression * expr, bool opti
     return ret;
 }
 
-static GraphLocalisation queryGetGraphLocalisation(IHqlExpression * expr, bool optimizeParentAccess)
+static GraphLocalisation getGraphLocalisation(IHqlExpression * expr, bool optimizeParentAccess)
 {
     TransformMutexBlock lock;
     return doGetGraphLocalisation(expr, optimizeParentAccess);
@@ -877,7 +877,7 @@ GraphLocalisation HqlCppTranslator::getGraphLocalisation(IHqlExpression * expr,
     if (targetThor() && !isInsideChildQuery)
         return GraphNonLocal;
 
-    return queryGetGraphLocalisation(expr, options.optimizeParentAccess);
+    return ::getGraphLocalisation(expr, options.optimizeParentAccess);
 }
 
 bool HqlCppTranslator::isNeverDistributed(IHqlExpression * expr)