Skip to content

Commit

Permalink
Replace cpp sdk to v3 (#7796)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gazizonoki
Gazizonoki authored Jan 22, 2025
1 parent 6327ce0 commit 5e0baa0
Show file tree
Hide file tree
Showing 1,837 changed files with 80,750 additions and 7,088 deletions.
4 changes: 2 additions & 2 deletions .github/config/muted_ya.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ ydb/library/actors/http/ut sole+chunk+chunk
ydb/library/actors/interconnect/ut_huge_cluster HugeCluster.AllToAll
ydb/library/actors/interconnect/ut_huge_cluster sole chunk chunk
ydb/library/yql/providers/generic/connector/tests/datasource/ydb test.py.test_select_positive[column_selection_col2_COL1-kqprun]
ydb/public/sdk/cpp/client/ydb_topic/ut [*/*] chunk chunk
ydb/public/sdk/cpp/client/ydb_topic/ut [*/*]+chunk+chunk
ydb/public/sdk/cpp/client/src/topic/ut [*/*] chunk chunk
ydb/public/sdk/cpp/client/src/topic/ut [*/*]+chunk+chunk
ydb/services/datastreams/ut DataStreams.TestPutRecordsCornerCases
ydb/services/keyvalue/ut sole chunk chunk
ydb/services/keyvalue/ut sole+chunk+chunk
Expand Down
12 changes: 6 additions & 6 deletions ydb/apps/pgwire/pg_ydb_connection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#include "log_impl.h"
#include <ydb/core/pgproxy/pg_proxy_events.h>
#include <ydb/core/local_pgwire/local_pgwire_util.h>
#include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
#include <ydb/public/sdk/cpp/client/ydb_table/table.h>
#include <ydb/public/sdk/cpp/client/draft/ydb_scripting.h>
#include <ydb-cpp-sdk/client/driver/driver.h>
#include <ydb-cpp-sdk/client/table/table.h>
#include <ydb-cpp-sdk/client/draft/ydb_scripting.h>
#include <ydb/library/actors/core/actor_bootstrapped.h>

// temporarry borrowed from postgresql/src/backend/catalog/pg_type_d.h
Expand Down Expand Up @@ -104,7 +104,7 @@ class TPgYdbConnection : public TActorBootstrapped<TPgYdbConnection> {
try {
NYdb::NScripting::TExecuteYqlResult result = NYdb::NScripting::TAsyncExecuteYqlResult(feature).ExtractValue();
if (result.IsSuccess()) {
const TVector<NYdb::TResultSet>& resultSets = result.GetResultSets();
const std::vector<NYdb::TResultSet>& resultSets = result.GetResultSets();
if (!resultSets.empty()) {
NYdb::TResultSet resultSet = resultSets[0];

Expand Down Expand Up @@ -282,7 +282,7 @@ class TPgYdbConnection : public TActorBootstrapped<TPgYdbConnection> {
try {
NYdb::NScripting::TExecuteYqlResult result = NYdb::NScripting::TAsyncExecuteYqlResult(feature).ExtractValue();
if (result.IsSuccess()) {
const TVector<NYdb::TResultSet>& resultSets = result.GetResultSets();
const std::vector<NYdb::TResultSet>& resultSets = result.GetResultSets();
if (!resultSets.empty()) {
NYdb::TResultSet resultSet = resultSets[0];

Expand Down Expand Up @@ -381,7 +381,7 @@ class TPgYdbConnection : public TActorBootstrapped<TPgYdbConnection> {
try {
NYdb::NScripting::TExecuteYqlResult result = NYdb::NScripting::TAsyncExecuteYqlResult(feature).ExtractValue();
if (result.IsSuccess()) {
const TVector<NYdb::TResultSet>& resultSets = result.GetResultSets();
const std::vector<NYdb::TResultSet>& resultSets = result.GetResultSets();
if (!resultSets.empty()) {
NYdb::TResultSet resultSet = resultSets[0];

Expand Down
4 changes: 2 additions & 2 deletions ydb/apps/pgwire/pg_ydb_connection.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include <ydb/library/actors/core/actor.h>
#include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
#include <ydb/public/sdk/cpp/client/ydb_common_client/settings.h>
#include <ydb-cpp-sdk/client/driver/driver.h>
#include <ydb-cpp-sdk/client/common_client/settings.h>

namespace NPGW {

Expand Down
2 changes: 1 addition & 1 deletion ydb/apps/pgwire/pg_ydb_proxy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <ydb/public/api/grpc/ydb_auth_v1.grpc.pb.h>
#include <ydb/library/actors/core/actor.h>
#define INCLUDE_YDB_INTERNAL_H
#include <ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.h>
#include <ydb/public/sdk/cpp/src/client/impl/ydb_internal/grpc_connections/grpc_connections.h>

namespace NPGW {

Expand Down
2 changes: 1 addition & 1 deletion ydb/apps/pgwire/pg_ydb_proxy.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <ydb/library/actors/core/actor.h>
#include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
#include <ydb-cpp-sdk/client/driver/driver.h>

namespace NPGW {

Expand Down
8 changes: 6 additions & 2 deletions ydb/apps/pgwire/ya.make
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
PROGRAM()

ADDINCL(
ydb/public/sdk/cpp
)

SRCS(
appdata.h
log_impl.h
Expand All @@ -19,8 +23,8 @@ PEERDIR(
ydb/core/local_pgwire
ydb/core/protos
ydb/public/api/grpc
ydb/public/sdk/cpp/client/ydb_driver
ydb/public/sdk/cpp/client/draft
ydb/public/sdk/cpp/src/client/driver
ydb/public/sdk/cpp/src/client/draft
yql/essentials/parser/pg_wrapper
yql/essentials/public/udf/service/exception_policy
)
Expand Down
2 changes: 1 addition & 1 deletion ydb/apps/ydb/commands/ya.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SRCS(
)

PEERDIR(
ydb/public/sdk/cpp/client/iam/common
ydb/public/sdk/cpp/src/client/iam
ydb/public/lib/ydb_cli/commands
)

Expand Down
6 changes: 3 additions & 3 deletions ydb/apps/ydb/commands/ydb_cloud_root.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#include "ydb_update.h"
#include "ydb_version.h"

#include <ydb/public/sdk/cpp/client/iam/common/iam.h>
#include <ydb/public/sdk/cpp/client/ydb_types/credentials/oauth2_token_exchange/from_file.h>
#include <ydb-cpp-sdk/client/iam/iam.h>
#include <ydb-cpp-sdk/client/types/credentials/oauth2_token_exchange/from_file.h>
#include <ydb/public/lib/ydb_cli/common/ydb_updater.h>

#include <filesystem>
Expand All @@ -27,7 +27,7 @@ void TClientCommandRoot::SetCredentialsGetter(TConfig& config) {
return CreateOAuthCredentialsProviderFactory(config.SecurityToken);
}
if (config.UseStaticCredentials) {
if (config.StaticCredentials.User) {
if (!config.StaticCredentials.User.empty()) {
return CreateLoginCredentialsProviderFactory(config.StaticCredentials);
}
}
Expand Down
2 changes: 1 addition & 1 deletion ydb/apps/ydb/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ int main(int argc, char **argv) {
Cerr << "Try \"--help\" option for more info." << Endl;
return EXIT_FAILURE;
}
catch (const NYdb::NConsoleClient::TYdbErrorException& e) {
catch (const NYdb::NStatusHelpers::TYdbErrorException& e) {
Cerr << e;
return EXIT_FAILURE;
}
Expand Down
2 changes: 1 addition & 1 deletion ydb/apps/ydb/ut/workload-topic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <library/cpp/testing/common/env.h>
#include <library/cpp/testing/unittest/registar.h>

#include <ydb/public/sdk/cpp/client/ydb_topic/topic.h>
#include <ydb-cpp-sdk/client/topic/client.h>
#include <ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_defines.h>

#include <util/string/cast.h>
Expand Down
4 changes: 2 additions & 2 deletions ydb/apps/ydb/ut/workload-transfer-topic-to-table.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <library/cpp/testing/common/env.h>
#include <library/cpp/testing/unittest/registar.h>

#include <ydb/public/sdk/cpp/client/ydb_topic/topic.h>
#include <ydb/public/sdk/cpp/client/ydb_table/table.h>
#include <ydb-cpp-sdk/client/topic/client.h>
#include <ydb-cpp-sdk/client/table/table.h>

Y_UNIT_TEST_SUITE(YdbWorkloadTransferTopicToTable) {

Expand Down
4 changes: 2 additions & 2 deletions ydb/apps/ydb/ut/ya.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ SRCS(
)

PEERDIR(
ydb/public/sdk/cpp/client/ydb_topic
ydb/public/sdk/cpp/client/ydb_table
ydb/public/sdk/cpp/src/client/topic
ydb/public/sdk/cpp/src/client/table
ydb/public/lib/ydb_cli/commands/topic_workload
)

Expand Down
4 changes: 3 additions & 1 deletion ydb/apps/ydb/ut/ydb-dump.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
#include <library/cpp/testing/common/env.h>
#include <library/cpp/testing/unittest/registar.h>

#include <ydb/public/sdk/cpp/client/ydb_table/table.h>
#include <ydb-cpp-sdk/client/table/table.h>

#include <ydb/public/api/protos/ydb_table.pb.h>

#include <util/stream/file.h>
#include <util/string/printf.h>

#include <google/protobuf/text_format.h>

Y_UNIT_TEST_SUITE(YdbDump) {

Y_UNIT_TEST(NotNullTypeDump) {
Expand Down
2 changes: 1 addition & 1 deletion ydb/apps/ydbd/ya.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ PEERDIR(
yql/essentials/udfs/common/url_base
yql/essentials/udfs/common/yson2
yql/essentials/udfs/logs/dsv
ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs
ydb/public/sdk/cpp/src/client/persqueue_public/codecs
)

YQL_LAST_ABI_VERSION()
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/base/appdata_fwd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ namespace NMonitoring {
class TBusNgMonPage;
}

namespace NYdb {
namespace NYdb::inline V3 {
class TDriver;
}

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/client/scheme_cache_lib/ya.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SRCS(
PEERDIR(
contrib/libs/protobuf
ydb/library/actors/core
ydb/library/grpc/client
ydb/public/sdk/cpp/src/library/grpc/client
library/cpp/threading/future
ydb/core/base
ydb/core/client/minikql_compile
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/client/server/msgbus_securereq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class TMessageBusSecureRequest<TMessageBusServerRequestBase<TDerived>> : public
TMessageBusServerRequestBase<TMessageBusSecureRequest<TMessageBusServerRequestBase<TDerived>>>::HandleError(
MSTATUS_ERROR,
TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::AccessDenied,
error.Message,
TString{error.Message},
ctx);
}

Expand All @@ -46,7 +46,7 @@ class TMessageBusSecureRequest<TMessageBusSimpleTabletRequest<TDerived, TTabletR
}

void HandleError(EResponseStatus status, TEvTxUserProxy::TResultStatus::EStatus proxyStatus, const TString& message, const TActorContext &ctx) {
TAutoPtr<TBusResponse> response(new TBusResponseStatus(status, message));
TAutoPtr<TBusResponse> response(new TBusResponseStatus(status, TString{message}));

if (proxyStatus != TEvTxUserProxy::TResultStatus::Unknown)
response->Record.SetProxyErrorCode(proxyStatus);
Expand Down Expand Up @@ -99,7 +99,7 @@ class TMessageBusSecureRequest<TMessageBusTabletRequest<TDerived, TTabletReplyEv
HandleError(
MSTATUS_ERROR,
TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::AccessDenied,
error.Message,
TString{error.Message},
ctx);
}

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/client/server/msgbus_server_pq_metacache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

#include <ydb/core/tx/scheme_cache/scheme_cache.h>
#include <ydb/public/api/protos/draft/persqueue_error_codes.pb.h>
#include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h>
#include <ydb/public/sdk/cpp/client/ydb_table/table.h>
#include <ydb-cpp-sdk/client/proto/accessor.h>
#include <ydb-cpp-sdk/client/table/table.h>
#include <util/generic/string.h>
#include <util/generic/vector.h>

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/cms/console/console_tenants_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <ydb/core/protos/msgbus.pb.h>
#include <ydb/core/protos/schemeshard/operations.pb.h>
#include <ydb/core/util/pb.h>
#include <ydb/public/lib/operation_id/operation_id.h>
#include <ydb-cpp-sdk/library/operation_id/operation_id.h>

#if defined BLOG_D || defined BLOG_I || defined BLOG_ERROR || defined BLOG_NOTICE
#error log macro definition clash
Expand Down
3 changes: 2 additions & 1 deletion ydb/core/cms/console/console_tenants_manager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
#include <ydb/core/tx/schemeshard/schemeshard.h>
#include <ydb/core/tx/tx_proxy/proxy.h>
#include <ydb/library/aclib/aclib.h>
#include <ydb/public/lib/operation_id/operation_id.h>
#include <ydb-cpp-sdk/library/operation_id/operation_id.h>
#include <ydb/public/sdk/cpp/src/library/operation_id/protos/operation_id.pb.h>

#include <yql/essentials/public/issue/protos/issue_severity.pb.h>
#include <ydb/core/protos/blobstorage_config.pb.h>
Expand Down
3 changes: 2 additions & 1 deletion ydb/core/cms/console/ya.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ PEERDIR(
ydb/library/aclib
ydb/library/yaml_config
ydb/public/api/protos
ydb/public/lib/operation_id
ydb/public/sdk/cpp/src/library/operation_id
ydb/public/sdk/cpp/src/library/operation_id/protos
)

YQL_LAST_ABI_VERSION()
Expand Down
22 changes: 11 additions & 11 deletions ydb/core/config/init/init.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,23 +161,23 @@ class TDefaultNodeBrokerClient
if (node.NodeId == result.GetNodeId()) {
auto &nodeInfo = *dnConfig.MutableNodeInfo();
nodeInfo.SetNodeId(node.NodeId);
nodeInfo.SetHost(node.Host);
nodeInfo.SetHost(TString{node.Host});
nodeInfo.SetPort(node.Port);
nodeInfo.SetResolveHost(node.ResolveHost);
nodeInfo.SetAddress(node.Address);
nodeInfo.SetResolveHost(TString{node.ResolveHost});
nodeInfo.SetAddress(TString{node.Address});
nodeInfo.SetExpire(node.Expire);
NConfig::CopyNodeLocation(nodeInfo.MutableLocation(), node.Location);
if (result.HasNodeName()) {
nodeInfo.SetName(result.GetNodeName());
nodeInfo.SetName(TString{result.GetNodeName()});
outNodeName = result.GetNodeName();
}
} else {
auto &info = *nsConfig.AddNode();
info.SetNodeId(node.NodeId);
info.SetAddress(node.Address);
info.SetAddress(TString{node.Address});
info.SetPort(node.Port);
info.SetHost(node.Host);
info.SetInterconnectHost(node.ResolveHost);
info.SetHost(TString{node.Host});
info.SetInterconnectHost(TString{node.ResolveHost});
NConfig::CopyNodeLocation(info.MutableLocation(), node.Location);
}
}
Expand Down Expand Up @@ -478,16 +478,16 @@ void CopyNodeLocation(NActorsInterconnect::TNodeLocation* dst, const NYdb::NDisc
dst->SetBody(src.Body.value());
}
if (src.DataCenter) {
dst->SetDataCenter(src.DataCenter.value());
dst->SetDataCenter(TString{src.DataCenter.value()});
}
if (src.Module) {
dst->SetModule(src.Module.value());
dst->SetModule(TString{src.Module.value()});
}
if (src.Rack) {
dst->SetRack(src.Rack.value());
dst->SetRack(TString{src.Rack.value()});
}
if (src.Unit) {
dst->SetUnit(src.Unit.value());
dst->SetUnit(TString{src.Unit.value()});
}
}

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/config/init/init_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "init.h"

#include <ydb/public/sdk/cpp/client/ydb_discovery/discovery.h>
#include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
#include <ydb-cpp-sdk/client/discovery/discovery.h>
#include <ydb-cpp-sdk/client/driver/driver.h>

#include <ydb/core/base/location.h>
#include <ydb/core/base/path.h>
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/config/init/ya.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ PEERDIR(
yql/essentials/minikql
yql/essentials/public/udf
ydb/public/lib/deprecated/kicli
ydb/public/sdk/cpp/client/ydb_discovery
ydb/public/sdk/cpp/client/ydb_driver
ydb/public/sdk/cpp/src/client/discovery
ydb/public/sdk/cpp/src/client/driver
)

GENERATE_ENUM_SERIALIZATION(init.h)
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/driver_lib/base_utils/ya.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SRCS(

PEERDIR(
library/cpp/deprecated/enum_codegen
ydb/library/grpc/client
ydb/public/sdk/cpp/src/library/grpc/client
ydb/core/blobstorage/pdisk
ydb/core/client/server
ydb/core/driver_lib/cli_config_base
Expand Down
Loading

0 comments on commit 5e0baa0

Please sign in to comment.