HPCC-35694 Expose single field for physical File Size

Regardless of compression status this field has the actual physical size
on disk.

- Add FileSize field to DFUQuery response to hold DFUSFSize
- Update ECL Watch to use FileSize when present

Signed-off-by: Terrence Asselin <terrence.asselin+copilot@lexisnexisrisk.com>

Author: asselitx

esp/scm/ws_dfu.ecm

@@ -1013,8 +1013,8 @@ ESPresponse [exceptions_inline, nil_remove] DFUMetaInquiryResponse
 //  ===========================================================================
 ESPservice [
     auth_feature("DEFERRED"),
-    version("1.67"),
-    default_client_version("1.67"),
+    version("1.68"),
+    default_client_version("1.68"),
     noforms,
     exceptions_inline("./smc_xslt/exceptions.xslt")] WsDfu
 {

esp/scm/ws_dfu_common.ecm

@@ -59,4 +59,5 @@ ESPStruct DFULogicalFile
     [min_ver("1.63"), nil_remove] int64 MaxSkew;
     [min_ver("1.63"), nil_remove] int64 MinSkewPart;
     [min_ver("1.63"), nil_remove] int64 MaxSkewPart;
+    [min_ver("1.68")] int64 FileSize;
 };

esp/services/ws_dfu/ws_dfuHelpers.cpp

@@ -197,6 +197,26 @@ bool WsDFUHelpers::addToLogicalFileList(IPropertyTree& file, const char* nodeGro
             lFile->setMinSkewPart(file.getPropInt64(getDFUQResultFieldName(DFUQResultField::minSkewPart)));
         }
 
+        if (version >= 1.68)
+        {
+            if (file.hasProp(getDFUQResultFieldName(DFUQResultField::size)))
+                lFile->setFileSize(file.getPropInt64(getDFUQResultFieldName(DFUQResultField::size)));
+            else
+            {
+                 if (isFileCompressed)
+                 {
+                     if (file.hasProp(getDFUQResultFieldName(DFUQResultField::compressedsize)))
+                         lFile->setFileSize(file.getPropInt64(getDFUQResultFieldName(DFUQResultField::compressedsize)));
+                     else if (isKeyFile)
+                         lFile->setFileSize(size);
+                 }
+                 else
+                 {
+                     lFile->setFileSize(size);
+                 }
+            }
+        }
+
         logicalFiles.append(*lFile.getClear());
     }
     catch(IException* e)

esp/src/src-react/components/Files.tsx

@@ -212,9 +212,17 @@ export const Files: React.FunctionComponent<FilesProps> = ({
             FileSize: {
                 label: nlsHPCC.FileSize,
                 formatter: (value, row) => {
+                    if (row.FileSize) {
+                        return Utility.convertedSize(row.FileSize);
+                    }
                     return Utility.convertedSize(row.IsCompressed ? row.CompressedFileSize : row.IntSize);
                 },
-                csvFormatter: (value, row) => row.IsCompressed ? row.CompressedFileSize : row.IntSize,
+                csvFormatter: (value, row) => {
+                    if (row.FileSize) {
+                        return row.FileSize;
+                    }
+                    return row.IsCompressed ? row.CompressedFileSize : row.IntSize;
+                },
             },
             Compression: {
                 label: nlsHPCC.Compression,