Skip to content

Commit 9b113c1

Browse files
GazizonokiGazizonoki
committed
Intermediate changes
1 parent c569b6b commit 9b113c1

File tree

25 files changed

+55
-31
lines changed

25 files changed

+55
-31
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ add_subdirectory(library/cpp)
4242
add_subdirectory(src)
4343
add_subdirectory(util)
4444

45-
_ydb_sdk_validate_public_headers()
45+
#_ydb_sdk_validate_public_headers()
4646

4747
if (YDB_SDK_EXAMPLES)
4848
add_subdirectory(examples)

‎cmake/common.cmake

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,3 +179,23 @@ function(_ydb_sdk_make_client_component CmpName Tgt)
179179
set(YDB-CPP-SDK_AVAILABLE_COMPONENTS ${YDB-CPP-SDK_AVAILABLE_COMPONENTS} ${CmpName} CACHE INTERNAL "")
180180
set(YDB-CPP-SDK_COMPONENT_TARGETS ${YDB-CPP-SDK_COMPONENT_TARGETS} ${Tgt} CACHE INTERNAL "")
181181
endfunction()
182+
183+
function(_ydb_sdk_add_library Tgt)
184+
cmake_parse_arguments(ARG
185+
"INTERFACE" "" ""
186+
${ARGN}
187+
)
188+
189+
set(LibraryMode "")
190+
set(IncludeMode "PUBLIC")
191+
if (ARG_INTERFACE)
192+
set(LibraryMode "INTERFACE")
193+
set(IncludeMode "INTERFACE")
194+
endif()
195+
add_library(${Tgt} ${LibraryMode})
196+
target_include_directories(${Tgt} ${IncludeMode}
197+
$<BUILD_INTERFACE:${YDB_SDK_SOURCE_DIR}>
198+
$<BUILD_INTERFACE:${YDB_SDK_BINARY_DIR}>
199+
$<BUILD_INTERFACE:${YDB_SDK_SOURCE_DIR}/include>
200+
)
201+
endfunction()

‎include/ydb-cpp-sdk/client/draft/ydb_scripting.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/table/table.h>
4-
#include <ydb-cpp-sdk/src/api/protos/ydb_query.pb.h>
4+
#include <src/api/protos/ydb_query.pb.h>
55

