Procházet zdrojové kódy

Merge pull request #7143 from afishbeck/roxieForeignFilePath

HPCC-13280 Fix incomplete foreign LFN for roxie cache and remote lookup

Reviewed By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman před 10 roky
rodič
revize
2197fee884
1 změnil soubory, kde provedl 4 přidání a 0 odebrání
  1. 4 0
      roxie/ccd/ccddali.cpp

+ 4 - 0
roxie/ccd/ccddali.cpp

@@ -494,6 +494,10 @@ public:
             return NULL;
             return NULL;
         StringBuffer foreignLfn("foreign::");
         StringBuffer foreignLfn("foreign::");
         foreignLfn.append(cloneFrom);
         foreignLfn.append(cloneFrom);
+        const char *cloneFromPrefix = fdesc->queryProperties().queryProp("@cloneFromPrefix");
+        if (cloneFromPrefix && *cloneFromPrefix)
+            foreignLfn.append("::").append(cloneFromPrefix);
+        foreignLfn.append("::").append(_lfn);
         if (!connected())
         if (!connected())
             return resolveCachedLFN(foreignLfn);  // Note - cache only used when no dali connection available
             return resolveCachedLFN(foreignLfn);  // Note - cache only used when no dali connection available
         try
         try