HPCC-31062 Changes following review

Signed-off-by: Shamser Ahmed <[email protected]>
hpcc-systems · Apr 17, 2024 · 65466a2 · 65466a2
1 parent b03c0cb
commit 65466a2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/common/workunit/workunit.cpp b/common/workunit/workunit.cpp
@@ -2692,11 +2692,7 @@ void StatisticsAggregator::loadExistingAggregates(const IConstWorkUnit &workunit
     StatsCollectionAggregatesLoader aggregatesLoader(statsCollection);
     Owned<IConstWUScopeIterator> iter = &workunit.getScopeIterator(filter);
     ForEach(*iter)
-    {
         iter->playProperties(aggregatesLoader);
-        if (iter->getScopeType()==SSToperation && !iter->nextSibling()) // don't descend operation.  only top operation scope needed
-            break;
-    }
 }
 
 // Replace the stats at the specified scope level

diff --git a/esp/scm/ws_fs.ecm b/esp/scm/ws_fs.ecm
@@ -735,7 +735,7 @@ ESPservice [
     ESPmethod [resp_xsl_default("/esp/xslt/showresult.xslt")] ShowResult(ShowResultRequest, ShowResultResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfuwu_search.xslt")] DFUWUSearch(DFUWUSearchRequest, DFUWUSearchResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfu_workunits.xslt")] GetDFUWorkunits(GetDFUWorkunits, GetDFUWorkunitsResponse);
-    ESPmethod [min_ver("1.26"), resp_xsl_default("/esp/xslt/dfu_wuid.xslt")] GetDFUWorkunit(GetDFUWorkunit, GetDFUWorkunitResponse);
+    ESPmethod [resp_xsl_default("/esp/xslt/dfu_wuid.xslt")] GetDFUWorkunit(GetDFUWorkunit, GetDFUWorkunitResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfu_progress.xslt")] GetDFUProgress(ProgressRequest, ProgressResponse);
 
     ESPmethod [resp_xsl_default("/esp/xslt/dfu_wuid.xslt")] CreateDFUWorkunit(CreateDFUWorkunit, CreateDFUWorkunitResponse);