Merge remote-tracking branch 'origin/candidate-9.8.x'

Signed-off-by: Gavin Halliday <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
hpcc-systems · Jul 30, 2024 · 022dba4 · 022dba4
2 parents 7c54a96 + a099828
commit 022dba4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/dali/base/dasds.cpp b/dali/base/dasds.cpp
@@ -1881,7 +1881,7 @@ class CExtCache
             return;
         MemoryAttr ma;
         ma.set(sz, data);
-        CTransactionItem *item = new CTransactionItem(strdup(name), sz, ma.detach(), false);
+        Owned<CTransactionItem> item = new CTransactionItem(strdup(name), sz, ma.detach(), false);
         doAdd(item);
     }
     void add(CTransactionItem *item)

diff --git a/dali/ft/daftprogress.cpp b/dali/ft/daftprogress.cpp
@@ -88,15 +88,22 @@ void DaftProgress::onProgress(unsigned __int64 sizeDone, unsigned __int64 totalS
         unsigned secsLeft = (unsigned)(timeLeft * cycleToNanoScale /1000000000);
         char temp[20];
         formatTime(temp, secsLeft);
-        displayProgress((unsigned)(sizeDone*100/totalSize), secsLeft, temp, 
-                        sizeDone/scale,totalSize/scale,scaleUnit, 
-                        (unsigned)(msGone ? (sizeDone-startSize)/msGone : 0),
+
+        unsigned percentDone = (unsigned)(totalSize ? (sizeDone*100/totalSize) : 100);
+
+        unsigned __int64 kbPerSecond = (sizeDone-startSize) / 1024;
+        if (msGone) // if took no time, leave as max total kb.
+            kbPerSecond = (kbPerSecond * 1000) / msGone;
+
+        displayProgress(percentDone, secsLeft, temp,
+                        sizeDone/scale, totalSize/scale, scaleUnit,
+                        (unsigned)kbPerSecond,
                         (unsigned)(recentTimeDelta ? recentSizeDelta / recentTimeDelta : 0), numNodes, numReads, numWrites);
 
         if (sizeDone == totalSize)
         {
             formatTime(temp, (unsigned)(msGone/1000));
-            displaySummary(temp, (unsigned)((totalSize - startSize)/msGone));
+            displaySummary(temp, (unsigned)kbPerSecond);
         }
     }
 }

diff --git a/system/jlib/jsocket.cpp b/system/jlib/jsocket.cpp
@@ -496,6 +496,9 @@ static int getAddressInfo(const char *name, unsigned *netaddr, bool okToLogErr);
 
 static CriticalSection queryDNSCS;
 
+#ifndef EAI_SYSTEM
+#   define EAI_SYSTEM -11
+#endif
 class CAddrInfoThreadArgs : public CInterface
 {
 public: