Merge pull request #19255 from shamser/issue32922

HPCC-32922 Capture lookahead timings for join and keyedjoin activities Reviewed-by: Jake Smith <jake.smith@lexisnexisrisk.com> Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
hpcc-systems · Nov 18, 2024 · ccdd99c · ccdd99c
2 parents 602b39d + 7fd4503
commit ccdd99c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/thorlcr/activities/join/thjoinslave.cpp b/thorlcr/activities/join/thjoinslave.cpp
@@ -265,8 +265,8 @@ class JoinSlaveActivity : public CSlaveActivity, implements ILookAheadStopNotify
     {
         try
         {
+            LookAheadTimer t(slaveTimerStats, timeActivities);
             startInput(secondaryInputIndex);
-
             if (ensureStartFTLookAhead(secondaryInputIndex))
             {
                 IThorDataLink *secondaryInput = queryInput(secondaryInputIndex);

diff --git a/thorlcr/activities/keyedjoin/thkeyedjoinslave.cpp b/thorlcr/activities/keyedjoin/thkeyedjoinslave.cpp
@@ -2666,13 +2666,18 @@ class CKeyedJoinSlave : public CSlaveActivity, implements IJoinProcessor, implem
         {
             if (queryAbortSoon())
                 break;
-            OwnedConstThorRow lhsRow = inputStream->nextRow();
-            if (!lhsRow)
+            OwnedConstThorRow lhsRow;
             {
-                groupStart = nullptr; // NB: only ever set if preserveGroups on
+                LookAheadTimer t(slaveTimerStats, timeActivities);
+
                 lhsRow.setown(inputStream->nextRow());
                 if (!lhsRow)
-                    break;
+                {
+                    groupStart = nullptr; // NB: only ever set if preserveGroups on
+                    lhsRow.setown(inputStream->nextRow());
+                    if (!lhsRow)
+                        break;
+                }
             }
             Linked<CJoinGroup> jg;
             if (helper->leftCanMatch(lhsRow))