Updated measurement key implementations to be based on uint64 id values and enhanced ParseMeasurementKey to resolve measurement keys that were only numeric.

Author: ritchiecarroll

src/lib/Convert.cpp

@@ -384,6 +384,20 @@ bool sttp::TryParseInt64(const string& value, int64_t& result, const int64_t def
     }
 }
 
+bool sttp::TryParseUInt64(const string& value, uint64_t& result, const uint64_t defaultValue)
+{
+    try
+    {
+        result = stoull(value);
+        return true;
+    }
+    catch (...)
+    {
+        result = defaultValue;
+        return false;
+    }
+}
+
 bool sttp::TryParseDouble(const string& value, float64_t& result, const float64_t defaultValue)
 {
     try

src/lib/Convert.h

@@ -90,6 +90,8 @@ namespace sttp
     bool TryParseInt32(const std::string& value, int32_t& result, int32_t defaultValue = 0);
 
     bool TryParseInt64(const std::string& value, int64_t& result, int64_t defaultValue = 0LL);
+    
+    bool TryParseUInt64(const std::string& value, uint64_t& result, uint64_t defaultValue = 0ULL);
 
     bool TryParseDouble(const std::string& value, float64_t& result, float64_t defaultValue = 0.0);
 

src/lib/transport/SubscriberConnection.cpp

@@ -1114,10 +1114,10 @@ SignalIndexCachePtr SubscriberConnection::ParseSubscriptionRequest(const string&
         const DataRowPtr& row = rows[i];
         const Guid& signalID = row->ValueAsGuid(signalIDColumn).GetValueOrDefault();        
         string source;
-        uint32_t id;
+        uint64_t id;
 
         ParseMeasurementKey(row->ValueAsString(idColumn).GetValueOrDefault(), source, id);
-        signalIndexCache->AddMeasurementKey(uint16_t(i), signalID, source, id, charSizeEstimate);
+        signalIndexCache->AddMeasurementKey(int32_t(i), signalID, source, id, charSizeEstimate);
     }
 
     success = true;

src/lib/transport/TransportTypes.cpp

@@ -268,19 +268,42 @@ std::string sttp::transport::GetProtocolType(const std::string& protocolName)
     return "Frame";
 }
 
-void sttp::transport::ParseMeasurementKey(const std::string& key, std::string& source, uint32_t& id)
+void sttp::transport::ParseMeasurementKey(const std::string& key, std::string& source, uint64_t& id)
 {
     const vector<string> parts = Split(key, ":");
+    const size_t length = parts.size();
 
-    if (parts.size() == 2)
+    if (length == 2)
     {
-        source = parts[0];
-        id = uint32_t(stoul(parts[1]));
+        source =  parts[0];
+        id = uint64_t(stoull(parts[1]));
+    }
+    else if (length > 2)
+    {
+        stringstream sourceParts;
+
+        for (size_t i = 0; i < length - 1; i++)
+        {
+            if (i > 0)
+                sourceParts << ':';
+
+            sourceParts << source;
+        }
+
+        source =  sourceParts.str();
+        id = uint64_t(stoull(parts[length - 1]));
     }
     else
     {
-        source = parts[0];
-        id = UInt32::MaxValue;
+        if (TryParseUInt64(key, id))
+        {
+            source = Empty::String;
+        }
+        else
+        {
+            source = key;
+            id = UInt64::MaxValue;
+        }
     }
 }
 

src/lib/transport/TransportTypes.h

@@ -154,7 +154,7 @@ namespace transport
     std::string GetProtocolType(const std::string& protocolName);
 
     // Parses a measurement key in the format of "Source:ID" into its parts
-    void ParseMeasurementKey(const std::string& key, std::string& source, uint32_t& id);
+    void ParseMeasurementKey(const std::string& key, std::string& source, uint64_t& id);
 
     // Helper function to parse signal kind
     SignalKind ParseSignalKind(const std::string& acronym);