Merge pull request #18299 from ghalliday/issue30588

HPCC-30588 Publish descriptions for each of the statistic types Reviewed-By: Jim DeFabia <[email protected]> Reviewed-by: Gordon Smith <[email protected]> Reviewed-by: Jake Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Feb 22, 2024 · b713bbd · b713bbd
2 parents 7c47138 + b0f936e
commit b713bbd
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 150 deletions.
diff --git a/ecl/eclcc/eclcc.cpp b/ecl/eclcc/eclcc.cpp
@@ -1602,9 +1602,9 @@ void EclCC::processSingleQuery(const EclRepositoryManager & localRepositoryManag
     {
         const BlockIoStats summaryIo = systemIoFinishInfo->querySummaryStats() - systemIoStartInfo->querySummaryStats();
         if (summaryIo.rd_sectors)
-            updateWorkunitStat(instance.wu, SSTcompilestage, scopeName, StSizeOsDiskRead, NULL, summaryIo.rd_sectors * summaryIo.getSectorSize());
+            updateWorkunitStat(instance.wu, SSTcompilestage, scopeName, StSizeDiskRead, NULL, summaryIo.rd_sectors * summaryIo.getSectorSize());
         if (summaryIo.wr_sectors)
-            updateWorkunitStat(instance.wu, SSTcompilestage, scopeName, StSizeOsDiskWrite, NULL, summaryIo.wr_sectors * summaryIo.getSectorSize());
+            updateWorkunitStat(instance.wu, SSTcompilestage, scopeName, StSizeDiskWrite, NULL, summaryIo.wr_sectors * summaryIo.getSectorSize());
     }
 }
 

diff --git a/esp/scm/ws_workunits.ecm b/esp/scm/ws_workunits.ecm
@@ -25,7 +25,7 @@ EspInclude(ws_workunits_queryset_req_resp);
 
 ESPservice [
     auth_feature("DEFERRED"), //This declares that the method logic handles feature level authorization
-    version("1.98"), default_client_version("1.98"), cache_group("ESPWsWUs"),
+    version("1.99"), default_client_version("1.99"), cache_group("ESPWsWUs"),
     noforms,exceptions_inline("./smc_xslt/exceptions.xslt"),use_method_name] WsWorkunits
 {
     ESPmethod [cache_seconds(60), resp_xsl_default("/esp/xslt/workunits.xslt")]     WUQuery(WUQueryRequest, WUQueryResponse);

diff --git a/esp/scm/ws_workunits_struct.ecm b/esp/scm/ws_workunits_struct.ecm
@@ -864,6 +864,7 @@ ESPStruct WUDetailsMetaProperty
 {
     string Name;
     ESPenum WUDetailsAttrValueType ValueType;
+    [min_ver("1.99")] string Description;
 };
 
 ESPStruct WUDetailsActivityInfo

diff --git a/esp/services/ws_workunits/ws_workunitsService.cpp b/esp/services/ws_workunits/ws_workunitsService.cpp
@@ -4234,7 +4234,7 @@ bool CWsWorkunitsEx::onWUAnalyseHotspot(IEspContext &context, IEspWUAnalyseHotsp
 }
 
 
-static void getWUDetailsMetaProperties(IArrayOf<IEspWUDetailsMetaProperty> & properties)
+static void getWUDetailsMetaProperties(double version, IArrayOf<IEspWUDetailsMetaProperty> & properties)
 {
     for (unsigned sk=StKindAll+1; sk<StMax;++sk)
     {
@@ -4244,6 +4244,8 @@ static void getWUDetailsMetaProperties(IArrayOf<IEspWUDetailsMetaProperty> & pro
             Owned<IEspWUDetailsMetaProperty> property = createWUDetailsMetaProperty("","");
             property->setName(s);
             property->setValueType(CWUDetailsAttrValueType_Single);
+            if (version >= 1.99)
+                property->setDescription(queryStatisticDescription((StatisticKind)sk));
             properties.append(*property.getClear());
         }
     }
@@ -4301,8 +4303,10 @@ bool CWsWorkunitsEx::onWUDetailsMeta(IEspContext &context, IEspWUDetailsMetaRequ
 {
     try
     {
+        double version = context.getClientVersion();
+
         IArrayOf<IEspWUDetailsMetaProperty> properties;
-        getWUDetailsMetaProperties(properties);
+        getWUDetailsMetaProperties(version, properties);
         resp.setProperties(properties);
 
         StringArray scopeTypes;
@@ -4339,7 +4343,7 @@ class WUDetailsMetaTest : public CppUnit::TestFixture
         // These calls also check that all the calls required to build WUDetailsMeta
         // are successful.
         IArrayOf<IEspWUDetailsMetaProperty> properties;
-        getWUDetailsMetaProperties(properties);
+        getWUDetailsMetaProperties(1.98, properties);
         unsigned expectedOrdinalityProps = StMax - (StKindAll + 1) + (WaMax-WaKind);
         ASSERT(properties.ordinality()==expectedOrdinalityProps);