Make all file costs cost_type in property tree

Signed-off-by: Shamser Ahmed <[email protected]>
hpcc-systems · Nov 30, 2023 · 7c1d9fd · 7c1d9fd
1 parent b1b1b2f
commit 7c1d9fd
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 12 deletions.
diff --git a/dali/base/dadfs.cpp b/dali/base/dadfs.cpp
@@ -13434,6 +13434,8 @@ IPropertyTreeIterator *deserializeFileAttrIterator(MemoryBuffer& mb, unsigned nu
 
         void setCost(IPropertyTree* file, const char *nodeGroup)
         {
+            // Set the following dynamic fields: atRestCost, accessCost, cost and for legacy files: readCost, writeCost
+            // Dyamically calc and set the atRest cost field
             StringBuffer str;
             double fileAgeDays = 0.0;
             if (file->getProp(getDFUQResultFieldName(DFUQRFtimemodified), str))
@@ -13448,23 +13450,29 @@ IPropertyTreeIterator *deserializeFileAttrIterator(MemoryBuffer& mb, unsigned nu
             else
                 sizeDiskSize = file->getPropInt64(getDFUQResultFieldName(DFUQRForigsize), 0);
             double sizeGB = sizeDiskSize / ((double)1024 * 1024 * 1024);
-            double accessCost = 0.0;
+            double atRestCost = money2cost_type(calcFileAtRestCost(nodeGroup, sizeGB, fileAgeDays));
+            file->setPropInt64(getDFUQResultFieldName(DFUQRFatRestCost), atRestCost);
+
+            // Dyamically calc and set the access cost field and for legacy files set read/write cost fields
+            cost_type accessCost = 0.0;
             if (hasReadWriteCostFields(*file))
             {
-                // Newer files have readCost and writeCost attributes
-                accessCost = cost_type2money(file->getPropInt64(getDFUQResultFieldName(DFUQRFreadCost)) + file->getPropInt64(getDFUQResultFieldName(DFUQRFwriteCost)));
+                accessCost = file->getPropInt64(getDFUQResultFieldName(DFUQRFreadCost)) + file->getPropInt64(getDFUQResultFieldName(DFUQRFwriteCost));
             }
             else // Calc access cost from numDiskRead & numDiskWrites for Legacy files
             {
                 cost_type legacyReadCost = getLegacyReadCost(*file, nodeGroup);
-                __int64 numDiskWrites = file->getPropInt64(getDFUQResultFieldName(DFUQRFnumDiskWrites), 0);
+                file->setPropInt64(getDFUQResultFieldName(DFUQRFreadCost), legacyReadCost);
 
-                accessCost = legacyReadCost + calcFileAccessCost(nodeGroup, numDiskWrites, 0);
+                cost_type legacyWriteCost = getLegacyWriteCost(*file, nodeGroup);
+                file->setPropInt64(getDFUQResultFieldName(DFUQRFwriteCost), legacyWriteCost);
+
+                accessCost = legacyReadCost + legacyWriteCost;
             }
-            double atRestCost = calcFileAtRestCost(nodeGroup, sizeGB, fileAgeDays);
-            file->setPropReal(getDFUQResultFieldName(DFUQRFcost), atRestCost+accessCost);
-            file->setPropReal(getDFUQResultFieldName(DFUQRFatRestCost), atRestCost);
-            file->setPropReal(getDFUQResultFieldName(DFUQRFaccessCost), accessCost);
+            file->setPropInt64(getDFUQResultFieldName(DFUQRFaccessCost), accessCost);
+
+            // Dymically calc and set the total cost field
+            file->setPropInt64(getDFUQResultFieldName(DFUQRFcost), atRestCost + accessCost);
         }
 
         IPropertyTree *deserializeFileAttr(MemoryBuffer &mb, StringArray& nodeGroupFilter)

diff --git a/dali/base/dadfs.hpp b/dali/base/dadfs.hpp
@@ -915,4 +915,16 @@ inline cost_type getLegacyReadCost(const IPropertyTree & fileAttr, Source source
     else
         return 0;
 }
+template<typename Source>
+inline cost_type getLegacyWriteCost(const IPropertyTree & fileAttr, Source source)
+{
+    // Legacy files do not have @writeCost attribute, so calculate from numDiskWrites
+    if (!hasReadWriteCostFields(fileAttr) && fileAttr.hasProp(getDFUQResultFieldName(DFUQRFnumDiskWrites)))
+    {
+        stat_type prevDiskWrites = fileAttr.getPropInt64(getDFUQResultFieldName(DFUQRFnumDiskWrites), 0);
+        return  money2cost_type(calcFileAccessCost(source, prevDiskWrites, 0));
+    }
+    else
+        return 0;
+}
 #endif
diff --git a/esp/services/ws_dfu/ws_dfuHelpers.cpp b/esp/services/ws_dfu/ws_dfuHelpers.cpp
@@ -186,11 +186,16 @@ bool WsDFUHelpers::addToLogicalFileList(IPropertyTree& file, const char* nodeGro
         if (version >= 1.61)
         {
             if (version < 1.62)
-                lFile->setCost(file.getPropReal(getDFUQResultFieldName(DFUQRFcost)));
+            {
+                cost_type cost = file.getPropInt64(getDFUQResultFieldName(DFUQRFcost));
+                lFile->setCost(cost_type2money(cost));
+            }
             else
             {
-                lFile->setAtRestCost(file.getPropReal(getDFUQResultFieldName(DFUQRFatRestCost)));
-                lFile->setAccessCost(file.getPropReal(getDFUQResultFieldName(DFUQRFaccessCost)));
+                cost_type atRestCost = file.getPropInt64(getDFUQResultFieldName(DFUQRFatRestCost));
+                lFile->setAtRestCost(cost_type2money(atRestCost));
+                cost_type accessCost = file .getPropInt64(getDFUQResultFieldName(DFUQRFaccessCost));
+                lFile->setAccessCost(cost_type2money(accessCost));
             }
         }
         if ((version >= 1.63) && (file.hasProp(getDFUQResultFieldName(DFUQRFmaxSkew))))