Merge pull request #10259 from ghalliday/issue18029

HPCC-18029 Remove unused queryTimeReporter()

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

thorlcr/graph/thgraph.cpp

@@ -1254,8 +1254,6 @@ void CGraphBase::reset()
         }
         dependentSubGraphs.kill();
     }
-    if (!queryOwner() || isGlobal())
-        jobChannel.queryTimeReporter().reset();
     if (!queryOwner())
         clearNodeStats();
 }
@@ -2815,7 +2813,6 @@ CJobChannel::CJobChannel(CJobBase &_job, IMPServer *_mpServer, unsigned _channel
 {
     aborted = false;
     thorAllocator.setown(job.getThorAllocator(channel));
-    timeReporter = createStdTimeReporter();
     jobComm.setown(mpServer->createCommunicator(&job.queryJobGroup()));
     myrank = job.queryJobGroup().rank(queryMyNode());
     graphExecutor.setown(new CGraphExecutor(*this));
@@ -2829,7 +2826,6 @@ CJobChannel::~CJobChannel()
     wait();
     clean();
     codeCtx.clear();
-    timeReporter->Release();
 }
 
 INode *CJobChannel::queryMyNode()

thorlcr/graph/thgraph.hpp

@@ -930,7 +930,6 @@ protected:
     CJobBase &job;
     Owned<IThorAllocator> thorAllocator;
     Owned<IGraphExecutor> graphExecutor;
-    ITimeReporter *timeReporter;
     CriticalSection crit;
     CGraphTable subGraphs;
     CGraphTableCopy allGraphs; // for lookup, includes all child graphs
@@ -963,7 +962,6 @@ public:
     void clean();
     void init();
     void wait();
-    ITimeReporter &queryTimeReporter() { return *timeReporter; }
     virtual CGraphBase *createGraph() = 0;
     void startGraph(CGraphBase &graph, bool checkDependencies, size32_t parentExtractSize, const byte *parentExtract);
     INode *queryMyNode();

thorlcr/graph/thgraphmaster.cpp

@@ -2609,8 +2609,6 @@ void CMasterGraph::getFinalProgress()
                 minNode = n;
             }
             totalDiskUsage += nodeDiskUsage;
-            Owned<ITimeReporter> slaveReport = createStdTimeReporter(msg);
-            queryJobChannel().queryTimeReporter().merge(*slaveReport);
         }
     }
     if (totalDiskUsage)
@@ -2634,40 +2632,6 @@ void CMasterGraph::done()
         if (globals->getPropBool("@watchdogProgressEnabled"))
             queryJobManager().queryDeMonServer()->endGraph(this, true);
     }
-    if (!queryOwner())
-    {
-        if (queryJobChannel().queryTimeReporter().numSections())
-        {
-            if (globals->getPropBool("@reportTimingsToWorkunit", true))
-            {
-                struct CReport : implements ITimeReportInfo
-                {
-                    Owned<IWorkUnit> wu;
-                    CGraphBase &graph;
-                    CReport(CGraphBase &_graph) : graph(_graph)
-                    {
-                        wu.setown(&graph.queryJob().queryWorkUnit().lock());
-                    }
-                    virtual void report(const char * timerScope, const char *description, const __int64 totaltime, const __int64 maxtime, const unsigned count)
-                    {
-                        StringBuffer timerStr(graph.queryJob().queryGraphName());
-                        timerStr.append("(").append(graph.queryGraphId()).append("): ");
-                        timerStr.append(description);
-
-                        StringBuffer scope;
-                        //GH-.JCS is this correct queryGraphId() is a subgraph?
-                        formatGraphTimerScope(scope, graph.queryJob().queryGraphName(), graph.queryGraphId(), 0);
-                        scope.append(":").append(timerScope);
-                        wu->setStatistic(queryStatisticsComponentType(), queryStatisticsComponentName(), SSTsection, scope, StTimeElapsed, timerStr.str(), totaltime, count, maxtime, StatsMergeReplace);
-
-                    }
-                } wureport(*this);
-                queryJobChannel().queryTimeReporter().report(wureport);
-            }
-            else
-                queryJobChannel().queryTimeReporter().printTimings();
-        }
-    }
 }
 
 void CMasterGraph::setComplete(bool tf)

thorlcr/graph/thgraphslave.cpp

@@ -1191,7 +1191,6 @@ void CSlaveGraph::getDone(MemoryBuffer &doneInfoMb)
                     jobS->queryProgressHandler()->stopGraph(*this, &doneInfoMb);
             }
             doneInfoMb.append(job.queryMaxDiskUsage());
-            queryJobChannel().queryTimeReporter().serialize(doneInfoMb);
         }
         catch (IException *)
         {