add support for text and bytes (#26532)

Author: adameat

.github/last_commit.txt

@@ -1 +1 @@
-8ecf0017d5b19918f37de892f536e8cb83216309
+b37a11ff0c3f3c8efdbf2c4abe7d7c8a4b0e0ca9

include/ydb-cpp-sdk/client/value/value.h

@@ -68,7 +68,9 @@ enum class EPrimitiveType {
     TzDatetime   = 0x0035,
     TzTimestamp  = 0x0036,
     String       = 0x1001,
+    Bytes        = 0x1001,
     Utf8         = 0x1200,
+    Text         = 0x1200,
     Yson         = 0x1201,
     Json         = 0x1202,
     Uuid         = 0x1203,
@@ -338,7 +340,9 @@ class TValueParser : public TMoveOnly {
     const std::string& GetTzDatetime() const;
     const std::string& GetTzTimestamp() const;
     const std::string& GetString() const;
+    const std::string& GetBytes() const;
     const std::string& GetUtf8() const;
+    const std::string& GetText() const;
     const std::string& GetYson() const;
     const std::string& GetJson() const;
     TDecimalValue GetDecimal() const;
@@ -370,7 +374,9 @@ class TValueParser : public TMoveOnly {
     std::optional<std::string> GetOptionalTzDatetime() const;
     std::optional<std::string> GetOptionalTzTimestamp() const;
     std::optional<std::string> GetOptionalString() const;
+    std::optional<std::string> GetOptionalBytes() const;
     std::optional<std::string> GetOptionalUtf8() const;
+    std::optional<std::string> GetOptionalText() const;
     std::optional<std::string> GetOptionalYson() const;
     std::optional<std::string> GetOptionalJson() const;
     std::optional<TDecimalValue> GetOptionalDecimal() const;
@@ -448,7 +454,9 @@ class TValueBuilderBase : public TMoveOnly {
     TDerived& TzDatetime(const std::string& value);
     TDerived& TzTimestamp(const std::string& value);
     TDerived& String(const std::string& value);
+    TDerived& Bytes(const std::string& value);
     TDerived& Utf8(const std::string& value);
+    TDerived& Text(const std::string& value);
     TDerived& Yson(const std::string& value);
     TDerived& Json(const std::string& value);
     TDerived& Decimal(const TDecimalValue& value);
@@ -480,7 +488,9 @@ class TValueBuilderBase : public TMoveOnly {
     TDerived& OptionalTzDatetime(const std::optional<std::string>& value);
     TDerived& OptionalTzTimestamp(const std::optional<std::string>& value);
     TDerived& OptionalString(const std::optional<std::string>& value);
+    TDerived& OptionalBytes(const std::optional<std::string>& value);
     TDerived& OptionalUtf8(const std::optional<std::string>& value);
+    TDerived& OptionalText(const std::optional<std::string>& value);
     TDerived& OptionalYson(const std::optional<std::string>& value);
     TDerived& OptionalJson(const std::optional<std::string>& value);
     TDerived& OptionalUuid(const std::optional<TUuidValue>& value);

src/client/value/value.cpp

@@ -1260,11 +1260,21 @@ class TValueParser::TImpl {
         return GetProto().bytes_value();
     }
 
+    const std::string& GetBytes() const {
+        CheckPrimitive(NYdb::EPrimitiveType::Bytes);
+        return GetProto().bytes_value();
+    }
+
     const std::string& GetUtf8() const {
         CheckPrimitive(NYdb::EPrimitiveType::Utf8);
         return GetProto().text_value();
     }
 
+    const std::string& GetText() const {
+        CheckPrimitive(NYdb::EPrimitiveType::Text);
+        return GetProto().text_value();
+    }
+
     const std::string& GetYson() const {
         CheckPrimitive(NYdb::EPrimitiveType::Yson);
         return GetProto().bytes_value();
@@ -1635,9 +1645,9 @@ class TValueParser::TImpl {
             case NYdb::EPrimitiveType::TzDatetime:
             case NYdb::EPrimitiveType::TzTimestamp:
                 return Ydb::Value::kTextValue;
-            case NYdb::EPrimitiveType::String:
+            case NYdb::EPrimitiveType::Bytes:
                 return Ydb::Value::kBytesValue;
-            case NYdb::EPrimitiveType::Utf8:
+            case NYdb::EPrimitiveType::Text:
                 return Ydb::Value::kTextValue;
             case NYdb::EPrimitiveType::Yson:
                 return Ydb::Value::kBytesValue;
@@ -1780,10 +1790,18 @@ const std::string& TValueParser::GetString() const {
     return Impl_->GetString();
 }
 
+const std::string& TValueParser::GetBytes() const {
+    return Impl_->GetBytes();
+}
+
 const std::string& TValueParser::GetUtf8() const {
     return Impl_->GetUtf8();
 }
 
+const std::string& TValueParser::GetText() const {
+    return Impl_->GetText();
+}
+
 const std::string& TValueParser::GetYson() const {
     return Impl_->GetYson();
 }
@@ -1912,10 +1930,18 @@ std::optional<std::string> TValueParser::GetOptionalString() const {
     RET_OPT_VALUE(std::string, String);
 }
 
+std::optional<std::string> TValueParser::GetOptionalBytes() const {
+    RET_OPT_VALUE(std::string, Bytes);
+}
+
 std::optional<std::string> TValueParser::GetOptionalUtf8() const {
     RET_OPT_VALUE(std::string, Utf8);
 }
 
+std::optional<std::string> TValueParser::GetOptionalText() const {
+    RET_OPT_VALUE(std::string, Text);
+}
+
 std::optional<std::string> TValueParser::GetOptionalYson() const {
     RET_OPT_VALUE(std::string, Yson);
 }
@@ -2228,11 +2254,21 @@ class TValueBuilderImpl {
         GetValue().set_bytes_value(TStringType{value});
     }
 
+    void Bytes(const std::string& value) {
+        FillPrimitiveType(EPrimitiveType::Bytes);
+        GetValue().set_bytes_value(TStringType{value});
+    }
+
     void Utf8(const std::string& value) {
         FillPrimitiveType(EPrimitiveType::Utf8);
         GetValue().set_text_value(TStringType{value});
     }
 
+    void Text(const std::string& value) {
+        FillPrimitiveType(EPrimitiveType::Text);
+        GetValue().set_text_value(TStringType{value});
+    }
+
     void Yson(const std::string& value) {
         FillPrimitiveType(EPrimitiveType::Yson);
         GetValue().set_bytes_value(TStringType{value});
@@ -3001,12 +3037,24 @@ TDerived& TValueBuilderBase<TDerived>::String(const std::string& value) {
     return static_cast<TDerived&>(*this);
 }
 
+template<typename TDerived>
+TDerived& TValueBuilderBase<TDerived>::Bytes(const std::string& value) {
+    Impl_->Bytes(value);
+    return static_cast<TDerived&>(*this);
+}
+
 template<typename TDerived>
 TDerived& TValueBuilderBase<TDerived>::Utf8(const std::string& value) {
     Impl_->Utf8(value);
     return static_cast<TDerived&>(*this);
 }
 
+template<typename TDerived>
+TDerived& TValueBuilderBase<TDerived>::Text(const std::string& value) {
+    Impl_->Text(value);
+    return static_cast<TDerived&>(*this);
+}
+
 template<typename TDerived>
 TDerived& TValueBuilderBase<TDerived>::Yson(const std::string& value) {
     Impl_->Yson(value);
@@ -3180,11 +3228,21 @@ TDerived& TValueBuilderBase<TDerived>::OptionalString(const std::optional<std::s
     SET_OPT_VALUE_FROM_OPTIONAL(String);
 }
 
+template<typename TDerived>
+TDerived& TValueBuilderBase<TDerived>::OptionalBytes(const std::optional<std::string>& value) {
+    SET_OPT_VALUE_FROM_OPTIONAL(Bytes);
+}
+
 template<typename TDerived>
 TDerived& TValueBuilderBase<TDerived>::OptionalUtf8(const std::optional<std::string>& value) {
     SET_OPT_VALUE_FROM_OPTIONAL(Utf8);
 }
 
+template<typename TDerived>
+TDerived& TValueBuilderBase<TDerived>::OptionalText(const std::optional<std::string>& value) {
+    SET_OPT_VALUE_FROM_OPTIONAL(Text);
+}
+
 template<typename TDerived>
 TDerived& TValueBuilderBase<TDerived>::OptionalYson(const std::optional<std::string>& value) {
     SET_OPT_VALUE_FROM_OPTIONAL(Yson);