66
namespace NYdb {
77
namespace NScripting {

‎include/ydb-cpp-sdk/client/federated_topic/federated_topic.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/topic/client.h>
44

5-
#include <ydb-cpp-sdk/src/api/protos/ydb_federation_discovery.pb.h>
5+
#include <src/api/protos/ydb_federation_discovery.pb.h>
66

77
#include <ydb-cpp-sdk/client/types/exceptions/exceptions.h>
88

‎include/ydb-cpp-sdk/client/proto/accessor.h

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

3-
#include <ydb-cpp-sdk/src/api/protos/draft/ydb_replication.pb.h>
4-
#include <ydb-cpp-sdk/src/api/protos/ydb_coordination.pb.h>
5-
#include <ydb-cpp-sdk/src/api/protos/ydb_export.pb.h>
6-
#include <ydb-cpp-sdk/src/api/protos/ydb_import.pb.h>
7-
#include <ydb-cpp-sdk/src/api/protos/ydb_query_stats.pb.h>
8-
#include <ydb-cpp-sdk/src/api/protos/ydb_table.pb.h>
9-
#include <ydb-cpp-sdk/src/api/protos/ydb_topic.pb.h>
10-
#include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
3+
#include <src/api/protos/draft/ydb_replication.pb.h>
4+
#include <src/api/protos/ydb_coordination.pb.h>
5+
#include <src/api/protos/ydb_export.pb.h>
6+
#include <src/api/protos/ydb_import.pb.h>
7+
#include <src/api/protos/ydb_query_stats.pb.h>
8+
#include <src/api/protos/ydb_table.pb.h>
9+
#include <src/api/protos/ydb_topic.pb.h>
10+
#include <src/api/protos/ydb_value.pb.h>
1111

1212
#include <ydb-cpp-sdk/client/draft/ydb_replication.h>
1313
#include <ydb-cpp-sdk/client/coordination/coordination.h>

‎include/ydb-cpp-sdk/library/operation_id/operation_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-cpp-sdk/src/library/operation_id/protos/operation_id.pb.h>
3+
#include <src/library/operation_id/protos/operation_id.pb.h>
44

55
#include <string>
66
#include <vector>

‎include/ydb-cpp-sdk/library/yql/public/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-cpp-sdk/src/library/yql/public/issue/protos/issue_severity.pb.h>
3+
#include <src/library/yql/public/issue/protos/issue_severity.pb.h>
44

55
namespace NYql {
66

‎src/api/proto_output/proto_output.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <util/stream/output.h>
22

3-
#include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
4-
#include <ydb-cpp-sdk/src/api/protos/ydb_topic.pb.h>
3+
#include <src/api/protos/ydb_value.pb.h>
4+
#include <src/api/protos/ydb_topic.pb.h>
55

66
#include <google/protobuf/text_format.h>
77

‎src/client/export/export.cpp

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

77
#include <src/api/grpc/ydb_discovery_v1.grpc.pb.h>
88
#include <src/api/grpc/ydb_export_v1.grpc.pb.h>
9-
#include <ydb-cpp-sdk/src/api/protos/ydb_export.pb.h>
9+
#include <src/api/protos/ydb_export.pb.h>
1010
#include <src/client/common_client/impl/client.h>
1111
#include <ydb-cpp-sdk/client/proto/accessor.h>
1212

‎src/client/federated_topic/impl/federation_observer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <src/client/impl/ydb_internal/grpc_connections/grpc_connections.h>
66
#undef INCLUDE_YDB_INTERNAL_H
77

8-
#include <ydb-cpp-sdk/src/api/protos/ydb_federation_discovery.pb.h>
8+
#include <src/api/protos/ydb_federation_discovery.pb.h>
99

1010
#include <src/client/topic/common/callback_context.h>
1111
#include <src/client/common_client/impl/client.h>

‎src/client/impl/ydb_internal/table_helpers/helpers.h

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

33
#include <src/client/impl/ydb_internal/internal_header.h>
44

5-
#include <ydb-cpp-sdk/src/api/protos/ydb_table.pb.h>
5+
#include <src/api/protos/ydb_table.pb.h>
66
#include <ydb-cpp-sdk/client/table/query_stats/stats.h>
77

88
namespace NYdb {

‎src/client/impl/ydb_internal/value_helpers/helpers.h

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

33
#include <src/client/impl/ydb_internal/internal_header.h>
44

5-
#include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
5+
#include <src/api/protos/ydb_value.pb.h>
66

77
namespace NYdb {
88

‎src/client/import/import.cpp

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

77
#include <src/api/grpc/ydb_discovery_v1.grpc.pb.h>
88
#include <src/api/grpc/ydb_import_v1.grpc.pb.h>
9-
#include <ydb-cpp-sdk/src/api/protos/ydb_import.pb.h>
9+
#include <src/api/protos/ydb_import.pb.h>
1010
#include <src/client/common_client/impl/client.h>
1111
#include <ydb-cpp-sdk/client/proto/accessor.h>
1212

‎src/client/params/impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "impl.h"
22

33
#include <src/api/protos/ydb_scheme.pb.h>
4-
#include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
4+
#include <src/api/protos/ydb_value.pb.h>
55

66

77
namespace NYdb {

‎src/client/params/params.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/params/params.h>
44

5-
#include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
5+
#include <src/api/protos/ydb_value.pb.h>
66

77
#include <ydb-cpp-sdk/client/types/fatal_error_handlers/handlers.h>
88

‎src/client/query/stats.cpp

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

3-
#include <ydb-cpp-sdk/src/api/protos/ydb_table.pb.h>
3+
#include <src/api/protos/ydb_table.pb.h>
44

55
#include <util/datetime/base.h>
66

‎src/client/result/result.cpp

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/fatal_error_handlers/handlers.h>
44

55
#include <src/api/protos/ydb_common.pb.h>
6-
#include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
6+
#include <src/api/protos/ydb_value.pb.h>
77

88
#include <util/string/builder.h>
99

‎src/client/ss_tasks/task.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "task.h"
22
#include <src/api/grpc/ydb_discovery_v1.grpc.pb.h>
33
#include <src/api/grpc/ydb_export_v1.grpc.pb.h>
4-
#include <ydb-cpp-sdk/src/api/protos/ydb_export.pb.h>
4+
#include <src/api/protos/ydb_export.pb.h>
55
#include <src/client/common_client/impl/client.h>
66
#include <ydb-cpp-sdk/client/proto/accessor.h>
77

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,8 @@ target_sources(client-ydb_table-impl PRIVATE
2323
table_client.cpp
2424
)
2525

26+
target_compile_options(client-ydb_table-impl PRIVATE
27+
-Wno-deprecated
28+
)
29+
2630
_ydb_sdk_install_targets(TARGETS client-ydb_table-impl)

‎src/client/table/impl/client_session.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <src/client/impl/ydb_endpoints/endpoints.h>
66
#include <ydb-cpp-sdk/library/operation_id/operation_id.h>
77

8-
#include <ydb-cpp-sdk/src/api/protos/ydb_table.pb.h>
8+
#include <src/api/protos/ydb_table.pb.h>
99

1010
#include <library/cpp/cache/cache.h>
1111

‎src/client/table/impl/data_query.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/table/table.h>
4-
#include <ydb-cpp-sdk/src/api/protos/ydb_table.pb.h>
4+
#include <src/api/protos/ydb_table.pb.h>
55

66
namespace NYdb {
77
namespace NTable {

‎src/client/table/table.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#undef INCLUDE_YDB_INTERNAL_H
1111

1212
#include <src/api/grpc/ydb_table_v1.grpc.pb.h>
13-
#include <ydb-cpp-sdk/src/api/protos/ydb_table.pb.h>
13+
#include <src/api/protos/ydb_table.pb.h>
1414
#include <src/client/impl/ydb_stats/stats.h>
1515
#include <ydb-cpp-sdk/client/proto/accessor.h>
1616
#include <ydb-cpp-sdk/client/value/value.h>

‎src/client/value/value.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <ydb-cpp-sdk/client/params/params.h>
88
#include <ydb-cpp-sdk/client/types/fatal_error_handlers/handlers.h>
99

10-
#include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
10+
#include <src/api/protos/ydb_value.pb.h>
1111

1212
#include <library/cpp/containers/stack_vector/stack_vec.h>
1313

‎tests/unit/client/result_ut.cpp

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

3-
#include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
3+
#include <src/api/protos/ydb_value.pb.h>
44
#include <ydb-cpp-sdk/client/types/exceptions/exceptions.h>
55

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

‎tests/unit/client/value_ut.cpp

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

3-
#include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
3+
#include <src/api/protos/ydb_value.pb.h>
44
#include <ydb-cpp-sdk/client/types/exceptions/exceptions.h>
55
#include <ydb-cpp-sdk/library/json_value/ydb_json_value.h>
66
#include <ydb-cpp-sdk/library/yson_value/ydb_yson_value.h>

0 commit comments

Comments
 (0)