HPCC-15937 Add new stats in 6.2 to 6.0.4 to aid backward compatibility

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

system/jlib/jstatcodes.h

@@ -23,6 +23,7 @@
 #define EdgeScopePrefix "e"
 #define SubGraphScopePrefix "sg"
 #define GraphScopePrefix "graph"
+
 #define CONST_STRLEN(x) (sizeof(x)-1)       // sizeof(const-string) = strlen(const-string) + 1 byte for the \0 terminator
 #define MATCHES_CONST_PREFIX(search, prefix) (strncmp(search, prefix, CONST_STRLEN(prefix)) == 0)
 
@@ -103,7 +104,6 @@ enum StatisticKind
 {
     StKindNone,
     StKindAll,
-
     StWhenGraphStarted,                 // When a graph starts
     StWhenGraphFinished,                // When a graph stopped
     StWhenFirstRow,                     // When the first row is processed by slave activity
@@ -112,16 +112,13 @@ enum StatisticKind
     StWhenCreated,
     StWhenCompiled,
     StWhenWorkunitModified,             // Not sure this is very useful
-
     StTimeElapsed,                      // Elapsed wall time between first row and last row
     StTimeLocalExecute,                 // Time spend processing just this activity
     StTimeTotalExecute,                 // Time executing this activity and all inputs
     StTimeRemaining,
-
     StSizeGeneratedCpp,
     StSizePeakMemory,
     StSizeMaxRowSize,
-
     StNumRowsProcessed,                 // on edge
     StNumSlaves,                        // on edge
     StNumStarted,                       // on edge
@@ -175,9 +172,11 @@ enum StatisticKind
     StSizeSpillFile,
     StCycleSpillElapsedCycles,
     StCycleSortElapsedCycles,
-
-    // Stranding stats - on edge
-    StNumStrands,
+    StNumStrands,                       // Stranding stats - on edge
+    StCycleTotalExecuteCycles,
+    StNumExecutions,
+    StTimeTotalNested,
+    StCycleLocalExecuteCycles,
 
     StMax,
 

system/jlib/jstats.cpp

@@ -582,6 +582,10 @@ static const StatisticMeta statsMetaData[StMax] = {
     { CYCLESTAT(SpillElapsedCycles) },
     { CYCLESTAT(SortElapsedCycles) },
     { NUMSTAT(Strands) },
+    { CYCLESTAT(TotalExecuteCycles) },
+    { NUMSTAT(Executions) },
+    { TIMESTAT(TotalNested) },
+    { CYCLESTAT(LocalExecuteCycles) },
 };