HPCC-28757 Changes following review

Signed-off-by: Shamser Ahmed <[email protected]>
hpcc-systems · May 3, 2024 · 1f0dab2 · 1f0dab2
1 parent 8a74c01
commit 1f0dab2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/system/jlib/jstatcodes.h b/system/jlib/jstatcodes.h
@@ -302,7 +302,7 @@ enum StatisticKind
     StSizeContinuationData,
     StNumContinuationRequests,
     StNumFailures,
-    StSizePeakSubgraphTempDisk,
+    StSizePeakSubgraphTemp,
     StSizePeakEphemeralDisk,
     StMax,
 

diff --git a/system/jlib/jstats.cpp b/system/jlib/jstats.cpp
@@ -974,7 +974,7 @@ static const constexpr StatisticMeta statsMetaData[StMax] = {
     { SIZESTAT(ContinuationData), "The total size of continuation data sent from agent to the server\nA large number may indicate a poor filter, or merging from many different index locations" },
     { NUMSTAT(ContinuationRequests), "The number of times the agent indicated there was more data to be returned" },
     { NUMSTAT(Failures), "The number of times a query has failed" },
-    { PEAKSIZESTAT(PeakSubgraphTempDisk), "High water mark for intra-graph temp files"},
+    { PEAKSIZESTAT(PeakSubgraphTemp), "High water mark for intra-graph temp files"},
     { PEAKSIZESTAT(PeakEphemeralDisk), "High water mark for emphemeral storage use"},
 };
 

diff --git a/thorlcr/graph/thgraphslave.cpp b/thorlcr/graph/thgraphslave.cpp
@@ -1299,7 +1299,7 @@ bool CSlaveGraph::serializeStats(MemoryBuffer &mb)
             peakTempSize = activeTempSize;
     }
     if (peakTempSize)
-        stats.mergeStatistic(StSizePeakSubgraphTempDisk, peakTempSize);
+        stats.mergeStatistic(StSizePeakSubgraphTemp, peakTempSize);
     if (peakTempSize + sizeGraphSpill)
         stats.mergeStatistic(StSizePeakEphemeralDisk, peakTempSize + sizeGraphSpill);
     stats.serialize(mb);

diff --git a/thorlcr/thorutil/thormisc.cpp b/thorlcr/thorutil/thormisc.cpp
@@ -88,7 +88,7 @@ const StatisticsMapping joinActivityStatistics({StNumLeftRows, StNumRightRows},
 const StatisticsMapping diskReadActivityStatistics({StNumDiskRowsRead, }, basicActivityStatistics, diskReadRemoteStatistics);
 const StatisticsMapping diskWriteActivityStatistics({StPerReplicated}, basicActivityStatistics, diskWriteRemoteStatistics);
 const StatisticsMapping sortActivityStatistics({}, basicActivityStatistics, spillStatistics);
-const StatisticsMapping graphStatistics({StNumExecutions, StSizeSpillFile, StSizeGraphSpill, StSizePeakSubgraphTempDisk, StSizePeakEphemeralDisk, StTimeUser, StTimeSystem, StNumContextSwitches, StSizeMemory, StSizePeakMemory, StSizeRowMemory, StSizePeakRowMemory}, basicActivityStatistics);
+const StatisticsMapping graphStatistics({StNumExecutions, StSizeSpillFile, StSizeGraphSpill, StSizePeakSubgraphTemp, StSizePeakEphemeralDisk, StTimeUser, StTimeSystem, StNumContextSwitches, StSizeMemory, StSizePeakMemory, StSizeRowMemory, StSizePeakRowMemory}, basicActivityStatistics);
 const StatisticsMapping diskReadPartStatistics({StNumDiskRowsRead}, diskReadRemoteStatistics);
 const StatisticsMapping indexDistribActivityStatistics({}, basicActivityStatistics, jhtreeCacheStatistics);
 const StatisticsMapping soapcallActivityStatistics({}, basicActivityStatistics, soapcallStatistics);