Better range serialization

Author: ianton-ru

src/Core/Range.cpp

@@ -2,6 +2,7 @@
 #include <Core/Range.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromString.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/FieldAccurateComparison.h>
 
@@ -345,46 +346,27 @@ String Range::toString() const
     return str.str();
 }
 
-String Range::dump() const
+String Range::serialize() const
 {
     WriteBufferFromOwnString str;
 
-    str << (left_included ? '[' : '(') << left.dump() << ",";
-    str << right.dump() << (right_included ? ']' : ')');
+    str << left_included << right_included;
+    writeFieldBinary(left, str);
+    writeFieldBinary(right, str);
 
     return str.str();
 }
 
-void Range::restoreFromDump(const String & range)
+void Range::deserialize(const String & range)
 {
     if (range.empty())
         throw Exception(ErrorCodes::INCORRECT_DATA, "Empty range dump");
 
-    if (range[0] == '[')
-        left_included = true;
-    else if (range[0] == '(')
-        left_included = false;
-    else
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect range: {}", range);
-
-    if (range[range.size() - 1] == ']')
-        right_included = true;
-    else if (range[range.size() - 1] == ')')
-        right_included = false;
-    else
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect range: {}", range);
-
-    /// TODO: Strings with comma
-    auto separator = range.find(',');
-    if (separator == std::string::npos || separator == range.size())
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect range: {}", range);
-
-    std::string_view l(range.data() + 1, separator - 1);
-    std::string_view r(range.data() + separator + 1, range.size() - separator - 2);
+    ReadBufferFromOwnString str(range);
 
-    /// TODO: "Decimal64_'1596962100.000000'" can't be parsed by some reason
-    left = Field::restoreFromDump(std::string_view(range.data() + 1, separator - 1));
-    right = Field::restoreFromDump(std::string_view(range.data() + separator + 1, range.size() - separator - 2));
+    str >> left_included >> right_included;
+    left = readFieldBinary(str);
+    right = readFieldBinary(str);
 }
 
 Hyperrectangle intersect(const Hyperrectangle & a, const Hyperrectangle & b)

src/Core/Range.h

@@ -117,8 +117,8 @@ struct Range
 
     String toString() const;
 
-    String dump() const;
-    void restoreFromDump(const String & range);
+    String serialize() const;
+    void deserialize(const String & range);
 };
 
 Range intersect(const Range & a, const Range & b);

src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.cpp

@@ -112,7 +112,7 @@ DataFileMetaInfo::DataFileMetaInfo(Poco::JSON::Object::Ptr file_info)
                 std::string r = column->get("range");
                 try
                 {
-                    range.restoreFromDump(r);
+                    range.deserialize(r);
                     column_info.hyperrectangle = std::move(range);
                 }
                 catch (const Exception & e)
@@ -151,7 +151,7 @@ Poco::JSON::Object::Ptr DataFileMetaInfo::toJson() const
             if (column.second.nulls_count.has_value())
                 column_info->set("nulls", column.second.nulls_count.value());
             if (column.second.hyperrectangle.has_value())
-                column_info->set("range", column.second.hyperrectangle.value().dump());
+                column_info->set("range", column.second.hyperrectangle.value().serialize());
 
             columns->add(column_info);
         }