Bladeren bron

Merge pull request #10476 from wangkx/h18248

HPCC-18248 Remove HaveSubGraphTimings from WsWorkunits.WUInfo

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 7 jaren geleden
bovenliggende
commit
37c881e161
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      esp/scm/ws_workunits.ecm
  2. 1 1
      esp/services/ws_workunits/ws_workunitsHelpers.cpp

+ 1 - 1
esp/scm/ws_workunits.ecm

@@ -237,7 +237,7 @@ ESPStruct [nil_remove] ECLWorkunit
     [min_ver("1.30")] bool IsPausing(false);
     [min_ver("1.30")] bool ThorLCR(false);
     [min_ver("1.01")] int EventSchedule;
-    [min_ver("1.02")] bool HaveSubGraphTimings;
+    [min_ver("1.02"), depr_ver("1.71")] bool HaveSubGraphTimings;
     [min_ver("1.28"), depr_ver("1.53")] string TotalThorTime;
     [min_ver("1.53")] string TotalClusterTime;
     [min_ver("1.59")] string AbortBy;

+ 1 - 1
esp/services/ws_workunits/ws_workunitsHelpers.cpp

@@ -788,7 +788,7 @@ void WsWuInfo::doGetGraphs(IArrayOf<IEspECLGraph>& graphs)
 
 void WsWuInfo::getGraphInfo(IEspECLWorkunit &info, unsigned long flags)
 {
-     if (version > 1.01)
+     if ((version > 1.01) && (version < 1.71))
      {
         info.setHaveSubGraphTimings(false);