Merge pull request #6498 from richardkchapman/roxie-stats-reset

HPCC-12346 Control:resetquerystats is not resetting counts

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

roxie/ccd/ccdserver.cpp

@@ -554,6 +554,7 @@ public:
     {
         CActivityFactory::resetNodeProgressInfo();
         CriticalBlock b(statsCrit);
+        processed = 0;
         started = 0;
         totalCycles = 0;
         localCycles = 0;
@@ -804,6 +805,17 @@ protected:
         putStatsValue(&edge, "started", "sum", startedArray[idx]);
     }
 
+    virtual void resetNodeProgressInfo()
+    {
+        CRoxieServerActivityFactory::resetNodeProgressInfo();
+        CriticalBlock b(statsCrit);
+        for (unsigned i = 0; i < numOutputs; i++)
+        {
+            processedArray[i] = 0;
+            startedArray[i] = 0;
+        }
+    }
+
     virtual void noteProcessed(unsigned idx, unsigned _processed, unsigned __int64 _totalCycles, unsigned __int64 _localCycles) const
     {
         assertex(numOutputs ? idx < numOutputs : idx==0);

roxie/ccd/ccdstate.cpp

@@ -1284,6 +1284,8 @@ public:
                         slaveManagers->item(channel)->resetQueryTimings(id, logctx);
                     }
             }
+            else
+                throw MakeStringException(ROXIE_UNKNOWN_QUERY, "Unknown query %s", queryId);
         }
         else
         {