Browse Source

HPCC-22721 All wudetails to match graphs on workunits < version 7.4

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 5 years ago
parent
commit
6cd0304cfa
2 changed files with 6 additions and 2 deletions
  1. 3 1
      common/workunit/workunit.cpp
  2. 3 1
      system/jlib/jstats.cpp

+ 3 - 1
common/workunit/workunit.cpp

@@ -3085,7 +3085,9 @@ void WuScopeFilter::finishedFilter()
         if (!(properties & (PTattributes|PThints)))
             sourceFlags &= ~(SSFsearchGraph);
 
-        setDepth(2, 2);
+        //This should really be setDepth(2,2) but workunits prior to 7.4 did not have graph ids prefixed by the wfid
+        //Remove once 7.2 is a distant memory (see HPCC-22887)
+        setDepth(1, 2);
     }
     else if (matchOnly(SSTsubgraph))
     {

+ 3 - 1
system/jlib/jstats.cpp

@@ -2971,7 +2971,9 @@ void ScopeFilter::finishedFilter()
             intersectDepth(1, 1);
             break;
         case SSTgraph:
-            intersectDepth(2, 2);
+            //This should really be intersectDepth(2,2) but workunits prior to 7.4 did not have graph ids prefixed by the wfid
+            //Remove once 7.2 is a distant memory (see HPCC-22887)
+            intersectDepth(1, 2);
             break;
         case SSTsubgraph:
             intersectDepth(3, UINT_MAX);