Merge pull request #15601 from shamser/issue26868

HPCC-26868 WUQuery to return cost fields

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>

common/workunit/workunit.cpp

@@ -3659,6 +3659,9 @@ public:
         appvalues.loadBranch(&p,"Application");
         totalThorTime = (unsigned)nanoToMilli(extractTimeCollatable(p.queryProp("@totalThorTime"), nullptr));
         _isProtected = p.getPropBool("@protected", false);
+
+        costExecute = p.getPropInt64("@costExecute");
+        costFileAccess = p.getPropInt64("@costFileAccess");
     }
     virtual const char *queryWuid() const { return wuid.str(); }
     virtual const char *queryUser() const { return user.str(); }
@@ -3673,6 +3676,8 @@ public:
     virtual const char *queryPriorityDesc() const { return getEnumText(priority, priorityClasses); }
     virtual int getPriorityLevel() const { return priorityLevel; }
     virtual bool isProtected() const { return _isProtected; }
+    virtual cost_type getExecuteCost() const { return costExecute; }
+    virtual cost_type getFileAccessCost() const { return costFileAccess; }
     virtual IJlibDateTime & getTimeScheduled(IJlibDateTime & val) const
     {
         if (timeScheduled.length())
@@ -3691,6 +3696,8 @@ protected:
     WUPriorityClass priority;
     int priorityLevel;
     bool _isProtected;
+    unsigned __int64 costExecute;
+    unsigned __int64 costFileAccess;
 };
 
 extern IConstWorkUnitInfo *createConstWorkUnitInfo(IPropertyTree &p)
@@ -4342,9 +4349,9 @@ public:
             { return c->getAbortBy(str); }
     virtual unsigned __int64 getAbortTimeStamp() const
             { return c->getAbortTimeStamp(); }
-    virtual unsigned __int64 getExecuteCost() const
+    virtual cost_type getExecuteCost() const
             { return c->getExecuteCost(); }
-    virtual unsigned __int64 getFileAccessCost() const
+    virtual cost_type getFileAccessCost() const
             { return c->getFileAccessCost(); }
     virtual void import(IPropertyTree *wuTree, IPropertyTree *graphProgressTree)
             { return c->import(wuTree, graphProgressTree); }
@@ -8187,6 +8194,8 @@ void CLocalWorkUnit::copyWorkUnit(IConstWorkUnit *cached, bool copyStats, bool a
     p->setProp("@eclVersion", fromP->queryProp("@eclVersion"));
     p->setProp("@totalThorTime", fromP->queryProp("@totalThorTime"));
     p->setProp("@hash", fromP->queryProp("@hash"));
+    p->setProp("@executeCost", fromP->queryProp("@executeCost"));
+    p->setProp("@fileAccessCost", fromP->queryProp("@fileAccessCost"));
     p->setPropBool("@cloneable", true);
     p->setPropBool("@isClone", true);
     resetWorkflow();  // the source Workflow section may have had some parts already executed...
@@ -8653,6 +8662,13 @@ void CLocalWorkUnit::setStatistic(StatisticCreatorType creatorType, const char *
         formatTimeCollatable(t, totalTime, false);
         p->setProp("@totalThorTime", t);
     }
+    if (scopeType == SSTglobal)
+    {
+        if (kind == StCostExecute)
+            p->setPropInt64("@costExecute", value);
+        else if (kind == StCostFileAccess)
+            p->setPropInt64("@costFileAccess", value);
+    }
 }
 
 void CLocalWorkUnit::_loadStatistics() const
@@ -12302,30 +12318,16 @@ unsigned __int64 CLocalWorkUnit::getAbortTimeStamp() const
     return p->getPropInt64("Tracing/AbortTimeStamp", 0);
 }
 
