HPCC-19428 Rename the xml tag used for remote child graphs and library graphs

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

ecl/hqlcpp/hqlhtcpp.cpp

@@ -8855,7 +8855,7 @@ ABoundActivity * HqlCppTranslator::doBuildActivityRemote(BuildCtx & ctx, IHqlExp
 
         //output dataset is result 0
         unique_id_t remoteId = buildRemoteSubgraph(func.ctx, dataset);
-        instance->addAttributeInt(WaIdAmbiguousGraph, remoteId);
+        instance->addAttributeInt(WaIdRemoteSubGraph, remoteId);
     }
 
     buildInstanceSuffix(instance);

ecl/hqlcpp/hqllib.cpp

@@ -564,7 +564,7 @@ ABoundActivity * HqlCppTranslator::doBuildActivityLibraryInstance(BuildCtx & ctx
     if (embeddedAttr)
         instance->addAttribute(WaIdGraph, embeddedAttr->queryChild(0));
     if (!targetHThor())
-        instance->addAttributeInt(WaIdAmbiguousGraph, nextActivityId());            // reserve an id...
+        instance->addAttributeInt(WaIdLibraryGraph, nextActivityId());            // reserve an id...
 
     // A debugging option to make it clearer how a library is being called.
     if (options.addLibraryInputsToGraph)

roxie/ccd/ccdquery.cpp

@@ -831,7 +831,7 @@ protected:
             {
                 LibraryCallFactoryExtra extra;
                 extra.maxOutputs = node.getPropInt("att[@name=\"_maxOutputs\"]/@value", 0);
-                extra.graphid = node.getPropInt("att[@name=\"_graphid\"]/@value", 0);
+                extra.graphid = node.getPropInt("att[@name=\"_libraryGraphId\"]/@value", 0);
                 extra.libraryName.set(node.queryProp("att[@name=\"libname\"]/@value"));
                 extra.interfaceHash = node.getPropInt("att[@name=\"_interfaceHash\"]/@value", 0);
                 extra.embedded = node.getPropBool("att[@name=\"embedded\"]/@value", false) ;
@@ -1840,7 +1840,7 @@ class CSlaveQueryFactory : public CQueryFactory
                     break;
                 case TAKremotegraph:
                     {
-                        unsigned graphId = node.getPropInt("att[@name=\"_graphid\"]/@value", 0);
+                        unsigned graphId = node.getPropInt("att[@name=\"_remoteSubGraph\"]/@value", 0);
                         newAct = createRoxieRemoteActivityFactory(node, subgraphId, *this, helperFactory, graphId);
                         break;
                     }

system/jlib/jptree-attrvalues.hpp

@@ -368,6 +368,7 @@
     "libfileservices.so",
     "lib_parselib",
     "libparselib.so",
+    "_libraryGraphId",
     "lib_stringlib",
     "libstringlib.so",
     "lib_unicodelib",
@@ -502,6 +503,7 @@
     "Recovery",
     "Relationship",
     "Relationships",
+    "_remoteSubGraph",
     "reqd",
     "result",
     "Result",