WIP

Signed-off-by: Shamser Ahmed <[email protected]>

common/thorhelper/CMakeLists.txt

@@ -87,6 +87,7 @@ set (    SRCS
 
          hpccconfig.cpp
          hpccconfig.hpp
+         wfcontext.hpp
     )
 
 include_directories ( 

rtl/eclrtl/wfcontext.hpp → common/thorhelper/wfcontext.hpp

@@ -1,10 +1,10 @@
 #ifndef WFCONTEXT_HPP
 #define WFCONTEXT_HPP
 
-#include "eclrtl.hpp"
+#include "thorhelper.hpp"
 #include "eclhelper.hpp"
 
-class ECLRTL_API IndirectCodeContext : implements ICodeContext
+class THORHELPER_API IndirectCodeContext : implements ICodeContext
 {
 public:
     IndirectCodeContext(ICodeContext * _ctx = NULL) : ctx(_ctx) {}
@@ -307,7 +307,8 @@ class ECLRTL_API IndirectCodeContext : implements ICodeContext
 protected:
     ICodeContext * ctx;
 };
-class ECLRTL_API GlobalCodeContextExtra : implements IGlobalCodeContext
+
+class THORHELPER_API GlobalCodeContextExtra : implements IGlobalCodeContext
 {
 private:
     // Wraps ICodeContext and overrides getWorkflowId() method
@@ -316,17 +317,15 @@ class ECLRTL_API GlobalCodeContextExtra : implements IGlobalCodeContext
         unsigned wfid;
     public:
         CodeContextEx(ICodeContext * _ctx, unsigned _wfid) : IndirectCodeContext(_ctx), wfid(_wfid) {}
-        virtual ~CodeContextEx() {};
         virtual unsigned getWorkflowId() const override { return wfid; }
-    };
+    } codeContextEx;
     IGlobalCodeContext * gctx;
-    CodeContextEx codeContextEx;
 public:
     GlobalCodeContextExtra(IGlobalCodeContext * _gctx, unsigned _wfid) : gctx(_gctx), codeContextEx(_gctx->queryCodeContext(), _wfid) {}
     virtual ICodeContext * queryCodeContext() override { return &codeContextEx; }
     virtual void fail(int, const char *) override { gctx->fail(0, NULL); }
     virtual bool isResult(const char * name, unsigned sequence) override { return gctx->isResult(name, sequence); }
-    virtual unsigned getWorkflowIdDeprecated() override { return gctx->getWorkflowIdDeprecated(); }
+    virtual unsigned getWorkflowIdDeprecated() { return gctx->getWorkflowIdDeprecated(); };
     virtual void doNotify(char const * name, char const * text) override { gctx->doNotify(name, text); }
     virtual int queryLastFailCode() override { return gctx->queryLastFailCode(); }
     virtual void getLastFailMessage(size32_t & outLen, char * & outStr, const char * tag) override { gctx->getLastFailMessage(outLen, outStr, tag); }

common/workunit/CMakeLists.txt

@@ -77,6 +77,7 @@ if(NOT PLUGIN)
         nbcd 
         eclrtl 
         deftype
+        thorhelper
         )
     if (USE_OPENSSL)
         target_link_libraries(workunit securesocket)

roxie/ccd/ccdcontext.cpp

@@ -1777,7 +1777,7 @@ class CRoxieContextBase : implements IRoxieAgentContext, implements ICodeContext
     virtual IEngineContext *queryEngineContext() { return NULL; }
     virtual char *getDaliServers() { throwUnexpected(); }
     // The following method isn't used.  Renaming and leaving here to avoid changing interface
-    // (Note, this getWorkflowId doesn't implement virtual from any derived classess.)
+    // (Note, this getWorkflowId isn't the same as the one in IGlobalCodeContext)
     virtual unsigned getWorkflowIdDeprecated() { throwUnexpected(); }
     // The following from ICodeContext should never be executed in agent activity. If we are on Roxie server, they will be implemented by more derived CRoxieServerContext class
     virtual void setResultBool(const char *name, unsigned sequence, bool value) { throwUnexpected(); }

rtl/eclrtl/CMakeLists.txt

@@ -64,7 +64,6 @@ set (    SRCS
          rtlsize.hpp
          rtltype.hpp
          rtlbcdtest.cpp
-         wfcontext.hpp
     )
 
 include_directories ( 

rtl/include/eclhelper.hpp

@@ -2951,7 +2951,7 @@ struct IRemoteConnection;
 struct IGlobalCodeContext
 {
     virtual ICodeContext * queryCodeContext() = 0;
-    virtual void fail(int, const char *) = 0;  
+    virtual void fail(int, const char *) = 0;
 
     virtual bool isResult(const char * name, unsigned sequence) = 0;
     virtual unsigned getWorkflowIdDeprecated() = 0; // Workflows are not associated with global context. Deprecated. Left here to avoid changing interface.