-unsigned __int64 CLocalWorkUnit::getExecuteCost() const
+cost_type CLocalWorkUnit::getExecuteCost() const
 {
     CriticalBlock block(crit);
-    Owned<IPropertyTreeIterator> iter = p->getElements("./Statistics/Statistic[@kind='CostExecute'][@scope='']");
-    cost_type totalCost = 0;
-    ForEach(*iter)
-    {
-        IPropertyTree &stat = iter->query();
-        totalCost += stat.getPropInt64("@value");
-    }
-    return totalCost;
+    return p->getPropInt64("@costExecute");
 }
 
-unsigned __int64 CLocalWorkUnit::getFileAccessCost() const
+cost_type CLocalWorkUnit::getFileAccessCost() const
 {
     CriticalBlock block(crit);
-    Owned<IPropertyTreeIterator> iter = p->getElements("./Statistics/Statistic[@kind='CostFileAccess'][@scope='']");
-    cost_type totalCost = 0;
-    ForEach(*iter)
-    {
-        IPropertyTree &stat = iter->query();
-        totalCost += stat.getPropInt64("@value");
-    }
-    return totalCost;
+    return p->getPropInt64("@costFileAccess");
 }
 
 #if 0

common/workunit/workunit.hpp

@@ -1191,6 +1191,8 @@ interface IConstWorkUnitInfo : extends IInterface
     virtual const char *queryPriorityDesc() const = 0;
     virtual int getPriorityLevel() const = 0;
     virtual bool isProtected() const = 0;
+    virtual cost_type getExecuteCost() const = 0;
+    virtual cost_type getFileAccessCost() const = 0;
     virtual IJlibDateTime & getTimeScheduled(IJlibDateTime & val) const = 0;
 
     virtual unsigned getTotalThorTime() const = 0;
@@ -1300,8 +1302,8 @@ interface IConstWorkUnit : extends IConstWorkUnitInfo
     virtual void clearGraphProgress() const = 0;
     virtual IStringVal & getAbortBy(IStringVal & str) const = 0;
     virtual unsigned __int64 getAbortTimeStamp() const = 0;
-    virtual unsigned __int64 getExecuteCost() const = 0;
-    virtual unsigned __int64 getFileAccessCost() const = 0;
+    virtual cost_type getExecuteCost() const = 0;
+    virtual cost_type getFileAccessCost() const = 0;
 };
 
 

common/workunit/workunit.ipp

@@ -306,8 +306,8 @@ public:
     virtual unsigned getTotalThorTime() const;
     virtual IStringVal & getAbortBy(IStringVal & str) const;
     virtual unsigned __int64 getAbortTimeStamp() const;
-    virtual unsigned __int64 getExecuteCost() const;
-    virtual unsigned __int64 getFileAccessCost() const;
+    virtual cost_type getExecuteCost() const;
+    virtual cost_type getFileAccessCost() const;
     void clearExceptions(const char *source=nullptr);
     void commit();
     IWUException *createException();

esp/services/ws_workunits/ws_workunitsHelpers.cpp

@@ -994,6 +994,10 @@ void WsWuInfo::getCommon(IEspECLWorkunit &info, unsigned long flags)
     cw->getTimeScheduled(dt);
     if(dt.isValid())
         info.setDateTimeScheduled(dt.getString(s).str());
+    if (version>=1.84)
+        info.setExecuteCost(cost_type2money(cw->getExecuteCost()));
+    if (version>=1.85)
+        info.setFileAccessCost(cost_type2money(cw->getFileAccessCost()));
 }
 
 void WsWuInfo::setWUAbortTime(IEspECLWorkunit &info, unsigned __int64 abortTS)

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -1983,6 +1983,10 @@ void doWUQueryWithSort(IEspContext &context, IEspWUQueryRequest & req, IEspWUQue
             }
             info->setApplicationValues(av);
         }
+        if (version>=1.84)
+            info->setExecuteCost(cost_type2money(cw.getExecuteCost()));
+        if (version>=1.85)
+            info->setFileAccessCost(cost_type2money(cw.getFileAccessCost()));
         results.append(*info.getClear());
     }