64 bit integer to string conversion optimization

Author: mobizt

README.md

@@ -2,11 +2,11 @@
 
 ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/mobizt/FirebaseClient/.github%2Fworkflows%2Fcompile_library.yml?logo=github&label=compile) [![Github Stars](https://img.shields.io/github/stars/mobizt/FirebaseClient?logo=github)](https://github.com/mobizt/FirebaseClient/stargazers) ![Github Issues](https://img.shields.io/github/issues/mobizt/FirebaseClient?logo=github)
 
-![GitHub Release](https://img.shields.io/github/v/release/mobizt/FirebaseClient) ![Arduino](https://img.shields.io/badge/Arduino-v1.4.2-57C207?logo=arduino) ![PlatformIO](https://badges.registry.platformio.org/packages/mobizt/library/FirebaseClient.svg) ![GitHub Release Date](https://img.shields.io/github/release-date/mobizt/FirebaseClient)
+![GitHub Release](https://img.shields.io/github/v/release/mobizt/FirebaseClient) ![Arduino](https://img.shields.io/badge/Arduino-v1.4.3-57C207?logo=arduino) ![PlatformIO](https://badges.registry.platformio.org/packages/mobizt/library/FirebaseClient.svg) ![GitHub Release Date](https://img.shields.io/github/release-date/mobizt/FirebaseClient)
 
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/mobizt?logo=github)](https://github.com/sponsors/mobizt)
 
-Revision `2024-10-25T05:11:56Z`
+Revision `2024-10-29T02:35:03Z`
 
 ## Table of Contents
 

library.json

@@ -1,6 +1,6 @@
 {
   "name": "FirebaseClient",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "keywords": "communication, REST, esp32, esp8266, arduino",
   "description": "Async Firebase Client library for Arduino.",
   "repository": {

library.properties

@@ -1,6 +1,6 @@
 name=FirebaseClient
 
-version=1.4.2
+version=1.4.3
 
 author=Mobizt
 

src/core/AsyncResult/Value.h

@@ -1,5 +1,5 @@
 /**
- * Created October 25, 2024
+ * Created October 29, 2024
  *
  * The MIT License (MIT)
  * Copyright (c) 2024 K. Suwatchai (Mobizt)
@@ -40,65 +40,6 @@ enum realtime_database_data_type
     realtime_database_data_type_array = 7
 };
 
-class NumToString
-{
-public:
-    NumToString() {}
-    template <typename T = uint64_t>
-    auto val(T value, bool neg = false) -> typename std::enable_if<(std::is_same<T, uint64_t>::value), String>::type
-    {
-        uint8_t i = 21;
-        char buff[23] = {0};
-
-        if (value == 0)
-            buff[i--] = '0';
-        else
-        {
-            uint16_t r = 0;
-            while (value > 10000)
-            {
-                uint64_t q = value / 10000;
-                r = value - (q * 10000);
-
-                for (uint8_t j = 0; j < 4; j++)
-                {
-                    uint16_t rq = r / 10;
-                    buff[i--] = r - (rq * 10) + '0';
-                    r = rq;
-                }
-
-                value = q;
-            }
-
-            r = value;
-            while (r > 0)
-            {
-                uint16_t q = r / 10;
-                buff[i--] = r - (q * 10) + '0';
-                r = q;
-            }
-        }
-
-        if (neg)
-            buff[i--] = '-';
-
-        return String(&buff[i + 1]);
-    }
-
-    template <typename T = int64_t>
-    auto val(T value) -> typename std::enable_if<(std::is_same<T, int64_t>::value), String>::type
-    {
-        uint64_t uvalue = value < 0 ? -value : value;
-        return val(uvalue, value < 0);
-    }
-
-    template <typename T = int>
-    auto val(T value) -> typename std::enable_if<(!std::is_same<T, uint64_t>::value && !std::is_same<T, int64_t>::value), String>::type
-    {
-        return String(value);
-    }
-};
-
 struct boolean_t : public Printable
 {
 private:
@@ -120,14 +61,14 @@ struct number_t : public Printable
 {
 private:
     String buf;
-    NumToString num2Str;
+    StringUtil sut;
 
 public:
     number_t() {}
     template <typename T1 = int, typename T = int>
     explicit number_t(T1 v, T d) : buf(String(v, d)) {}
     template <typename T = int>
-    explicit number_t(T o) : buf(num2Str.val(o)) {}
+    explicit number_t(T o) : buf(sut.num2Str(o)) {}
     const char *c_str() const { return buf.c_str(); }
     size_t printTo(Print &p) const override { return p.print(buf.c_str()); }
 };
@@ -289,8 +230,8 @@ class ValueConverter
             if (v_sring<T>::value)
                 buf += '\"';
 
-            NumToString num2Str;
-            buf += num2Str.val(value);
+            StringUtil sut;
+            buf += sut.num2Str(value);
 
             if (v_sring<T>::value)
                 buf += '\"';

src/core/Core.h

@@ -7,7 +7,7 @@
 #undef FIREBASE_CLIENT_VERSION
 #endif
 
-#define FIREBASE_CLIENT_VERSION "1.4.2"
+#define FIREBASE_CLIENT_VERSION "1.4.3"
 
 static void sys_idle()
 {

src/core/ObjectWriter.h

@@ -1,5 +1,5 @@
 /**
- * Created June 12, 2024
+ * Created October 29, 2024
  *
  * The MIT License (MIT)
  * Copyright (c) 2024 K. Suwatchai (Mobizt)
@@ -173,6 +173,7 @@ class BufWriter
 private:
     ObjectWriter owriter;
     JSONUtil jut;
+    StringUtil sut;
 
     template <typename T>
     struct v_number
@@ -207,7 +208,7 @@ class BufWriter
     auto add(T1 ret, const T2 &value, String &buf, const String &name) -> typename std::enable_if<v_number<T2>::value, T1>::type
     {
         clear(buf);
-        jut.addObject(buf, name, String(value), false, true);
+        jut.addObject(buf, name, sut.num2Str(value), false, true);
         return ret;
     }
 
@@ -237,7 +238,7 @@ class BufWriter
     template <typename T1, typename T2>
     auto set(T1 ret, const T2 &value, String *buf, size_t bufSize, uint8_t index, const String &name) -> typename std::enable_if<v_number<T2>::value, T1>::type
     {
-        setObject(buf, bufSize, index, name, String(value), false, true);
+        setObject(buf, bufSize, index, name, sut.num2Str(value), false, true);
         return ret;
     }
 
@@ -265,7 +266,7 @@ class BufWriter
     template <typename T1, typename T2>
     auto append(T1 ret, const T2 &value, String *buf, size_t bufSize, uint8_t index, const String &name) -> typename std::enable_if<v_number<T2>::value, T1>::type
     {
-        owriter.addMapArrayMember(buf, bufSize, index, name, String(value), false);
+        owriter.addMapArrayMember(buf, bufSize, index, name, sut.num2Str(value), false);
         return ret;
     }
 

src/core/StringUtil.h

@@ -113,6 +113,39 @@ class StringUtil
         v = ndx;
         return v;
     }
+
+    // Some cores do not provide 64-bit integer to string conversion.
+    template <typename T = uint64_t>
+    auto num2Str(T val, bool negative = false) -> typename std::enable_if<(std::is_same<T, uint64_t>::value), String>::type
+    {
+        String v;
+        char buffer[21];
+        char *ndx = &buffer[sizeof(buffer) - 1];
+        *ndx = '\0';
+        do
+        {
+            *--ndx = val % 10 + '0';
+            val = val / 10;
+        } while (val != 0);
+
+        if (negative)
+            v += '-';
+        v += ndx;
+        return v;
+    }
+
+    template <typename T = int64_t>
+    auto num2Str(T val) -> typename std::enable_if<(std::is_same<T, int64_t>::value), String>::type
+    {
+        uint64_t value = val < 0 ? -val : val;
+        return num2Str(value, val < 0);
+    }
+
+    template <typename T = int>
+    auto num2Str(T val) -> typename std::enable_if<(!std::is_same<T, uint64_t>::value && !std::is_same<T, int64_t>::value), String>::type
+    {
+        return String(val);
+    }
 };
 
 #endif

src/firestore/Values.h

@@ -1,5 +1,5 @@
 /**
- * Created October 25, 2024
+ * Created October 29, 2024
  *
  * The MIT License (MIT)
  * Copyright (c) 2024 K. Suwatchai (Mobizt)
@@ -153,15 +153,15 @@ namespace Values
     private:
         String buf, str;
         ObjectWriter owriter;
-        NumToString num2Str;
+        StringUtil sut;
         const char *getVal() { return owriter.setPair(str, firestore_const_key[firestore_const_key_integerValue].text, buf); }
 
     public:
         /**
          * A 64-bit signed integer value.
          *  @param value The 64-bit signed integer value.
          */
-        explicit IntegerValue(int64_t value) : buf(StringValue(num2Str.val(value)).c_str()) { getVal(); }
+        explicit IntegerValue(int64_t value) : buf(StringValue(sut.num2Str(value)).c_str()) { getVal(); }
         const char *c_str() const { return buf.c_str(); }
         const char *val() { return getVal(); }
         size_t printTo(Print &p) const override { return p.print(str.c_str()); }