Merge pull request #18162 from shamser/issue31035

HPCC-31035 Move ctx stats merging to caller from CKeyLevelManager mergeStats Reviewed-by: Jake Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Jan 16, 2024 · c21d34e · c21d34e
2 parents 1d8e100 + 7cc0c27
commit c21d34e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/system/jhtree/jhtree.cpp b/system/jhtree/jhtree.cpp
@@ -574,11 +574,8 @@ class jhtree_decl CKeyLevelManager : implements IKeyManager, public CInterface
 
     virtual void mergeStats(CRuntimeStatisticCollection & targetStats) const
     {
-        // IO Stats coming from the keyCursor and jhtree cache stats coming from this class's stats
         if (keyCursor)
             keyCursor->mergeStats(targetStats); // merge IO stats
-        if (ctx)
-            targetStats.merge(ctx->queryStats()); // merge jhtree cache stats
     }
 };
 

diff --git a/thorlcr/activities/keyedjoin/thkeyedjoinslave.cpp b/thorlcr/activities/keyedjoin/thkeyedjoinslave.cpp
@@ -1409,10 +1409,14 @@ class CKeyedJoinSlave : public CSlaveActivity, implements IJoinProcessor, implem
                 if (isSuper)
                 {
                     unsigned subfile = subFileNum[i];
-                    keyManager->mergeStats(*fileStats[startOffset+subfile]);
+                    keyManager->mergeStats(*fileStats[startOffset+subfile]); // merge IO stats
+                    fileStats[startOffset+subfile]->merge(contextLoggers[i]->queryStats()); // merge jhtreeStats
                 }
                 else
-                    keyManager->mergeStats(*fileStats[startOffset]);
+                {
+                    keyManager->mergeStats(*fileStats[startOffset]); // merge IO stats
+                    fileStats[startOffset]->merge(contextLoggers[i]->queryStats()); // merge jhtreeStats
+                }
             }
         }
     };