Skip to content

Commit a1d771a

Browse files
GazizonokiGazizonoki
committed
Fixes
1 parent 6ddc1f8 commit a1d771a

File tree

38 files changed

+109
-80
lines changed

38 files changed

+109
-80
lines changed

‎cmake/common.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ function(_ydb_sdk_add_library Tgt)
198198
$<BUILD_INTERFACE:${YDB_SDK_BINARY_DIR}>
199199
$<BUILD_INTERFACE:${YDB_SDK_SOURCE_DIR}/include>
200200
)
201+
target_compile_definitions(${Tgt} ${includeMode}
202+
YDB_SDK_USE_STD_STRING
203+
)
201204
endfunction()
202205

203206
function(_ydb_sdk_validate_public_headers)

‎examples/vector_index/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_executable(vector_index)
22

33
target_link_libraries(vector_index PUBLIC
44
yutil
5-
library-getopt
5+
getopt
66
YDB-CPP-SDK::Table
77
)
88

@@ -15,7 +15,7 @@ vcs_info(vector_index)
1515

1616
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
1717
target_link_libraries(vector_index PUBLIC
18-
library-cpuid_check
18+
cpuid_check
1919
)
2020
endif()
2121

‎include/ydb-cpp-sdk/client/topic/errors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <ydb-cpp-sdk/client/types/status/status.h>
44
#include <ydb-cpp-sdk/client/types/status_codes.h>
55

6-
#include <library/cpp/retry/retry_policy.h>
6+
#include <ydb-cpp-sdk/library/retry/retry_policy.h>
77

