Merge pull request #21018 from jeclrsg/hpcc-33975-FileSpray-Copy-destNumParts

HPCC-33975 ws_fsService onCopy expose DestNumParts

Reviewed-By: Terrence Asselin <terrence.asselin@lexisnexisrisk.com>
Merged-by: Gavin Halliday <gavin.halliday@lexisnexisrisk.com>

Author: ghalliday

esp/scm/ws_fs.ecm

@@ -509,6 +509,9 @@ ESPrequest [nil_remove] Copy
     [min_ver("1.14")] string DFUServerQueue;
     [min_ver("1.17")] int ExpireDays;
     [min_ver("1.27")] string KeyCompression;
+
+    // Overrides destination part count; 0 = use system/default destination part count
+    [min_ver("1.28")] int DestNumParts(0);
 };
 
 ESPresponse [exceptions_inline]
@@ -728,7 +731,7 @@ ESPresponse [exceptions_inline, nil_remove] GetRemoteTargetsResponse
 
 ESPservice [
     auth_feature("DEFERRED"),
-    version("1.27"),
+    version("1.28"),
     exceptions_inline("./smc_xslt/exceptions.xslt")] FileSpray
 {
     ESPmethod EchoDateTime(EchoDateTime, EchoDateTimeResponse);

esp/services/ws_fs/ws_fsService.cpp

@@ -2023,7 +2023,7 @@ void CFileSprayEx::readAndCheckSpraySourceReq(IEspContext& context, MemoryBuffer
                     {
                         //The sourceIPReq should must have been supplied here. This has been verified if
                         //the sourcePlaneReq is empty. When the sourcePlaneReq is not empty, the dropZone
-                        //should not be null. Otherwise, an exception should already be thrown. 
+                        //should not be null. Otherwise, an exception should already be thrown.
                         dropZone.setown(getAndValidateDropZone(nullptr, sourceIPReq));
                         if (dropZone)
                             sourcePlaneReq.append(dropZone->queryProp("@name"));
@@ -2876,6 +2876,8 @@ bool CFileSprayEx::onCopy(IEspContext &context, IEspCopy &req, IEspCopyResponse
             mspec.setDefaultBaseDir(defaultFolder.str());
             mspec.setDefaultReplicateDir(defaultReplicateFolder.str());
             wuFSpecDest->setClusterPartDiskMapSpec(destNodeGroup.str(), mspec);
+            if (!req.getDestNumParts_isNull() && req.getDestNumParts() > 0)
+                wuFSpecDest->setNumPartsOverride(req.getDestNumParts());
         }
 
         resp.setResult(wu->queryId());
@@ -3561,7 +3563,7 @@ bool CFileSprayEx::onDeleteDropZoneFiles(IEspContext &context, IEspDeleteDropZon
         {
             const char* file = files.item(idx);
             if (containsRelPaths(file))
-                throw makeStringExceptionV(ECLWATCH_INVALID_INPUT, "Invalid file %s", file);   
+                throw makeStringExceptionV(ECLWATCH_INVALID_INPUT, "Invalid file %s", file);
         }
 
         StringBuffer path(directory);