Explorar o código

Merge pull request #13948 from wangkx/h17008

HPCC-17008 Separate superfiles and non-superfiles in WUQueryDetails

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman %!s(int64=4) %!d(string=hai) anos
pai
achega
676ce161ff
Modificáronse 1 ficheiros con 5 adicións e 2 borrados
  1. 5 2
      esp/services/ws_workunits/ws_workunitsQuerySets.cpp

+ 5 - 2
esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -2253,6 +2253,7 @@ bool CWsWorkunitsEx::getQueryFiles(IEspContext &context, const char* wuid, const
         if (!cw)
             return false;
 
+        double version = context.getClientVersion();
         StringArray superFileNames;
         Owned<IHpccPackageSet> ps = createPackageSet(process.str());
         Owned<IReferencedFileList> wufiles = createReferencedFileList(context.queryUserId(),
@@ -2266,8 +2267,10 @@ bool CWsWorkunitsEx::getQueryFiles(IEspContext &context, const char* wuid, const
             const char *lfn = rf.getLogicalName();
             if (lfn && *lfn)
             {
-                logicalFiles.append(lfn);
-                if (respSuperFiles && (rf.getFlags() & RefFileSuper))
+                bool isSuper = rf.getFlags() & RefFileSuper;
+                if (!isSuper || (version < 1.78))
+                    logicalFiles.append(lfn);
+                if (respSuperFiles && isSuper)
                     readSuperFiles(context, &rf, lfn, wufiles, respSuperFiles);
             }
         }