Browse Source

HPCC-24699 Switch noCommon default to true

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
Jake Smith 4 years ago
parent
commit
073c607229

+ 1 - 1
dali/dfu/dfuwu.cpp

@@ -2089,7 +2089,7 @@ public:
     }
     bool getNoCommon() const
     {
-        return queryRoot()->getPropBool("@noCommon", false);
+        return queryRoot()->getPropBool("@noCommon", true);
     }
     void setNoCommon(bool val)
     {

+ 1 - 1
dali/dfuplus/main.cpp

@@ -47,7 +47,7 @@ void handleSyntax()
     out.append("        @filename  -- read options from filename \n");
     out.append("        nowait=0|1  -- return immediately without waiting for completion.\n");
     out.append("        connect=<nn>  -- restrict to nn connections at a time.\n");
-    out.append("        nocommon=0|1 (default=0) -- disable automatic commoning up of puller or pusher processes on same host\n");
+    out.append("        nocommon=0|1 (default=1) -- set to 0 to enable commoning up of puller or pusher processes on same host\n");
     out.append("        transferbuffersize=<n>  -- use buffer of size n bytes when transferring\n");
     out.append("                                   data.\n");
     out.append("        throttle=<nnn>  -- restrict the entire transfer speed to nnn Mbits/sec\n");

+ 1 - 1
dali/ft/filecopy.cpp

@@ -1427,7 +1427,7 @@ void FileSprayer::commonUpSlaves()
             cur.whichSlave = 0;
     }
 
-    if (options->getPropBool(ANnocommon, false))
+    if (options->getPropBool(ANnocommon, true))
         return;
 
     //First work out which are the same slaves, and then map the partition.

+ 4 - 4
esp/scm/ws_fs.ecm

@@ -320,7 +320,7 @@ ESPrequest [nil_remove] SprayFixed
     bool   compress(false);
     bool   push(false);
     bool   pull(false);
-    [min_ver("1.18")] bool noCommon(false);
+    [min_ver("1.18")] bool noCommon(true);
 
     string encrypt;
     string decrypt;
@@ -372,7 +372,7 @@ ESPrequest [nil_remove] SprayVariable
     bool   compress(false);
     bool   push(false);
     bool   pull(false);
-    [min_ver("1.18")] bool noCommon(false);
+    [min_ver("1.18")] bool noCommon(true);
 
     string encrypt;
     string decrypt;
@@ -472,7 +472,7 @@ ESPrequest [nil_remove] Copy
     bool   push(false);
     bool   pull(false);
     bool   ifnewer(false);
-    [min_ver("1.18")] bool noCommon(false);
+    [min_ver("1.18")] bool noCommon(true);
 
     string encrypt;
     string decrypt;
@@ -687,7 +687,7 @@ ESPresponse [exceptions_inline, nil_remove] GetDFUServerQueuesResponse
 
 ESPservice [
     auth_feature("DEFERRED"),
-    version("1.19"),
+    version("1.20"),
     exceptions_inline("./smc_xslt/exceptions.xslt")] FileSpray
 {
     ESPmethod EchoDateTime(EchoDateTime, EchoDateTimeResponse);

+ 4 - 4
esp/services/ws_fs/ws_fsService.cpp

@@ -1991,8 +1991,8 @@ bool CFileSprayEx::onSprayFixed(IEspContext &context, IEspSprayFixed &req, IEspS
             options->setPull(true);
         if (req.getPush())
             options->setPush(true);
-        if (req.getNoCommon())
-            options->setNoCommon(true);
+        if (!req.getNoCommon_isNull())
+            options->setNoCommon(req.getNoCommon());
 
         if (req.getFailIfNoSourceFile())
             options->setFailIfNoSourceFile(true);
@@ -2578,8 +2578,8 @@ bool CFileSprayEx::onCopy(IEspContext &context, IEspCopy &req, IEspCopyResponse
 
         if(req.getNosplit())
             wuOptions->setNoSplit(true);
-        if (req.getNoCommon())
-            wuOptions->setNoCommon(true);
+        if (!req.getNoCommon_isNull())
+            wuOptions->setNoCommon(req.getNoCommon());
 
         if (bRoxie)
         {

+ 1 - 1
esp/src/eclwatch/templates/DFUQueryWidget.html

@@ -69,7 +69,7 @@
                                         <input id="${id}CopyPreserveCompression" title="${i18n.PreserveCompression}:" checked="true" name="preserveCompression" data-dojo-type="dijit.form.CheckBox" />
                                         <input id="${id}CopyTargetReplicate" title="${i18n.Replicate}:" name="replicate" data-dojo-type="dijit.form.CheckBox" />
                                         <input id="${id}CopyExpireDays" title="${i18n.ExpireDays}:" name="ExpireDays" data-dojo-type="dijit.form.NumberTextBox" />
-                                        <input id="${i18n.NoCommon}" title="${i18n.NoCommon}:" name="noCommon" data-dojo-type="dijit.form.CheckBox"/>
+                                        <input id="${i18n.NoCommon}" title="${i18n.NoCommon}:" checked="true" name="noCommon" data-dojo-type="dijit.form.CheckBox"/>
                                     </div>
                                 </div>
                                 <div class="dijitDialogPaneActionBar">

+ 2 - 2
esp/src/eclwatch/templates/LZBrowseWidget.html

@@ -54,7 +54,7 @@
                                         <input title="${i18n.Overwrite}:" name="overwrite" data-dojo-type="dijit.form.CheckBox" />
                                         <input id="${id}FixedSprayReplicate" title="${i18n.Replicate}:" name="replicate" data-dojo-type="dijit.form.CheckBox" />
                                         <input title="${i18n.NoSplit}:" name="nosplit" data-dojo-type="dijit.form.CheckBox" />
-                                        <input title="${i18n.NoCommon}:" name="nocommon" data-dojo-type="dijit.form.CheckBox"/>
+                                        <input title="${i18n.NoCommon}:" name="nocommon" data-dojo-props="checked: true" data-dojo-type="dijit.form.CheckBox"/>
                                         <input title="${i18n.Compress}:" name="compress" data-dojo-type="dijit.form.CheckBox" />
                                         <input title="${i18n.FailIfNoSourceFile}:" name="failIfNoSourceFile" data-dojo-type="dijit.form.CheckBox" />
                                         <input title="${i18n.ExpireDays}:" type="number" name="expireDays" data-dojo-type="dijit.form.TextBox" />
@@ -104,7 +104,7 @@
                                         <input title="${i18n.Overwrite}:" name="overwrite" data-dojo-type="dijit.form.CheckBox" />
                                         <input id="${id}DelimitedSprayReplicate" title="${i18n.Replicate}:" name="replicate" data-dojo-type="dijit.form.CheckBox" />
                                         <input title="${i18n.NoSplit}:" name="nosplit" data-dojo-type="dijit.form.CheckBox" />
-                                        <input title="${i18n.NoCommon}:" name="noCommon" data-dojo-type="dijit.form.CheckBox"/>
+                                        <input title="${i18n.NoCommon}:" name="noCommon" data-dojo-props="checked: true" data-dojo-type="dijit.form.CheckBox"/>
                                         <input title="${i18n.Compress}:" name="compress" data-dojo-type="dijit.form.CheckBox" />
                                         <input title="${i18n.FailIfNoSourceFile}:" name="failIfNoSourceFile" data-dojo-type="dijit.form.CheckBox" />
                                         <input title="${i18n.RecordStructurePresent}:" name="recordStructurePresent" data-dojo-type="dijit.form.CheckBox" />