88
namespace NYdb::NTopic {
99

‎include/ydb-cpp-sdk/client/topic/retry_policy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include <ydb-cpp-sdk/client/types/status_codes.h>
4-
#include <library/cpp/retry/retry_policy.h>
4+
#include <ydb-cpp-sdk/library/retry/retry_policy.h>
55
#include <util/generic/ptr.h>
66

77
namespace NYdb::NTopic {

‎include/ydb-cpp-sdk/library/yql_common/issue/yql_issue_id.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <ydb/public/sdk/cpp/src/library/yql_common/issue/protos/issue_severity.pb.h>
3+
#include <src/library/yql_common/issue/protos/issue_severity.pb.h>
44

55
namespace NYql {
66

‎include/ydb-cpp-sdk/type_switcher.h

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
#pragma once
22

3-
#ifdef YDB_SDK_USE_TSTRING
4-
#include <util/generic/string.h>
3+
#ifdef YDB_SDK_USE_STD_STRING
4+
5+
#include <string>
56
namespace NYdb {
6-
using TStringType = TString;
7+
using TStringType = std::string;
78
}
9+
810
#else
9-
#include <string>
11+
12+
#include <util/generic/string.h>
1013
namespace NYdb {
11-
using TStringType = std::string;
14+
using TStringType = TString;
1215
}
16+
1317
#endif

‎src/api/protos/ydb_issue_message.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ message IssueMessage {
1616
string message = 2;
1717
Position end_position = 3;
1818
uint32 issue_code = 4;
19-
// Severity values from ydb/public/sdk/cpp/src/library/yql_common/issue/protos/issue_severity.proto
19+
// Severity values from src/library/yql_common/issue/protos/issue_severity.proto
2020
// FATAL = 0;
2121
// ERROR = 1;
2222
// WARNING = 2;

‎src/client/impl/ydb_internal/kqp_session_common/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ _ydb_sdk_add_library(impl-ydb_internal-kqp_session_common)
33
target_link_libraries(impl-ydb_internal-kqp_session_common PUBLIC
44
yutil
55
threading-future
6-
lib-operation_id-protos
6+
library-operation_id
77
client-impl-ydb_endpoints
88
)
99

‎src/client/persqueue_public/impl/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <ydb-cpp-sdk/client/types/status_codes.h>
44

5-
#include <library/cpp/retry/retry_policy.h>
5+
#include <ydb-cpp-sdk/library/retry/retry_policy.h>
66

77
namespace NYdb::NPersQueue {
88
ERetryErrorClass GetRetryErrorClass(EStatus status);

‎src/client/persqueue_public/ut/basic_usage_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ut_utils.h>
1+
#include <src/client/persqueue_public/ut/ut_utils/ut_utils.h>
22

33
#include <library/cpp/testing/unittest/registar.h>
44
#include <library/cpp/threading/future/future.h>

‎src/client/persqueue_public/ut/common_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <ydb/public/sdk/cpp/src/client/topic/impl/common.h>
1+
#include <src/client/topic/impl/common.h>
22

33
#include <library/cpp/testing/unittest/registar.h>
44

‎src/client/persqueue_public/ut/compress_executor_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ut_utils.h>
1+
#include <src/client/persqueue_public/ut/ut_utils/ut_utils.h>
22

33
namespace NYdb::NPersQueue::NTests {
44

‎src/client/persqueue_public/ut/compression_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ut_utils.h>
1+
#include <src/client/persqueue_public/ut/ut_utils/ut_utils.h>
22

33
namespace NYdb::NPersQueue::NTests {
44

‎src/client/persqueue_public/ut/read_session_ut.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ut_utils.h>
1+
#include <src/client/persqueue_public/ut/ut_utils/ut_utils.h>
22

33
#define INCLUDE_YDB_INTERNAL_H
4-
#include <ydb/public/sdk/cpp/src/client/impl/ydb_internal/logger/log.h>
4+
#include <src/client/impl/ydb_internal/logger/log.h>
55
#undef INCLUDE_YDB_INTERNAL_H
66

7-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/persqueue.h>
8-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/impl/read_session.h>
7+
#include <src/client/persqueue_public/persqueue.h>
8+
#include <src/client/persqueue_public/impl/read_session.h>
99

1010
#include <library/cpp/streams/zstd/zstd.h>
1111
#include <library/cpp/testing/gmock_in_unittest/gmock.h>

‎src/client/persqueue_public/ut/retry_policy_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ut_utils.h>
1+
#include <src/client/persqueue_public/ut/ut_utils/ut_utils.h>
22

33
#include <library/cpp/threading/future/future.h>
44
#include <library/cpp/testing/unittest/registar.h>

‎src/client/persqueue_public/ut/ut_utils/data_plane_helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <ydb-cpp-sdk/client/driver/driver.h>
44
#include <ydb-cpp-sdk/client/table/table.h>
5-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/persqueue.h>
5+
#include <src/client/persqueue_public/persqueue.h>
66

77
namespace NKikimr::NPersQueueTests {
88

‎src/client/persqueue_public/ut/ut_utils/sdk_test_setup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include "test_server.h"
3-
#include <ydb/public/sdk/cpp/src/library/persqueue/topic_parser_public/topic_parser.h>
3+
#include <src/library/persqueue/topic_parser_public/topic_parser.h>
44
#include <library/cpp/logger/log.h>
55
#include <util/system/tempfile.h>
66

‎src/client/persqueue_public/ut/ut_utils/test_server.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include <ydb/core/testlib/test_pq_client.h>
3-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/persqueue.h>
3+
#include <src/client/persqueue_public/persqueue.h>
44

55
#include <ydb/library/grpc/server/grpc_server.h>
66

‎src/client/persqueue_public/ut/ut_utils/ut_utils.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/test_utils.h>
4-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/sdk_test_setup.h>
5-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/include/aliases.h>
6-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/impl/write_session.h>
3+
#include <src/client/persqueue_public/ut/ut_utils/test_utils.h>
4+
#include <src/client/persqueue_public/ut/ut_utils/sdk_test_setup.h>
5+
#include <src/client/persqueue_public/include/aliases.h>
6+
#include <src/client/persqueue_public/impl/write_session.h>
77

8-
#include <ydb/public/sdk/cpp/src/client/topic/common/executor_impl.h>
8+
#include <src/client/topic/common/executor_impl.h>
99

1010
using namespace NKikimr;
1111
using namespace NKikimr::NPersQueueTests;

‎src/client/proto/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ target_link_libraries(client-ydb_proto PUBLIC
55
api-grpc
66
api-grpc-draft
77
api-protos
8-
lib-operation_id-protos
8+
library-operation_id
99
client-ydb_params
1010
client-ydb_value
1111
yql-public-issue-protos

‎src/client/table/impl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ target_link_libraries(client-ydb_table-impl
66
threading-future
77
api-protos
88
api-grpc
9-
lib-operation_id-protos
9+
library-operation_id
1010
client-impl-ydb_endpoints
1111
impl-ydb_internal-session_pool
1212
client-ydb_table-query_stats

‎src/client/topic/ut/basic_usage_ut.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#include "ut_utils/managed_executor.h"
22
#include "ut_utils/topic_sdk_test_setup.h"
3-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ut_utils.h>
3+
#include <src/client/persqueue_public/ut/ut_utils/ut_utils.h>
44

55
#include <ydb-cpp-sdk/client/topic/client.h>
66

7-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/persqueue.h>
7+
#include <src/client/persqueue_public/persqueue.h>
88

9-
#include <ydb/public/sdk/cpp/src/client/topic/impl/common.h>
10-
#include <ydb/public/sdk/cpp/src/client/topic/common/executor_impl.h>
11-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/impl/write_session.h>
12-
#include <ydb/public/sdk/cpp/src/client/topic/impl/write_session.h>
9+
#include <src/client/topic/impl/common.h>
10+
#include <src/client/topic/common/executor_impl.h>
11+
#include <src/client/persqueue_public/impl/write_session.h>
12+
#include <src/client/topic/impl/write_session.h>
1313

1414
#include <library/cpp/testing/unittest/registar.h>
1515
#include <library/cpp/testing/unittest/tests_data.h>

‎src/client/topic/ut/describe_topic_ut.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#include "ut_utils/topic_sdk_test_setup.h"
22

33
#include <format>
4-
#include <ydb/public/sdk/cpp/src/library/persqueue/topic_parser_public/topic_parser.h>
4+
#include <src/library/persqueue/topic_parser_public/topic_parser.h>
55
#include <src/api/protos/persqueue_error_codes_v1.pb.h>
66
#include <ydb-cpp-sdk/client/topic/client.h>
7-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/persqueue.h>
8-
#include <ydb/public/sdk/cpp/src/client/topic/common/log_lazy.h>
9-
#include <ydb/public/sdk/cpp/src/client/topic/impl/common.h>
7+
#include <src/client/persqueue_public/persqueue.h>
8+
#include <src/client/topic/common/log_lazy.h>
9+
#include <src/client/topic/impl/common.h>
1010

1111
#include <library/cpp/testing/unittest/registar.h>
1212
#include <library/cpp/testing/unittest/tests_data.h>

‎src/client/topic/ut/local_partition_ut.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
#include <ydb/core/persqueue/ut/common/autoscaling_ut_common.h>
44

5-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ut_utils.h>
5+
#include <src/client/persqueue_public/ut/ut_utils/ut_utils.h>
66

7-
#include <ydb/public/sdk/cpp/src/client/topic/common/trace_lazy.h>
7+
#include <src/client/topic/common/trace_lazy.h>
88
#include <ydb-cpp-sdk/client/topic/client.h>
9-
#include <ydb/public/sdk/cpp/src/client/topic/ut/ut_utils/trace.h>
9+
#include <src/client/topic/ut/ut_utils/trace.h>
1010

11-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/persqueue.h>
11+
#include <src/client/persqueue_public/persqueue.h>
1212

13-
#include <ydb/public/sdk/cpp/src/client/topic/impl/common.h>
14-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/impl/write_session.h>
13+
#include <src/client/topic/impl/common.h>
14+
#include <src/client/persqueue_public/impl/write_session.h>
1515

1616
#include <library/cpp/testing/unittest/registar.h>
1717
#include <library/cpp/testing/unittest/tests_data.h>

‎src/client/topic/ut/topic_to_table_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <ydb-cpp-sdk/client/topic/client.h>
44
#include <ydb-cpp-sdk/client/table/table.h>
5-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ut_utils.h>
5+
#include <src/client/persqueue_public/ut/ut_utils/ut_utils.h>
66
#include <ydb/core/keyvalue/keyvalue_events.h>
77
#include <ydb/core/persqueue/key.h>
88
#include <ydb/core/persqueue/blob.h>

‎src/client/topic/ut/trace_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <library/cpp/testing/unittest/registar.h>
22

3-
#include <ydb/public/sdk/cpp/src/client/topic/ut/ut_utils/trace.h>
3+
#include <src/client/topic/ut/ut_utils/trace.h>
44

55
namespace NYdb::NTopic::NTests {
66

‎src/client/topic/ut/ut_utils/topic_sdk_test_setup.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include <ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/test_server.h>
3+
#include <src/client/persqueue_public/ut/ut_utils/test_server.h>
44

5-
#include <ydb/public/sdk/cpp/src/client/topic/impl/write_session.h>
5+
#include <src/client/topic/impl/write_session.h>
66

77
namespace NYdb::NTopic::NTests {
88

‎src/client/topic/ut/ut_utils/trace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <mutex>
2-
#include <ydb/public/sdk/cpp/src/client/topic/ut/ut_utils/trace.h>
2+
#include <src/client/topic/ut/ut_utils/trace.h>
33

44
#include "library/cpp/testing/unittest/registar.h"
55

‎src/client/topic/ut/ut_utils/trace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "ydb/public/sdk/cpp/src/client/topic/common/trace_lazy.h"
3+
#include "src/client/topic/common/trace_lazy.h"
44

55
#include "library/cpp/logger/backend.h"
66
#include "library/cpp/logger/record.h"

‎src/client/types/credentials/oauth2_token_exchange/credentials.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <library/cpp/http/simple/http_client.h>
66
#include <library/cpp/json/json_reader.h>
77
#include <library/cpp/uri/uri.h>
8-
#include <library/cpp/retry/retry_policy.h>
8+
#include <ydb-cpp-sdk/library/retry/retry_policy.h>
99

1010
#include <util/datetime/base.h>
1111
#include <util/string/builder.h>

‎src/client/types/credentials/oauth2_token_exchange/from_file.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ TOauth2TokenExchangeParams ReadOauth2ConfigJson(const std::string& configJson, c
250250
}
251251

252252
TOauth2TokenExchangeParams ReadOauth2ConfigFile(const std::string& configFilePath, const std::string& tokenEndpoint) {
253-
return ReadOauth2ConfigJson(TFileInput(TStringType{configFilePath}).ReadAll(), tokenEndpoint);
253+
return ReadOauth2ConfigJson(TFileInput(TString{configFilePath}).ReadAll(), tokenEndpoint);
254254
}
255255

256256
} // namespace

‎src/library/json_value/ydb_json_value.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <ydb-cpp-sdk/library/json_value/ydb_json_value.h>
22

3-
#include <library/cpp/string_utils/base64/base64.h>
3+
#include <src/library/string_utils/base64/base64.h>
44

55
#include <library/cpp/json/json_reader.h>
66
#include <util/string/builder.h>

‎src/library/retry/retry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <ydb-cpp-sdk/library/retry/retry_policy.h>
44
#include "utils.h"
55

6-
#include <ydb/public/sdk/cpp/src/library/retry/protos/retry_options.pb.h>
6+
#include <src/library/retry/protos/retry_options.pb.h>
77

88
#include <util/datetime/base.h>
99
#include <util/generic/typetraits.h>

‎src/library/yql_common/issue/CMakeLists.txt

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@ add_subdirectory(protos)
22

33
_ydb_sdk_add_library(yql-public-issue)
44

5-
target_link_libraries(yql-public-issue PUBLIC
6-
yutil
7-
protobuf::libprotobuf
8-
colorizer
9-
resource
10-
api-protos
11-
yql-public-issue-protos
12-
yql-utils
13-
enum_serialization_runtime
14-
string_utils-misc
5+
target_link_libraries(yql-public-issue
6+
PUBLIC
7+
yutil
8+
protobuf::libprotobuf
9+
colorizer
10+
resource
11+
api-protos
12+
yql-public-issue-protos
13+
yql-utils
14+
enum_serialization_runtime
15+
string_utils-misc
1516
)
1617

17-
target_sources(yql-public-issue PRIVATE
18-
yql_issue_id.cpp
19-
yql_issue_message.cpp
20-
yql_issue.cpp
21-
out.cpp
18+
target_sources(yql-public-issue
19+
PRIVATE
20+
yql_issue_id.cpp
21+
yql_issue_message.cpp
22+
yql_issue.cpp
23+
out.cpp
2224
)
2325

2426
_ydb_sdk_install_targets(TARGETS yql-public-issue)

0 commit comments

Comments
 (0)