Merge remote-tracking branch 'origin/candidate-9.0.x' into candidate-…

…9.2.x Signed-off-by: Jake Smith <[email protected]>
hpcc-systems · Aug 3, 2023 · e9ffe1b · e9ffe1b
2 parents 4a55227 + d4a1f70
commit e9ffe1b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/common/thorhelper/thorsoapcall.cpp b/common/thorhelper/thorsoapcall.cpp
@@ -2321,7 +2321,7 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
                     {
                         isReused = false;
                         keepAlive = true;
-                        socket.setown(blacklist->connect(connUrl.port, connUrl.host, master->logctx, (unsigned)master->maxRetries, master->timeoutMS, master->roxieAbortMonitor, master->rowProvider));
+                        socket.setown(blacklist->connect(ep, master->logctx, (unsigned)master->maxRetries, master->timeoutMS, master->roxieAbortMonitor, master->rowProvider));
                         if (proto == PersistentProtocol::ProtoTLS)
                         {
 #ifdef _USE_OPENSSL

diff --git a/dali/base/dautils.hpp b/dali/base/dautils.hpp
@@ -448,6 +448,7 @@ interface ILocalOrDistributedFile: extends IInterface
     virtual bool getPartCrc(unsigned partnum, unsigned &crc) = 0;
     virtual bool exists() const = 0;   // if created for writing, this may be false
     virtual bool isExternal() const = 0;
+    virtual bool isExternalFile() const = 0;
 };
 
 typedef __int64 ConnectionId;

diff --git a/ecl/hthor/hthor.cpp b/ecl/hthor/hthor.cpp
@@ -490,7 +490,7 @@ void CHThorDiskWriteActivity::resolve()
                 else
                     throw MakeStringException(99, "Cannot write %s, file already exists (missing OVERWRITE attribute?)", lfn.str());
             }
-            else if (f->exists() || f->isExternal() || agent.queryResolveFilesLocally())
+            else if (f->exists() || f->isExternalFile() || agent.queryResolveFilesLocally())
             {
                 // special/local/external file
                 if (f->numParts()!=1)
@@ -8379,7 +8379,7 @@ void CHThorDiskReadBaseActivity::resolve()
             Owned<IFileDescriptor> fdesc;
             fdesc.setown(ldFile->getFileDescriptor());
             gatherInfo(fdesc);
-            if (ldFile->isExternal())
+            if (ldFile->isExternalFile())
                 compressed = checkWriteIsCompressed(helper.getFlags(), fixedDiskRecordSize, false);//grouped=FALSE because fixedDiskRecordSize already includes grouped
             IDistributedFile *dFile = ldFile->queryDistributedFile();
             if (dFile)  //only makes sense for distributed (non local) files

diff --git a/esp/clients/ws_dfsclient/ws_dfsclient.cpp b/esp/clients/ws_dfsclient/ws_dfsclient.cpp
@@ -920,7 +920,7 @@ class CLocalOrDistributedFile: implements ILocalOrDistributedFile, public CInter
         }
         if (!onlylocal)
         {
-            if (lfn.isExternal() && !lfn.isRemote())
+            if (lfn.isExternalFile() || lfn.isExternalPlane())
             {
                 Owned<IFileDescriptor> fDesc = createExternalFileDescriptor(lfn.get());
                 dfile.setown(queryDistributedFileDirectory().createExternal(fDesc, lfn.get()));
@@ -1126,6 +1126,11 @@ class CLocalOrDistributedFile: implements ILocalOrDistributedFile, public CInter
     {
         return lfn.isExternal();
     }
+
+    virtual bool isExternalFile() const override
+    {
+        return lfn.isExternalFile() || lfn.isExternalPlane();
+    }
 };