Add missing PEERDIR from ydb_proto to ydb_params/ydb_value needed for cross-library method calls

19 files changed, 37 insertions, 25 deletions

diff --git a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.darwin-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.darwin-x86_64.txt
index 6e0baafca0..33e32a99fe 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.darwin-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.darwin-x86_64.txt
@@ -12,6 +12,7 @@ add_library(cpp-client-ydb_params)
 target_link_libraries(cpp-client-ydb_params PUBLIC
   contrib-libs-cxxsupp
   yutil
+  api-protos
   client-ydb_types-fatal_error_handlers
   cpp-client-ydb_value
 )
diff --git a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-aarch64.txt b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-aarch64.txt
index 0f4a911f12..7ad6570089 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-aarch64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-aarch64.txt
@@ -13,6 +13,7 @@ target_link_libraries(cpp-client-ydb_params PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
+  api-protos
   client-ydb_types-fatal_error_handlers
   cpp-client-ydb_value
 )
diff --git a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-x86_64.txt
index 0f4a911f12..7ad6570089 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-x86_64.txt
@@ -13,6 +13,7 @@ target_link_libraries(cpp-client-ydb_params PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
+  api-protos
   client-ydb_types-fatal_error_handlers
   cpp-client-ydb_value
 )
diff --git a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.windows-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.windows-x86_64.txt
index 6e0baafca0..33e32a99fe 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.windows-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.windows-x86_64.txt
@@ -12,6 +12,7 @@ add_library(cpp-client-ydb_params)
 target_link_libraries(cpp-client-ydb_params PUBLIC
   contrib-libs-cxxsupp
   yutil
+  api-protos
   client-ydb_types-fatal_error_handlers
   cpp-client-ydb_value
 )
diff --git a/ydb/public/sdk/cpp/client/ydb_params/params.cpp b/ydb/public/sdk/cpp/client/ydb_params/params.cpp
index a69d29b2f6..bcf992a213 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/params.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_params/params.cpp
@@ -1,7 +1,8 @@
 #include "params.h"
 #include "impl.h"
 
-#include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h>
+#include <ydb/public/api/protos/ydb_value.pb.h>
+
 #include <ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/handlers.h>
 
 #include <util/generic/map.h>
@@ -52,7 +53,7 @@ public:
         : HasTypeInfo_(true)
     {
         for (const auto& pair : typeInfo) {
-            ParamsMap_[pair.first].mutable_type()->CopyFrom(TProtoAccessor::GetProto(pair.second));
+            ParamsMap_[pair.first].mutable_type()->CopyFrom(pair.second.GetProto());
         }
     }
 
@@ -75,15 +76,15 @@ public:
         Y_VERIFY(param);
 
         if (HasTypeInfo()) {
-            if (!TypesEqual(param->type(), TProtoAccessor::GetProto(value.GetType()))) {
+            if (!TypesEqual(param->type(), value.GetType().GetProto())) {
                 FatalError(TStringBuilder() << "Type mismatch for parameter: " << name << ", expected: "
                     << FormatType(TType(param->type())) << ", actual: " << FormatType(value.GetType()));
             }
         } else {
-            param->mutable_type()->CopyFrom(TProtoAccessor::GetProto(value.GetType()));
+            param->mutable_type()->CopyFrom(value.GetType().GetProto());
         }
 
-        param->mutable_value()->CopyFrom(TProtoAccessor::GetProto(value));
+        param->mutable_value()->CopyFrom(value.GetProto());
     }
 
     TParams Build() {
diff --git a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.darwin-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.darwin-x86_64.txt
index 430476e7ca..734afada32 100644
--- a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.darwin-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.darwin-x86_64.txt
@@ -15,6 +15,8 @@ target_link_libraries(cpp-client-ydb_proto PUBLIC
   api-grpc-draft
   api-protos
   lib-operation_id-protos
+  cpp-client-ydb_params
+  cpp-client-ydb_value
   public-issue-protos
 )
 target_sources(cpp-client-ydb_proto PRIVATE
diff --git a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-aarch64.txt b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-aarch64.txt
index c44add7675..c5b62a0ee0 100644
--- a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-aarch64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-aarch64.txt
@@ -16,6 +16,8 @@ target_link_libraries(cpp-client-ydb_proto PUBLIC
   api-grpc-draft
   api-protos
   lib-operation_id-protos
+  cpp-client-ydb_params
+  cpp-client-ydb_value
   public-issue-protos
 )
 target_sources(cpp-client-ydb_proto PRIVATE
diff --git a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-x86_64.txt
index c44add7675..c5b62a0ee0 100644
--- a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-x86_64.txt
@@ -16,6 +16,8 @@ target_link_libraries(cpp-client-ydb_proto PUBLIC
   api-grpc-draft
   api-protos
   lib-operation_id-protos
+  cpp-client-ydb_params
+  cpp-client-ydb_value
   public-issue-protos
 )
 target_sources(cpp-client-ydb_proto PRIVATE
diff --git a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.windows-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.windows-x86_64.txt
index 430476e7ca..734afada32 100644
--- a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.windows-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.windows-x86_64.txt
@@ -15,6 +15,8 @@ target_link_libraries(cpp-client-ydb_proto PUBLIC
   api-grpc-draft
   api-protos
   lib-operation_id-protos
+  cpp-client-ydb_params
+  cpp-client-ydb_value
   public-issue-protos
 )
 target_sources(cpp-client-ydb_proto PRIVATE
diff --git a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.darwin-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.darwin-x86_64.txt
index 5fbb5097dd..ee4d8bbb74 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.darwin-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.darwin-x86_64.txt
@@ -15,6 +15,7 @@ target_link_libraries(cpp-client-ydb_result PUBLIC
   api-protos
   client-ydb_types-fatal_error_handlers
   cpp-client-ydb_value
+  cpp-client-ydb_proto
 )
 target_sources(cpp-client-ydb_result PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/public/sdk/cpp/client/ydb_result/proto_accessor.cpp
diff --git a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-aarch64.txt b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-aarch64.txt
index daa99400b3..1c69738e05 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-aarch64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-aarch64.txt
@@ -16,6 +16,7 @@ target_link_libraries(cpp-client-ydb_result PUBLIC
   api-protos
   client-ydb_types-fatal_error_handlers
   cpp-client-ydb_value
+  cpp-client-ydb_proto
 )
 target_sources(cpp-client-ydb_result PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/public/sdk/cpp/client/ydb_result/proto_accessor.cpp
diff --git a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-x86_64.txt
index daa99400b3..1c69738e05 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-x86_64.txt
@@ -16,6 +16,7 @@ target_link_libraries(cpp-client-ydb_result PUBLIC
   api-protos
   client-ydb_types-fatal_error_handlers
   cpp-client-ydb_value
+  cpp-client-ydb_proto
 )
 target_sources(cpp-client-ydb_result PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/public/sdk/cpp/client/ydb_result/proto_accessor.cpp
diff --git a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.windows-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.windows-x86_64.txt
index 5fbb5097dd..ee4d8bbb74 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.windows-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.windows-x86_64.txt
@@ -15,6 +15,7 @@ target_link_libraries(cpp-client-ydb_result PUBLIC
   api-protos
   client-ydb_types-fatal_error_handlers
   cpp-client-ydb_value
+  cpp-client-ydb_proto
 )
 target_sources(cpp-client-ydb_result PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/public/sdk/cpp/client/ydb_result/proto_accessor.cpp
diff --git a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.darwin-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.darwin-x86_64.txt
index 1f45b95608..4ea6d6c0b8 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.darwin-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.darwin-x86_64.txt
@@ -22,7 +22,6 @@ target_link_libraries(cpp-client-ydb_value PUBLIC
   cpp-containers-stack_vector
   api-protos
   impl-ydb_internal-value_helpers
-  cpp-client-ydb_proto
   client-ydb_types-fatal_error_handlers
   yql-public-decimal
   ydb-library-uuid
diff --git a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-aarch64.txt b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-aarch64.txt
index e29173bf38..30daf3a91a 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-aarch64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-aarch64.txt
@@ -23,7 +23,6 @@ target_link_libraries(cpp-client-ydb_value PUBLIC
   cpp-containers-stack_vector
   api-protos
   impl-ydb_internal-value_helpers
-  cpp-client-ydb_proto
   client-ydb_types-fatal_error_handlers
   yql-public-decimal
   ydb-library-uuid
diff --git a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-x86_64.txt
index e29173bf38..30daf3a91a 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-x86_64.txt
@@ -23,7 +23,6 @@ target_link_libraries(cpp-client-ydb_value PUBLIC
   cpp-containers-stack_vector
   api-protos
   impl-ydb_internal-value_helpers
-  cpp-client-ydb_proto
   client-ydb_types-fatal_error_handlers
   yql-public-decimal
   ydb-library-uuid
diff --git a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.windows-x86_64.txt b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.windows-x86_64.txt
index 1f45b95608..4ea6d6c0b8 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.windows-x86_64.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.windows-x86_64.txt
@@ -22,7 +22,6 @@ target_link_libraries(cpp-client-ydb_value PUBLIC
   cpp-containers-stack_vector
   api-protos
   impl-ydb_internal-value_helpers
-  cpp-client-ydb_proto
   client-ydb_types-fatal_error_handlers
   yql-public-decimal
   ydb-library-uuid
diff --git a/ydb/public/sdk/cpp/client/ydb_value/value.cpp b/ydb/public/sdk/cpp/client/ydb_value/value.cpp
index 095109f760..153232692f 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/value.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_value/value.cpp
@@ -5,7 +5,6 @@
 #undef INCLUDE_YDB_INTERNAL_H
 
 #include <ydb/public/sdk/cpp/client/ydb_params/params.h>
-#include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h>
 #include <ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/handlers.h>
 
 #include <ydb/public/api/protos/ydb_value.pb.h>
@@ -70,7 +69,7 @@ static TTypeParser::ETypeKind GetKind(const Ydb::Type& type) {
 }
 
 bool TypesEqual(const TType& t1, const TType& t2) {
-    return TypesEqual(TProtoAccessor::GetProto(t1), TProtoAccessor::GetProto(t2));
+    return TypesEqual(t1.GetProto(), t2.GetProto());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -123,7 +122,7 @@ public:
 
     void Reset() {
         Path_.clear();
-        Path_.emplace_back(TProtoPosition{&TProtoAccessor::GetProto(Type_), -1});
+        Path_.emplace_back(TProtoPosition{&Type_.GetProto(), -1});
     }
 
     ETypeKind GetKind(ui32 offset = 0) const {
@@ -630,7 +629,7 @@ public:
     }
 
     void Optional(const TType& itemType) {
-        GetProto().mutable_optional_type()->mutable_item()->CopyFrom(TProtoAccessor::GetProto(itemType));
+        GetProto().mutable_optional_type()->mutable_item()->CopyFrom(itemType.GetProto());
     }
 
     void BeginList() {
@@ -642,7 +641,7 @@ public:
     }
 
     void List(const TType& itemType) {
-        GetProto().mutable_list_type()->mutable_item()->CopyFrom(TProtoAccessor::GetProto(itemType));
+        GetProto().mutable_list_type()->mutable_item()->CopyFrom(itemType.GetProto());
     }
 
     void BeginStruct() {
@@ -664,7 +663,7 @@ public:
 
     void AddMember(const TString& memberName, const TType& memberType) {
         AddMember(memberName);
-        GetProto().CopyFrom(TProtoAccessor::GetProto(memberType));
+        GetProto().CopyFrom(memberType.GetProto());
     }
 
     void SelectMember(size_t index) {
@@ -691,7 +690,7 @@ public:
 
     void AddElement(const TType& elementType) {
         AddElement();
-        GetProto().CopyFrom(TProtoAccessor::GetProto(elementType));
+        GetProto().CopyFrom(elementType.GetProto());
     }
 
     void SelectElement(size_t index) {
@@ -717,7 +716,7 @@ public:
 
     void DictKey(const TType& keyType) {
         DictKey();
-        GetProto().CopyFrom(TProtoAccessor::GetProto(keyType));
+        GetProto().CopyFrom(keyType.GetProto());
     }
 
     void DictPayload() {
@@ -728,7 +727,7 @@ public:
 
     void DictPayload(const TType& payloadType) {
         DictPayload();
-        GetProto().CopyFrom(TProtoAccessor::GetProto(payloadType));
+        GetProto().CopyFrom(payloadType.GetProto());
     }
 
     void BeginTagged(const TString& tag) {
@@ -743,7 +742,7 @@ public:
     void Tagged(const TString& tag, const TType& itemType) {
         auto taggedType = GetProto().mutable_tagged_type();
         taggedType->set_tag(tag);
-        taggedType->mutable_type()->CopyFrom(TProtoAccessor::GetProto(itemType));
+        taggedType->mutable_type()->CopyFrom(itemType.GetProto());
     }
 
     Ydb::Type& GetProto(ui32 offset = 0) {
@@ -751,7 +750,7 @@ public:
     }
 
     void SetType(const TType& type) {
-        GetProto().CopyFrom(TProtoAccessor::GetProto(type));
+        GetProto().CopyFrom(type.GetProto());
     }
 
     void SetType(TType&& type) {
@@ -1986,7 +1985,7 @@ public:
         : TypeBuilder_()
     {
         PushPath(ProtoValue_);
-        GetType().CopyFrom(TProtoAccessor::GetProto(type));
+        GetType().CopyFrom(type.GetProto());
     }
 
     TValueBuilderImpl(Ydb::Type& type, Ydb::Value& value)
@@ -2535,7 +2534,7 @@ private:
     }
 
     void SetProtoValue(const TValue& value) {
-        GetValue().CopyFrom(TProtoAccessor::GetProto(value));
+        GetValue().CopyFrom(value.GetProto());
     }
 
     void SetProtoValue(TValue&& value) {
diff --git a/ydb/public/sdk/cpp/client/ydb_value/value_ut.cpp b/ydb/public/sdk/cpp/client/ydb_value/value_ut.cpp
index 9a75fa7635..c7dd61b9fe 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/value_ut.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_value/value_ut.cpp
@@ -1,5 +1,4 @@
 #include <ydb/public/api/protos/ydb_value.pb.h>
-#include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h>
 #include <ydb/public/sdk/cpp/client/ydb_value/value.h>
 #include <ydb/public/sdk/cpp/client/ydb_types/exceptions/exceptions.h>
 #include <ydb/public/lib/json_value/ydb_json_value.h>
@@ -9,6 +8,7 @@
 #include <library/cpp/testing/unittest/tests_data.h>
 
 #include <google/protobuf/messagext.h>
+#include <google/protobuf/text_format.h>
 
 namespace NYdb {
 
@@ -782,7 +782,7 @@ Y_UNIT_TEST_SUITE(YdbValue) {
             "}\n";
 
         TString protoValueStr;
-        NProtoBuf::TextFormat::PrintToString(TProtoAccessor::GetProto(value), &protoValueStr);
+        NProtoBuf::TextFormat::PrintToString(value.GetProto(), &protoValueStr);
         UNIT_ASSERT_NO_DIFF(protoValueStr, expectedProtoValueStr);
     }
 
@@ -844,7 +844,7 @@ Y_UNIT_TEST_SUITE(YdbValue) {
             "}\n";
 
         TString protoValueStr;
-        NProtoBuf::TextFormat::PrintToString(TProtoAccessor::GetProto(value), &protoValueStr);
+        NProtoBuf::TextFormat::PrintToString(value.GetProto(), &protoValueStr);
         UNIT_ASSERT_NO_DIFF(protoValueStr, expectedProtoValueStr);
     }