HPCC-22543 Utilize _uint64 for spark memory values

Signed-off-by: Rodrigo Pastrana <rodrigo.pastrana@lexisnexis.com>

common/environment/environment.cpp

@@ -1241,7 +1241,7 @@ public:
     {
         return root->getPropInt("@SPARK_EXECUTOR_CORES", 0);
     }
-    virtual unsigned long getSparkExecutorMemory() const
+    virtual unsigned __int64 getSparkExecutorMemory() const
     {
         return readSizeSetting(root->queryProp("@SPARK_EXECUTOR_MEMORY"), 0);
     }
@@ -1257,7 +1257,7 @@ public:
     {
         return root->getPropInt("@SPARK_WORKER_CORES", 0);
     }
-    virtual unsigned long getSparkWorkerMemory() const
+    virtual unsigned __int64 getSparkWorkerMemory() const
     {
         return readSizeSetting(root->queryProp("@SPARK_WORKER_MEMORY"), 0);
     }
@@ -2493,7 +2493,7 @@ extern ENVIRONMENT_API void closeEnvironment()
     }
 }
 
-extern ENVIRONMENT_API unsigned long readSizeSetting(const char * sizeStr, const unsigned long defaultSize)
+extern ENVIRONMENT_API unsigned __int64 readSizeSetting(const char * sizeStr, const unsigned long defaultSize)
 {
     StringBuffer buf(sizeStr);
     buf.trim();
@@ -2515,7 +2515,7 @@ extern ENVIRONMENT_API unsigned long readSizeSetting(const char * sizeStr, const
 
     char c = ptr[0];
     buf.setLength(ptrAfterDigit - ptrStart);
-    unsigned long size = atol(buf);
+    unsigned __int64 size = atoll(buf);
     switch (c)
     {
     case 'k':

common/environment/environment.hpp

@@ -156,11 +156,11 @@ interface IConstSparkThorInfo : extends IConstEnvBase
     virtual IStringVal & getBuild(IStringVal & str) const = 0;
     virtual IStringVal & getThorClusterName(IStringVal & str) const = 0;
     virtual unsigned getSparkExecutorCores() const = 0;
-    virtual unsigned long getSparkExecutorMemory() const = 0;
+    virtual unsigned __int64 getSparkExecutorMemory() const = 0;
     virtual unsigned getSparkMasterPort() const = 0;
     virtual unsigned getSparkMasterWebUIPort() const = 0;
     virtual unsigned getSparkWorkerCores() const = 0;
-    virtual unsigned long getSparkWorkerMemory() const = 0;
+    virtual unsigned __int64 getSparkWorkerMemory() const = 0;
     virtual unsigned getSparkWorkerPort() const = 0;
     virtual IConstInstanceInfoIterator * getInstanceIterator() const = 0;
 };
@@ -227,7 +227,7 @@ class StringBuffer;
 extern "C" ENVIRONMENT_API IEnvironmentFactory * getEnvironmentFactory(bool update);
 extern "C" ENVIRONMENT_API void closeEnvironment();
 
-extern ENVIRONMENT_API unsigned long readSizeSetting(const char * sizeStr, const unsigned long defaultSize);
+extern ENVIRONMENT_API unsigned __int64 readSizeSetting(const char * sizeStr, const unsigned long defaultSize);
 
 extern ENVIRONMENT_API unsigned getAccessibleServiceURLList(const char *serviceType, std::vector<std::string> &list);