Merge remote-tracking branch 'origin/candidate-9.6.x' into candidate-…

…9.8.x Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # version.cmake
kenrowland · Aug 8, 2024 · 4b02040 · 4b02040
2 parents d36b2fd + 396baeb
commit 4b02040
Show file tree

Hide file tree

Showing 38 changed files with 627 additions and 365 deletions.
diff --git a/ecl/eclagent/eclagent.ipp b/ecl/eclagent/eclagent.ipp
@@ -795,6 +795,7 @@ public:
 
     void ready();
     void execute() { if (!alreadyUpdated) activity->execute(); }
+    void onStart(const byte * parentExtract, CHThorDebugContext * debugContext);
     void stop() { if (!alreadyUpdated) activity->stop(); }
 
     IHThorException * makeWrappedException(IException * e);
@@ -829,6 +830,7 @@ public:
     CICopyArrayOf<EclGraphElement> dependentOnActivity;
     IntArray dependentControlId;
     IProbeManager * probeManager;
+    const byte * savedParentExtract = nullptr;
 
     Owned<EclBoundLoopGraph> loopGraph;
 };

diff --git a/ecl/eclagent/eclgraph.cpp b/ecl/eclagent/eclgraph.cpp
@@ -747,6 +747,24 @@ void EclGraphElement::ready()
         activity->ready();
 }
 
+void EclGraphElement::onStart(const byte * parentExtract, CHThorDebugContext * debugContext)
+{
+    savedParentExtract = parentExtract;
+    if (arg)
+    {
+        try
+        {
+            arg->onStart(parentExtract, NULL);
+        }
+        catch(IException * e)
+        {
+            if (debugContext)
+                debugContext->checkBreakpoint(DebugStateException, NULL, e);
+            throw makeWrappedException(e);
+        }
+    }
+}
+
 IHThorException * EclGraphElement::makeWrappedException(IException * e)
 {
     throw makeHThorException(kind, id, subgraph->id, e);
@@ -962,19 +980,7 @@ void EclSubGraph::doExecute(const byte * parentExtract, bool checkDependencies)
     ForEachItemIn(idx, elements)
     {
         EclGraphElement & cur = elements.item(idx);
-        if (cur.arg)
-        {
-            try
-            {
-                cur.arg->onStart(parentExtract, NULL);
-            }
-            catch(IException * e)
-            {
-                if (debugContext)
-                    debugContext->checkBreakpoint(DebugStateException, NULL, e);
-                throw cur.makeWrappedException(e);
-            }
-        }
+        cur.onStart(parentExtract, debugContext);
     }
 
     ForEachItemIn(ir, sinks)

diff --git a/ecl/hthor/hthor.cpp b/ecl/hthor/hthor.cpp
@@ -6719,13 +6719,13 @@ CHThorWhenActionActivity::CHThorWhenActionActivity(IAgentContext &_agent, unsign
 void CHThorWhenActionActivity::ready()
 {
     CHThorSimpleActivityBase::ready();
-    graphElement->executeDependentActions(agent, NULL, WhenBeforeId);
-    graphElement->executeDependentActions(agent, NULL, WhenParallelId);
+    graphElement->executeDependentActions(agent, graphElement->savedParentExtract, WhenBeforeId);
+    graphElement->executeDependentActions(agent, graphElement->savedParentExtract, WhenParallelId);
 }
 
 void CHThorWhenActionActivity::execute()
 {
-    graphElement->executeDependentActions(agent, NULL, 1);
+    graphElement->executeDependentActions(agent, graphElement->savedParentExtract, 1);
 }
 
 const void * CHThorWhenActionActivity::nextRow()
@@ -6735,7 +6735,7 @@ const void * CHThorWhenActionActivity::nextRow()
 
 void CHThorWhenActionActivity::stop()
 {
-    graphElement->executeDependentActions(agent, NULL, WhenSuccessId);
+    graphElement->executeDependentActions(agent, graphElement->savedParentExtract, WhenSuccessId);
     CHThorSimpleActivityBase::stop();
 }
 

diff --git a/esp/scm/ws_logaccess.ecm b/esp/scm/ws_logaccess.ecm
@@ -79,7 +79,8 @@ ESPenum LogColumnValueType : string
     str("string"),
     numeric("numeric"),
     datetime("datetime"),
-    enum("enum")
+    enum("enum"),
+    epoch("epoch")
 };
 
 ESPStruct [nil_remove] LogColumn

diff --git a/esp/services/ws_logaccess/WsLogAccessService.cpp b/esp/services/ws_logaccess/WsLogAccessService.cpp
@@ -71,6 +71,10 @@ bool Cws_logaccessEx::onGetLogAccessInfo(IEspContext &context, IEspGetLogAccessI
                                 WARNLOG("Invalid col type found in logaccess logmap config");
                             }
                         }
+                        else
+                        {
+                            espLogColumn->setColumnType("string");
+                        }
                         logColumns.append(*espLogColumn.getClear());
                     }
                     else
-Original file line number
+Diff line change
@@ Expand Up @@
                                     WARNLOG("Invalid col type found in logaccess logmap config");
                                 }
                             }
+                            else
+                            {
+                                espLogColumn->setColumnType("string");
+                            }
                             logColumns.append(*espLogColumn.getClear());
                         }
                         else
@@ Expand Down @@