HPCC-28757 Change following review

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

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/system/jlib/jstatcodes.h b/system/jlib/jstatcodes.h
@@ -302,8 +302,8 @@ enum StatisticKind
     StSizeContinuationData,
     StNumContinuationRequests,
     StNumFailures,
-    StSizePeakSubgraphTemp,
-    StSizePeakEphemeralStorage,
+    StSizePeakSubgraphTempDisk,
+    StSizePeakEphemeralDisk,
     StMax,
 
     //For any quantity there is potentially the following variants.

diff --git a/system/jlib/jstats.cpp b/system/jlib/jstats.cpp
@@ -944,7 +944,7 @@ static const constexpr StatisticMeta statsMetaData[StMax] = {
     { CYCLESTAT(LeafFetch) },
     { TIMESTAT(BlobFetch), "Time spent reading blobs from disk (EXCLUDING the linux page cache)" },
     { CYCLESTAT(BlobFetch) },
-    { PEAKSIZESTAT(GraphSpill), "Peak size of graph spills" },
+    { PEAKSIZESTAT(GraphSpill), "High water mark for inter-subgraph spill size" },
     { TIMESTAT(AgentQueue), "Time worker items were received and queued before being processed\nThis may indicate that the primary node on a channel was down, or that the workers are overloaded with requests" },
     { CYCLESTAT(AgentQueue) },
     { TIMESTAT(IBYTIDelay), "Time spent waiting for another worker to start processing a request\nA non-zero value indicates that the primary node on a channel was down or very busy" },
@@ -974,8 +974,8 @@ 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(PeakSubgraphTemp), "The high water mark for intra-graph temp files"},
-    { PEAKSIZESTAT(PeakEphemeralStorage), "The high water mark for emphemeral storage use"},
+    { PEAKSIZESTAT(PeakSubgraphTempDisk), "High water mark for intra-graph temp files"},
+    { PEAKSIZESTAT(PeakEphemeralDisk), "High water mark for emphemeral storage use"},
 };
 
 static MapStringTo<StatisticKind, StatisticKind> statisticNameMap(true);

diff --git a/thorlcr/activities/hashdistrib/thhashdistribslave.cpp b/thorlcr/activities/hashdistrib/thhashdistribslave.cpp
@@ -2713,7 +2713,7 @@ class CSpill : implements IRowWriter, public CSimpleInterface
         writer = NULL;
         spillFileIO->flush();
         mergeStats(stats, this);
-        spillFile->noteSpill(getStatistic(StSizeSpillFile));
+        spillFile->noteSize(getStatistic(StSizeSpillFile));
         spillFileIO.clear();
     }
     inline __int64 getStatistic(StatisticKind kind) const

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

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, StSizePeakSubgraphTemp, StSizePeakEphemeralStorage, StTimeUser, StTimeSystem, StNumContextSwitches, StSizeMemory, StSizePeakMemory, StSizeRowMemory, StSizePeakRowMemory}, basicActivityStatistics);
+const StatisticsMapping graphStatistics({StNumExecutions, StSizeSpillFile, StSizeGraphSpill, StSizePeakSubgraphTempDisk, StSizePeakEphemeralDisk, StTimeUser, StTimeSystem, StNumContextSwitches, StSizeMemory, StSizePeakMemory, StSizeRowMemory, StSizePeakRowMemory}, basicActivityStatistics);
 const StatisticsMapping diskReadPartStatistics({StNumDiskRowsRead}, diskReadRemoteStatistics);
 const StatisticsMapping indexDistribActivityStatistics({}, basicActivityStatistics, jhtreeCacheStatistics);
 const StatisticsMapping soapcallActivityStatistics({}, basicActivityStatistics, soapcallStatistics);

diff --git a/thorlcr/thorutil/thormisc.hpp b/thorlcr/thorutil/thormisc.hpp
@@ -352,7 +352,7 @@ class graph_decl CFileOwner : public CSimpleInterface, implements IInterface
             fileSizeTracker->shrinkSize(fileSize);
         iFile->remove();
     }
-    void noteSpill(offset_t size)
+    void noteSize(offset_t size)
     {
         fileSize = size;
         if (fileSizeTracker)