HPCC-9532 Fix code generator for reading dataset from another wuid

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

ecl/hql/hqlattr.cpp

@@ -1938,6 +1938,7 @@ bool isInlineTrivialDataset(IHqlExpression * expr)
             break;
         case no_workunit_dataset:
         case no_getresult:
+            return !expr->hasAttribute(wuidAtom);
         case no_null:
             return true;
         case no_getgraphresult:

ecl/hqlcpp/hqlcse.cpp

@@ -1272,9 +1272,14 @@ bool TableInvariantTransformer::isInvariant(IHqlExpression * expr)
     case no_preservemeta:
         invariant = isInvariant(expr->queryChild(0));
         break;
-    case no_constant:
     case no_workunit_dataset:
     case no_getresult:
+        if (expr->hasAttribute(wuidAtom))
+            invariant = isInvariant(expr->queryAttribute(wuidAtom));
+        else
+            invariant = true;
+        break;
+    case no_constant:
     case no_getgraphresult:
         invariant = true;
         break;

ecl/hqlcpp/hqlhtcpp.cpp

@@ -16034,7 +16034,7 @@ ABoundActivity * HqlCppTranslator::doBuildActivityWorkunitRead(BuildCtx & ctx, I
         }
 
         if (wuid)
-            doBuildVarStringFunction(instance->classctx, "getWUID", wuid->queryChild(0));
+            doBuildVarStringFunction(instance->startctx, "getWUID", wuid->queryChild(0));
 
         bool usesContents = false;
         if (isStored || (targetRoxie() && (sequenceValue >= 0)))

ecl/hqlcpp/hqlinline.cpp

@@ -90,6 +90,8 @@ static unsigned calcInlineFlags(BuildCtx * ctx, IHqlExpression * expr)
     switch (op)
     {
     case no_workunit_dataset:
+        if (expr->hasAttribute(wuidAtom))
+            return 0;
         return RETassign;
     case no_alias:
         {

ecl/hqlcpp/hqlttcpp.cpp

@@ -7049,10 +7049,11 @@ bool ScalarGlobalTransformer::isComplex(IHqlExpression * expr, bool checkGlobal)
 
     switch (expr->getOperator())
     {
-    case no_constant:
+    case no_workunit_dataset:
     case no_getresult:
+        return expr->hasAttribute(wuidAtom);
+    case no_constant:
     case no_globalscope:
-    case no_workunit_dataset:
     case no_libraryinput:
         return false;
     case no_cast: