From a5f92cc3f03edd2d05bcbbfad1e9f2f2fb41b646 Mon Sep 17 00:00:00 2001
From: robot-ydb-importer <robot-ydb-importer@yandex-team.com>
Date: Fri, 24 Jan 2025 18:50:48 +0300
Subject: [PATCH] YDB Import 711
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

В текущем импорте YDB (из гитхаба) добавляется новая версия YDB C\+\+ SDK, а также частично или полностью переключаются несколько проектов на новый SDK, которые не переключить не получится (ydb, kikimr, rtmapreduce, logbroker, yql). Остальные изменения в основном касаются проблем со сборкой из-за inline неймспейса над старым и новым SDK.

[nodiff:caesar]
commit_hash:44753ffdf56c8ef3fa69a68c6ae9b469a29a9c71
---
 cmake/SetupYdbCppSDK.cmake               |  2 +-
 ydb/include/userver/ydb/builder.hpp      |  2 +-
 ydb/include/userver/ydb/component.hpp    |  4 +---
 ydb/include/userver/ydb/coordination.hpp |  2 +-
 ydb/include/userver/ydb/credentials.hpp  |  4 +---
 ydb/include/userver/ydb/exceptions.hpp   |  6 +-----
 ydb/include/userver/ydb/impl/string.hpp  |  2 +-
 ydb/include/userver/ydb/io/list.hpp      |  2 +-
 ydb/include/userver/ydb/io/structs.hpp   |  4 ++--
 ydb/include/userver/ydb/io/traits.hpp    | 14 +++-----------
 ydb/include/userver/ydb/response.hpp     | 20 +++-----------------
 ydb/include/userver/ydb/settings.hpp     |  2 +-
 ydb/include/userver/ydb/table.hpp        |  6 +++---
 ydb/include/userver/ydb/topic.hpp        |  2 +-
 ydb/src/ydb/exceptions.cpp               |  2 +-
 ydb/src/ydb/impl/config.hpp              |  2 +-
 ydb/src/ydb/impl/driver.cpp              |  8 ++++----
 ydb/src/ydb/impl/driver.hpp              |  6 ++----
 ydb/src/ydb/impl/future.hpp              |  4 ++--
 ydb/src/ydb/impl/operation_settings.hpp  |  4 ++--
 ydb/src/ydb/impl/request_context.hpp     |  2 +-
 ydb/src/ydb/impl/retry.cpp               |  2 +-
 ydb/src/ydb/impl/retry.hpp               |  4 ++--
 ydb/src/ydb/impl/type_category.hpp       |  2 +-
 ydb/src/ydb/io/insert_row.cpp            |  4 ++--
 ydb/src/ydb/io/primitives.cpp            |  4 ++--
 ydb/src/ydb/response.cpp                 |  6 +++---
 ydb/tests/retry_test.cpp                 |  2 +-
 ydb/tests/schema_test.cpp                |  2 +-
 ydb/tests/test_utils.hpp                 |  4 ++--
 30 files changed, 49 insertions(+), 81 deletions(-)

diff --git a/cmake/SetupYdbCppSDK.cmake b/cmake/SetupYdbCppSDK.cmake
index 09f023264e5e..a69715b09444 100644
--- a/cmake/SetupYdbCppSDK.cmake
+++ b/cmake/SetupYdbCppSDK.cmake
@@ -32,7 +32,7 @@ endif()
 
 CPMAddPackage(
   NAME ydb-cpp-sdk
-  GIT_TAG efddedf40b203e87fe295098c1b4e6eefb3168ed
+  GIT_TAG userver-main
   GITHUB_REPOSITORY ydb-platform/ydb-cpp-sdk
   OPTIONS
   "Brotli_VERSION ${Brotli_VERSION}"
diff --git a/ydb/include/userver/ydb/builder.hpp b/ydb/include/userver/ydb/builder.hpp
index 41aeb713ff63..ee13ba84e551 100644
--- a/ydb/include/userver/ydb/builder.hpp
+++ b/ydb/include/userver/ydb/builder.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/params/params.h>
+#include <ydb-cpp-sdk/v2/client/params/params.h>
 
 #include <string>
 #include <type_traits>
diff --git a/ydb/include/userver/ydb/component.hpp b/ydb/include/userver/ydb/component.hpp
index ddc32d8ea7ae..f5741fcb6294 100644
--- a/ydb/include/userver/ydb/component.hpp
+++ b/ydb/include/userver/ydb/component.hpp
@@ -15,9 +15,7 @@
 
 #include <userver/ydb/fwd.hpp>
 
-namespace NYdb {
-class TDriver;
-}
+#include <ydb-cpp-sdk/v2/client/driver/fwd.h>
 
 USERVER_NAMESPACE_BEGIN
 
diff --git a/ydb/include/userver/ydb/coordination.hpp b/ydb/include/userver/ydb/coordination.hpp
index 9c7af5ac84dc..bb644e204842 100644
--- a/ydb/include/userver/ydb/coordination.hpp
+++ b/ydb/include/userver/ydb/coordination.hpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <string_view>
 
-#include <ydb-cpp-sdk/client/coordination/coordination.h>
+#include <ydb-cpp-sdk/v2/client/coordination/coordination.h>
 
 USERVER_NAMESPACE_BEGIN
 
diff --git a/ydb/include/userver/ydb/credentials.hpp b/ydb/include/userver/ydb/credentials.hpp
index 72743b92c77d..96170e2d8124 100644
--- a/ydb/include/userver/ydb/credentials.hpp
+++ b/ydb/include/userver/ydb/credentials.hpp
@@ -9,9 +9,7 @@
 #include <userver/components/component_base.hpp>
 #include <userver/yaml_config/fwd.hpp>
 
-namespace NYdb {
-class ICredentialsProviderFactory;
-}  // namespace NYdb
+#include <ydb-cpp-sdk/v2/client/types/fwd.h>
 
 USERVER_NAMESPACE_BEGIN
 
diff --git a/ydb/include/userver/ydb/exceptions.hpp b/ydb/include/userver/ydb/exceptions.hpp
index b82ce05efd7a..a54670a67e76 100644
--- a/ydb/include/userver/ydb/exceptions.hpp
+++ b/ydb/include/userver/ydb/exceptions.hpp
@@ -1,15 +1,11 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/types/status/status.h>
+#include <ydb-cpp-sdk/v2/client/types/status/status.h>
 
 #include <stdexcept>
 #include <string>
 #include <string_view>
 
-namespace NYdb {
-class TStatus;
-}  // namespace NYdb
-
 USERVER_NAMESPACE_BEGIN
 
 namespace ydb {
diff --git a/ydb/include/userver/ydb/impl/string.hpp b/ydb/include/userver/ydb/impl/string.hpp
index 17f5e0db1dc1..39392f44d56a 100644
--- a/ydb/include/userver/ydb/impl/string.hpp
+++ b/ydb/include/userver/ydb/impl/string.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb-cpp-sdk/v2/client/types/credentials/credentials.h>
 
 USERVER_NAMESPACE_BEGIN
 
diff --git a/ydb/include/userver/ydb/io/list.hpp b/ydb/include/userver/ydb/io/list.hpp
index 83cc644ba2db..40fc5133a5b3 100644
--- a/ydb/include/userver/ydb/io/list.hpp
+++ b/ydb/include/userver/ydb/io/list.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb-cpp-sdk/v2/client/value/value.h>
 
 #include <iterator>
 #include <ranges>
diff --git a/ydb/include/userver/ydb/io/structs.hpp b/ydb/include/userver/ydb/io/structs.hpp
index c58984f0d8da..72a130f1d1ef 100644
--- a/ydb/include/userver/ydb/io/structs.hpp
+++ b/ydb/include/userver/ydb/io/structs.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/result/result.h>
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb-cpp-sdk/v2/client/result/result.h>
+#include <ydb-cpp-sdk/v2/client/value/value.h>
 
 #include <cstddef>
 #include <memory>
diff --git a/ydb/include/userver/ydb/io/traits.hpp b/ydb/include/userver/ydb/io/traits.hpp
index fe471b31e716..9d884bb47236 100644
--- a/ydb/include/userver/ydb/io/traits.hpp
+++ b/ydb/include/userver/ydb/io/traits.hpp
@@ -1,19 +1,11 @@
 #pragma once
 
+#include <ydb-cpp-sdk/v2/client/params/fwd.h>
+#include <ydb-cpp-sdk/v2/client/value/fwd.h>
+
 #include <string_view>
 #include <type_traits>
 
-namespace NYdb {
-class TType;
-class TValue;
-class TValueParser;
-class TValueBuilder;
-class TParamValueBuilder;
-
-template <typename Builder>
-class TValueBuilderBase;
-}  // namespace NYdb
-
 USERVER_NAMESPACE_BEGIN
 
 namespace ydb {
diff --git a/ydb/include/userver/ydb/response.hpp b/ydb/include/userver/ydb/response.hpp
index 5a23a94fbe84..3afdabe04f39 100644
--- a/ydb/include/userver/ydb/response.hpp
+++ b/ydb/include/userver/ydb/response.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/result/result.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb-cpp-sdk/v2/client/query/fwd.h>
+#include <ydb-cpp-sdk/v2/client/result/result.h>
+#include <ydb-cpp-sdk/v2/client/table/table.h>
 
 #include <cstddef>
 #include <iterator>
@@ -17,21 +18,6 @@
 #include <userver/ydb/io/traits.hpp>
 #include <userver/ydb/types.hpp>
 
-namespace NYdb {
-class TResultSetParser;
-class TResultSet;
-class TValueParser;
-
-namespace NTable {
-class TDataQueryResult;
-class TTablePartIterator;
-}  // namespace NTable
-
-namespace NQuery {
-class TExecuteQueryResult;
-}  // namespace NQuery
-}  // namespace NYdb
-
 USERVER_NAMESPACE_BEGIN
 
 namespace ydb {
diff --git a/ydb/include/userver/ydb/settings.hpp b/ydb/include/userver/ydb/settings.hpp
index 0764290ed468..df3b3943427c 100644
--- a/ydb/include/userver/ydb/settings.hpp
+++ b/ydb/include/userver/ydb/settings.hpp
@@ -5,7 +5,7 @@
 #include <optional>
 #include <string_view>
 
-#include <ydb-cpp-sdk/client/table/query_stats/stats.h>
+#include <ydb-cpp-sdk/v2/client/table/query_stats/stats.h>
 
 #include <userver/yaml_config/fwd.hpp>
 
diff --git a/ydb/include/userver/ydb/table.hpp b/ydb/include/userver/ydb/table.hpp
index 91753abbeb7a..5b1bdfec5d8d 100644
--- a/ydb/include/userver/ydb/table.hpp
+++ b/ydb/include/userver/ydb/table.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/query/query.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb-cpp-sdk/v2/client/query/client.h>
+#include <ydb-cpp-sdk/v2/client/query/query.h>
+#include <ydb-cpp-sdk/v2/client/table/table.h>
 
 #include <userver/dynamic_config/source.hpp>
 #include <userver/utils/statistics/fwd.hpp>
diff --git a/ydb/include/userver/ydb/topic.hpp b/ydb/include/userver/ydb/topic.hpp
index 372e90407da8..c1d17dd2a75b 100644
--- a/ydb/include/userver/ydb/topic.hpp
+++ b/ydb/include/userver/ydb/topic.hpp
@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb-cpp-sdk/v2/client/topic/client.h>
 
 USERVER_NAMESPACE_BEGIN
 
diff --git a/ydb/src/ydb/exceptions.cpp b/ydb/src/ydb/exceptions.cpp
index e9fb3fff8df2..63ebe7700b01 100644
--- a/ydb/src/ydb/exceptions.cpp
+++ b/ydb/src/ydb/exceptions.cpp
@@ -1,6 +1,6 @@
 #include <userver/ydb/exceptions.hpp>
 
-#include <ydb-cpp-sdk/client/types/status/status.h>
+#include <ydb-cpp-sdk/v2/client/types/status/status.h>
 
 #include <fmt/format.h>
 
diff --git a/ydb/src/ydb/impl/config.hpp b/ydb/src/ydb/impl/config.hpp
index ff664d305550..2a0d2686fbb5 100644
--- a/ydb/src/ydb/impl/config.hpp
+++ b/ydb/src/ydb/impl/config.hpp
@@ -7,7 +7,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb-cpp-sdk/v2/client/types/credentials/credentials.h>
 
 #include <userver/dynamic_config/snapshot.hpp>
 #include <userver/formats/json_fwd.hpp>
diff --git a/ydb/src/ydb/impl/driver.cpp b/ydb/src/ydb/impl/driver.cpp
index e5db49eef5ff..1bc094bfdaed 100644
--- a/ydb/src/ydb/impl/driver.cpp
+++ b/ydb/src/ydb/impl/driver.cpp
@@ -1,9 +1,9 @@
 #include "driver.hpp"
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
-#include <ydb-cpp-sdk/client/extensions/solomon_stats/pull_connector.h>
-#include <ydb-cpp-sdk/client/iam/iam.h>
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb-cpp-sdk/v2/client/driver/driver.h>
+#include <ydb-cpp-sdk/v2/client/extensions/solomon_stats/pull_connector.h>
+#include <ydb-cpp-sdk/v2/client/iam/iam.h>
+#include <ydb-cpp-sdk/v2/client/types/credentials/credentials.h>
 
 #include <userver/utils/algo.hpp>
 #include <userver/utils/text_light.hpp>
diff --git a/ydb/src/ydb/impl/driver.hpp b/ydb/src/ydb/impl/driver.hpp
index 2bf49c9ca6ed..f1a13d68d0cd 100644
--- a/ydb/src/ydb/impl/driver.hpp
+++ b/ydb/src/ydb/impl/driver.hpp
@@ -6,14 +6,12 @@
 #include <userver/utils/retry_budget.hpp>
 #include <userver/utils/statistics/fwd.hpp>
 
+#include <ydb-cpp-sdk/v2/client/driver/fwd.h>
+
 namespace NMonitoring {
 class TMetricRegistry;
 }  // namespace NMonitoring
 
-namespace NYdb {
-class TDriver;
-}
-
 USERVER_NAMESPACE_BEGIN
 
 namespace ydb::impl {
diff --git a/ydb/src/ydb/impl/future.hpp b/ydb/src/ydb/impl/future.hpp
index 88568220fac6..1425df7cf965 100644
--- a/ydb/src/ydb/impl/future.hpp
+++ b/ydb/src/ydb/impl/future.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <library/cpp/threading/future/core/future.h>
-#include <ydb-cpp-sdk/client/retry/retry.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb-cpp-sdk/v2/client/retry/retry.h>
+#include <ydb-cpp-sdk/v2/client/table/table.h>
 
 #include <userver/drivers/subscribable_futures.hpp>
 #include <userver/utils/not_null.hpp>
diff --git a/ydb/src/ydb/impl/operation_settings.hpp b/ydb/src/ydb/impl/operation_settings.hpp
index d3cd625cb627..50c05b3dc54b 100644
--- a/ydb/src/ydb/impl/operation_settings.hpp
+++ b/ydb/src/ydb/impl/operation_settings.hpp
@@ -2,8 +2,8 @@
 
 #include <chrono>
 
-#include <ydb-cpp-sdk/client/retry/retry.h>
-#include <ydb-cpp-sdk/client/types/request_settings.h>
+#include <ydb-cpp-sdk/v2/client/retry/retry.h>
+#include <ydb-cpp-sdk/v2/client/types/request_settings.h>
 
 #include <userver/engine/deadline.hpp>
 #include <userver/ydb/impl/cast.hpp>
diff --git a/ydb/src/ydb/impl/request_context.hpp b/ydb/src/ydb/impl/request_context.hpp
index bef5bdf54a98..b5e01e196345 100644
--- a/ydb/src/ydb/impl/request_context.hpp
+++ b/ydb/src/ydb/impl/request_context.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/retry/retry.h>
+#include <ydb-cpp-sdk/v2/client/retry/retry.h>
 
 #include <exception>
 
diff --git a/ydb/src/ydb/impl/retry.cpp b/ydb/src/ydb/impl/retry.cpp
index 71ab627dff73..be8996845677 100644
--- a/ydb/src/ydb/impl/retry.cpp
+++ b/ydb/src/ydb/impl/retry.cpp
@@ -1,6 +1,6 @@
 #include <ydb/impl/retry.hpp>
 
-#include <ydb-cpp-sdk/library/issue/yql_issue.h>
+#include <ydb-cpp-sdk/v2/library/issue/yql_issue.h>
 
 #include <ydb/impl/operation_settings.hpp>
 
diff --git a/ydb/src/ydb/impl/retry.hpp b/ydb/src/ydb/impl/retry.hpp
index bf700d878e3b..1e0bd4a04591 100644
--- a/ydb/src/ydb/impl/retry.hpp
+++ b/ydb/src/ydb/impl/retry.hpp
@@ -4,8 +4,8 @@
 
 #include <fmt/format.h>
 
-#include <ydb-cpp-sdk/client/retry/retry.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb-cpp-sdk/v2/client/retry/retry.h>
+#include <ydb-cpp-sdk/v2/client/table/table.h>
 
 #include <userver/utils/retry_budget.hpp>
 #include <userver/ydb/exceptions.hpp>
diff --git a/ydb/src/ydb/impl/type_category.hpp b/ydb/src/ydb/impl/type_category.hpp
index 36b720db21a7..7d99948e70d1 100644
--- a/ydb/src/ydb/impl/type_category.hpp
+++ b/ydb/src/ydb/impl/type_category.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb-cpp-sdk/v2/client/value/value.h>
 
 #include <cstdint>
 #include <string>
diff --git a/ydb/src/ydb/io/insert_row.cpp b/ydb/src/ydb/io/insert_row.cpp
index 64753019320a..cf51544eec6f 100644
--- a/ydb/src/ydb/io/insert_row.cpp
+++ b/ydb/src/ydb/io/insert_row.cpp
@@ -1,7 +1,7 @@
 #include <userver/ydb/io/insert_row.hpp>
 
-#include <ydb-cpp-sdk/client/params/params.h>
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb-cpp-sdk/v2/client/params/params.h>
+#include <ydb-cpp-sdk/v2/client/value/value.h>
 
 #include <variant>
 
diff --git a/ydb/src/ydb/io/primitives.cpp b/ydb/src/ydb/io/primitives.cpp
index 9a3de4aacf11..3ffbcfd37f63 100644
--- a/ydb/src/ydb/io/primitives.cpp
+++ b/ydb/src/ydb/io/primitives.cpp
@@ -1,7 +1,7 @@
 #include <userver/ydb/io/primitives.hpp>
 
-#include <ydb-cpp-sdk/client/params/params.h>
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb-cpp-sdk/v2/client/params/params.h>
+#include <ydb-cpp-sdk/v2/client/value/value.h>
 
 #include <userver/compiler/demangle.hpp>
 #include <userver/formats/json/serialize.hpp>
diff --git a/ydb/src/ydb/response.cpp b/ydb/src/ydb/response.cpp
index f96b323f8653..7446044b11f6 100644
--- a/ydb/src/ydb/response.cpp
+++ b/ydb/src/ydb/response.cpp
@@ -1,8 +1,8 @@
 #include <userver/ydb/response.hpp>
 
-#include <ydb-cpp-sdk/client/proto/accessor.h>
-#include <ydb-cpp-sdk/client/result/result.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb-cpp-sdk/v2/client/proto/accessor.h>
+#include <ydb-cpp-sdk/v2/client/result/result.h>
+#include <ydb-cpp-sdk/v2/client/table/table.h>
 
 #include <userver/ydb/builder.hpp>
 #include <userver/ydb/exceptions.hpp>
diff --git a/ydb/tests/retry_test.cpp b/ydb/tests/retry_test.cpp
index c64f57c5c350..1f20fc6b9f83 100644
--- a/ydb/tests/retry_test.cpp
+++ b/ydb/tests/retry_test.cpp
@@ -1,6 +1,6 @@
 #include "test_utils.hpp"
 
-#include <ydb-cpp-sdk/library/issue/yql_issue.h>
+#include <ydb-cpp-sdk/v2/library/issue/yql_issue.h>
 
 #include <ydb/impl/future.hpp>
 #include <ydb/impl/retry.hpp>
diff --git a/ydb/tests/schema_test.cpp b/ydb/tests/schema_test.cpp
index 55f4d7c59cc2..330128393de7 100644
--- a/ydb/tests/schema_test.cpp
+++ b/ydb/tests/schema_test.cpp
@@ -1,6 +1,6 @@
 #include <userver/utest/utest.hpp>
 
-#include <ydb-cpp-sdk/client/types/status/status.h>
+#include <ydb-cpp-sdk/v2/client/types/status/status.h>
 
 #include <userver/ydb/exceptions.hpp>
 #include <userver/ydb/impl/cast.hpp>
diff --git a/ydb/tests/test_utils.hpp b/ydb/tests/test_utils.hpp
index 3f7cfe645c38..dcfec32365c3 100644
--- a/ydb/tests/test_utils.hpp
+++ b/ydb/tests/test_utils.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/table/table.h>
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb-cpp-sdk/v2/client/table/table.h>
+#include <ydb-cpp-sdk/v2/client/topic/client.h>
 
 #include <userver/dynamic_config/test_helpers.hpp>
 #include <userver/utest/utest.hpp>