HPCC-29817 Eliminate querySeeks, queryScan & queryWildSeeks for hThor…

… and Roxie Signed-off-by: Shamser Ahmed <[email protected]>
hpcc-systems · Jul 3, 2023 · 0708914 · 0708914
1 parent bb20bc8
commit 0708914
Show file tree

Hide file tree

Showing 17 changed files with 241 additions and 234 deletions.
diff --git a/common/thorhelper/thorcommon.hpp b/common/thorhelper/thorcommon.hpp
@@ -18,6 +18,7 @@
 #ifndef THORCOMMON_HPP
 #define THORCOMMON_HPP
 
+#include "jlog.hpp"
 #include "jiface.hpp"
 #include "jcrc.hpp"
 #include "jlzw.hpp"
@@ -672,6 +673,108 @@ class THORHELPER_API IndirectCodeContext : implements ICodeContext
 protected:
     ICodeContext * ctx;
 };
+class CThorBaseContextLogger : public CSimpleInterfaceOf<IContextLogger>
+{
+protected:
+    unsigned traceLevel = 1;
+    LogTrace logTrace;
+    mutable CRuntimeStatisticCollection stats;
+
+public:
+    CThorBaseContextLogger() : stats(jhtreeCacheStatistics)
+    {
+    }
+    virtual void CTXLOG(const char *format, ...) const override  __attribute__((format(printf,2,3))) 
+    {
+        va_list args;
+        va_start(args, format);
+        CTXLOGva(MCdebugProgress, unknownJob, NoLogMsgCode, format, args);
+        va_end(args);
+    }
+
+    virtual void CTXLOGva(const LogMsgCategory & cat, const LogMsgJobInfo & job, LogMsgCode code, const char *format, va_list args) const override  __attribute__((format(printf,5,0))) 
+    {
+        VALOG(cat, job, code, format, args);
+    }
+    virtual void logOperatorExceptionVA(IException *E, const char *file, unsigned line, const char *format, va_list args) const __attribute__((format(printf,5,0)))
+    {
+        StringBuffer ss;
+        ss.append("ERROR");
+        if (E)
+            ss.append(": ").append(E->errorCode());
+        if (file)
+            ss.appendf(": %s(%d) ", file, line);
+        if (E)
+            E->errorMessage(ss.append(": "));
+        if (format)
+            ss.append(": ").valist_appendf(format, args);
+        LOG(MCoperatorProgress, unknownJob, "%s", ss.str());
+    }
+    virtual void noteStatistic(StatisticKind kind, unsigned __int64 value) const override
+    {
+        stats.addStatisticAtomic(kind, value);
+    }
+    virtual void setStatistic(StatisticKind kind, unsigned __int64 value) const override
+    {
+        stats.setStatistic(kind, value);
+    }
+    virtual void mergeStats(const CRuntimeStatisticCollection &from) const override
+    {
+        stats.merge(from);
+    }
+    virtual unsigned queryTraceLevel() const override
+    {
+        return traceLevel;
+    }
+    virtual void setGlobalId(const char *id, SocketEndpoint &ep, unsigned pid) override
+    {
+        logTrace.setGlobalId(id);
+    }
+    virtual void setCallerId(const char *id) override
+    {
+        logTrace.setCallerId(id);
+    }
+    virtual const char *queryGlobalId() const override
+    {
+        return logTrace.queryGlobalId();
+    }
+    virtual const char *queryLocalId() const override
+    {
+        return logTrace.queryLocalId();
+    }
+    virtual const char *queryCallerId() const override
+    {
+        return logTrace.queryCallerId();
+    }
+    virtual void setHttpIdHeaderNames(const char *global, const char *caller) override
+    {
+        logTrace.setHttpIdHeaderNames(global, caller);
+    }
+    virtual const char *queryGlobalIdHttpHeaderName() const override
+    {
+        return logTrace.queryGlobalIdHTTPHeaderName();
+    }
+    virtual const char *queryCallerIdHttpHeaderName() const override
+    {
+        return logTrace.queryCallerIdHTTPHeaderName();
+    }
+    virtual const CRuntimeStatisticCollection &queryStats() const override
+    {
+        return stats;
+    }
+    virtual void recordStatistics(IStatisticGatherer &progress) const override
+    {
+        stats.recordStatistics(progress, false);
+    }
+    void updateStatsDeltaTo(CRuntimeStatisticCollection &to, CRuntimeStatisticCollection &previous)
+    {
+        previous.updateDelta(to, stats);
+    }
+    void reset()
+    {
+        stats.reset();
+    }
+};
 
 extern THORHELPER_API bool isActivitySink(ThorActivityKind kind);
 extern THORHELPER_API bool isActivitySource(ThorActivityKind kind);

diff --git a/ecl/hthor/hthor.ipp b/ecl/hthor/hthor.ipp
@@ -3239,6 +3239,10 @@ protected:
     void onLimitExceeded();
 };
 
+// improvement: override constructor to store setHttpIdHeaderNames, override CTXLOG & logOperatorExceptionVA to log LogMsgJobInfo
+class CHThorContextLogger : public CThorBaseContextLogger
+{
+};
 
 #define MAKEFACTORY(NAME) \
 extern HTHOR_API IHThorActivity * create ## NAME ## Activity(IAgentContext &_agent, unsigned _activityId, unsigned _subgraphId, IHThor ## NAME ## Arg &arg, ThorActivityKind kind, EclGraph & _graph) \