Skip to content

Commit 67ce685

Browse files
GazizonokiGazizonoki
authored
Moved client and library public headers to include/ dir (ydb-platform#151)
1 parent 409b0e9 commit 67ce685

File tree

997 files changed

+1476
-2200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

997 files changed

+1476
-2200
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set(YDB_SDK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
1010
set(YDB_SDK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
1111

1212
list(APPEND CMAKE_MODULE_PATH ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR}/cmake)
13-
include_directories(${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR})
13+
include_directories(${YDB_SDK_SOURCE_DIR} ${YDB_SDK_SOURCE_DIR}/include ${YDB_SDK_BINARY_DIR})
1414
list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure")
1515
enable_testing()
1616

‎examples/basic_example/basic_example.h

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

3-
#include <src/client/ydb_driver/driver.h>
4-
#include <src/client/ydb_table/table.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/client/table/table.h>
55

66
NYdb::TParams GetTablesDataParams();
77

‎examples/bulk_upsert_simple/main.cpp

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

33
#include <src/library/getopt/last_getopt.h>
44

‎examples/pagination/pagination.h

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

3-
#include <src/client/ydb_driver/driver.h>
4-
#include <src/client/ydb_table/table.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/client/table/table.h>
55

66
NYdb::TParams GetTablesDataParams();
77

‎examples/secondary_index/secondary_index.h

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

3-
#include <src/client/ydb_driver/driver.h>
4-
#include <src/client/ydb_table/table.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/client/table/table.h>
55

66
#include <src/library/getopt/last_getopt.h>
77

‎examples/secondary_index_builtin/secondary_index.h

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

3-
#include <src/client/ydb_driver/driver.h>
4-
#include <src/client/ydb_table/table.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/client/table/table.h>
55

66
#include <src/library/getopt/last_getopt.h>
77
#include <string>

‎examples/topic_reader/eventloop/main.cpp

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

33
#include <src/library/getopt/last_getopt.h>
44

‎examples/topic_reader/simple/main.cpp

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

33
#include <src/library/getopt/last_getopt.h>
44

‎examples/topic_reader/transaction/application.h

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

33
#include "options.h"
44

5-
#include <src/client/ydb_driver/driver.h>
6-
#include <src/client/ydb_topic/topic.h>
7-
#include <src/client/ydb_table/table.h>
5+
#include <ydb-cpp-sdk/client/driver/driver.h>
6+
#include <ydb-cpp-sdk/client/topic/topic.h>
7+
#include <ydb-cpp-sdk/client/table/table.h>
88

99
#include <memory>
1010
#include <optional>

‎examples/topic_reader/transaction/main.cpp

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

4-
#include <src/client/ydb_driver/driver.h>
4+
#include <ydb-cpp-sdk/client/driver/driver.h>
55

66
#include <optional>
77

‎examples/topic_reader/transaction/options.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 <src/library/logger/priority.h>
3+
#include <ydb-cpp-sdk/library/logger/priority.h>
44

55
#include <string>
66

‎examples/ttl/ttl.h

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

3-
#include <src/client/ydb_driver/driver.h>
4-
#include <src/client/ydb_table/table.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/client/table/table.h>
55

66
NYdb::TParams GetTablesDataParams();
77

‎examples/ttl/util.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 <src/client/ydb_table/table.h>
3+
#include <ydb-cpp-sdk/client/table/table.h>
44

55
#include <src/util/folder/pathsplit.h>
66
#include <src/util/generic/yexception.h>

‎src/client/ydb_common_client/settings.h renamed to ‎include/ydb-cpp-sdk/client/common_client/settings.h

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

3-
#include <src/client/ydb_types/credentials/credentials.h>
4-
#include <src/client/ydb_types/fluent_settings_helpers.h>
5-
#include <src/client/ydb_types/ydb.h>
3+
#include "ssl_credentials.h"
64

7-
#include <src/client/impl/ydb_internal/common/ssl_credentials.h>
5+
#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
6+
#include <ydb-cpp-sdk/client/types/fluent_settings_helpers.h>
7+
#include <ydb-cpp-sdk/client/types/ydb.h>
88

99
#include <optional>
10-
#include <functional>
1110

1211
namespace NYdb {
1312

‎src/client/impl/ydb_internal/common/ssl_credentials.h renamed to ‎include/ydb-cpp-sdk/client/common_client/ssl_credentials.h

File renamed without changes.

‎src/client/ydb_coordination/coordination.h renamed to ‎include/ydb-cpp-sdk/client/coordination/coordination.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 <src/client/ydb_driver/driver.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
44

55
namespace Ydb {
66
namespace Coordination {

‎src/client/ydb_datastreams/datastreams.h renamed to ‎include/ydb-cpp-sdk/client/datastreams/datastreams.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 <src/client/ydb_table/table.h>
3+
#include <ydb-cpp-sdk/client/table/table.h>
44

55
#include <src/api/grpc/draft/ydb_datastreams_v1.grpc.pb.h>
66

‎src/client/ydb_discovery/discovery.h renamed to ‎include/ydb-cpp-sdk/client/discovery/discovery.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 <src/client/ydb_driver/driver.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
44

55
namespace Ydb {
66
namespace Discovery {

‎src/client/draft/ydb_dynamic_config.h renamed to ‎include/ydb-cpp-sdk/client/draft/ydb_dynamic_config.h

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

33
#include <src/api/grpc/draft/ydb_dynamic_config_v1.grpc.pb.h>
4-
#include <src/client/ydb_types/ydb.h>
5-
#include <src/client/ydb_types/status/status.h>
6-
#include <src/client/ydb_common_client/settings.h>
7-
#include <src/client/ydb_types/request_settings.h>
8-
#include <src/client/ydb_driver/driver.h>
9-
10-
#include <src/util/generic/set.h>
11-
#include <src/util/system/types.h>
4+
#include <ydb-cpp-sdk/client/types/ydb.h>
5+
#include <ydb-cpp-sdk/client/types/status/status.h>
6+
#include <ydb-cpp-sdk/client/common_client/settings.h>
7+
#include <ydb-cpp-sdk/client/types/request_settings.h>
8+
#include <ydb-cpp-sdk/client/driver/driver.h>
129

1310
#include <memory>
1411

@@ -138,18 +135,18 @@ struct TVerboseResolveConfigResult : public TStatus {
138135
}
139136
};
140137

141-
using ConfigByLabelSet = std::map<TSet<std::vector<TLabel>>, std::string>;
138+
using ConfigByLabelSet = std::map<std::set<std::vector<TLabel>>, std::string>;
142139

143140
TVerboseResolveConfigResult(
144141
TStatus&& status,
145-
TSet<std::string>&& labels,
142+
std::set<std::string>&& labels,
146143
ConfigByLabelSet&& configs)
147144
: TStatus(std::move(status))
148145
, Labels_(std::move(labels))
149146
, Configs_(std::move(configs))
150147
{}
151148

152-
const TSet<std::string>& GetLabels() const {
149+
const std::set<std::string>& GetLabels() const {
153150
return Labels_;
154151
}
155152

@@ -158,7 +155,7 @@ struct TVerboseResolveConfigResult : public TStatus {
158155
}
159156

160157
private:
161-
TSet<std::string> Labels_;
158+
std::set<std::string> Labels_;
162159
ConfigByLabelSet Configs_;
163160
};
164161

‎src/client/draft/ydb_long_tx.h renamed to ‎include/ydb-cpp-sdk/client/draft/ydb_long_tx.h

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

33
#include <src/api/grpc/draft/ydb_long_tx_v1.grpc.pb.h>
4-
#include <src/client/ydb_driver/driver.h>
5-
#include <src/client/ydb_types/operation/operation.h>
4+
#include <ydb-cpp-sdk/client/driver/driver.h>
5+
#include <ydb-cpp-sdk/client/types/operation/operation.h>
66

77
namespace NYdb {
88
namespace NLongTx {

‎src/client/draft/ydb_scripting.h renamed to ‎include/ydb-cpp-sdk/client/draft/ydb_scripting.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 <src/client/ydb_table/table.h>
3+
#include <ydb-cpp-sdk/client/table/table.h>
44
#include <src/api/protos/ydb_value.pb.h>
55
#include <src/api/protos/ydb_query.pb.h>
66

‎src/client/ydb_driver/driver.h renamed to ‎include/ydb-cpp-sdk/client/driver/driver.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 <src/client/ydb_common_client/settings.h>
4-
#include <src/client/ydb_types/status_codes.h>
5-
#include <src/client/ydb_types/credentials/credentials.h>
6-
#include <src/client/ydb_types/fatal_error_handlers/handlers.h>
7-
#include <src/client/ydb_types/request_settings.h>
8-
#include <src/client/ydb_types/status/status.h>
9-
10-
#include <src/library/logger/backend.h>
3+
#include <ydb-cpp-sdk/client/common_client/settings.h>
4+
#include <ydb-cpp-sdk/client/types/status_codes.h>
5+
#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
6+
#include <ydb-cpp-sdk/client/types/fatal_error_handlers/handlers.h>
7+
#include <ydb-cpp-sdk/client/types/request_settings.h>
8+
#include <ydb-cpp-sdk/client/types/status/status.h>
9+
10+
#include <ydb-cpp-sdk/library/logger/backend.h>
1111

1212
////////////////////////////////////////////////////////////////////////////////
1313

‎src/client/ydb_export/export.h renamed to ‎include/ydb-cpp-sdk/client/export/export.h

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

3-
#include <src/client/ydb_driver/driver.h>
4-
#include <src/client/ydb_types/operation/operation.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/client/types/operation/operation.h>
55

6-
#include <src/client/ydb_types/s3_settings.h>
6+
#include <ydb-cpp-sdk/client/types/s3_settings.h>
77

88
namespace NYdb {
99
namespace NExport {

‎src/client/extensions/discovery_mutator/discovery_mutator.h renamed to ‎include/ydb-cpp-sdk/client/extensions/discovery_mutator/discovery_mutator.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 <src/client/ydb_extension/extension.h>
3+
#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
44

55
namespace NDiscoveryMutator {
66

‎src/client/extensions/solomon_stats/pull_client.h renamed to ‎include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_client.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 <src/client/ydb_extension/extension.h>
4-
5-
#include <src/library/http/server/response.h>
6-
#include <src/library/monlib/metrics/metric_consumer.h>
7-
#include <src/library/monlib/encode/json/json.h>
8-
#include <src/library/monlib/metrics/metric_registry.h>
9-
#include <src/library/monlib/service/pages/mon_page.h>
10-
#include <src/library/monlib/service/monservice.h>
3+
#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
4+
5+
#include <ydb-cpp-sdk/library/http/server/response.h>
6+
#include <ydb-cpp-sdk/library/monlib/metrics/metric_consumer.h>
7+
#include <ydb-cpp-sdk/library/monlib/encode/json/json.h>
8+
#include <ydb-cpp-sdk/library/monlib/metrics/metric_registry.h>
9+
#include <ydb-cpp-sdk/library/monlib/service/pages/mon_page.h>
10+
#include <ydb-cpp-sdk/library/monlib/service/monservice.h>
1111

1212
namespace NSolomonStatExtension {
1313

‎src/client/extensions/solomon_stats/pull_connector.h renamed to ‎include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_connector.h

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

3-
#include <src/client/ydb_extension/extension.h>
3+
#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
44

5-
#include <src/library/monlib/metrics/metric_registry.h>
6-
7-
#include <src/util/generic/ptr.h>
5+
#include <ydb-cpp-sdk/library/monlib/metrics/metric_registry.h>
86

97
namespace NSolomonStatExtension {
108

‎src/client/ydb_federated_topic/federated_topic.h renamed to ‎include/ydb-cpp-sdk/client/federated_topic/federated_topic.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 <src/client/ydb_topic/topic.h>
3+
#include <ydb-cpp-sdk/client/topic/topic.h>
44

55
#include <src/api/protos/ydb_federation_discovery.pb.h>
66

‎src/client/helpers/helpers.h renamed to ‎include/ydb-cpp-sdk/client/helpers/helpers.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 <src/client/ydb_driver/driver.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
44

55
namespace NYdb {
66

‎src/client/iam/common/iam.h renamed to ‎include/ydb-cpp-sdk/client/iam/common/iam.h

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

3-
#include <src/client/ydb_types/credentials/credentials.h>
3+
#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
44

5-
#include <src/library/grpc/client/grpc_client_low.h>
6-
#include <src/library/threading/atomic/bool.h>
7-
#include <src/library/threading/future/core/future.h>
8-
#include <src/library/json/json_reader.h>
5+
#include <ydb-cpp-sdk/library/grpc/client/grpc_client_low.h>
6+
#include <ydb-cpp-sdk/library/threading/future/future.h>
7+
#include <ydb-cpp-sdk/library/json/json_reader.h>
98

10-
#include <src/library/jwt/jwt.h>
11-
#include <src/util/datetime/base.h>
9+
#include <ydb-cpp-sdk/library/jwt/jwt.h>
10+
#include <ydb-cpp-sdk/util/datetime/base.h>
1211

1312
#include <src/util/system/spinlock.h>
14-
#include <src/util/stream/file.h>
1513
#include <src/util/string/builder.h>
1614

15+
#include <fstream>
16+
1717
namespace NYdb {
1818

1919
namespace NIam {
@@ -45,7 +45,8 @@ struct TIamJwtContent : TIamEndpoint { std::string JwtContent; };
4545
struct TIamJwtParams : TIamEndpoint { TJwtParams JwtParams; };
4646

4747
inline TJwtParams ReadJwtKeyFile(const std::string& filename) {
48-
return ParseJwtParams(TFileInput(filename.c_str()).ReadAll());
48+
std::ifstream input(filename, std::ios::in);
49+
return ParseJwtParams({std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>()});
4950
}
5051

5152
struct TIamOAuth : TIamEndpoint { std::string OAuthToken; };

‎src/client/iam/iam.h renamed to ‎include/ydb-cpp-sdk/client/iam/iam.h

File renamed without changes.

‎src/client/iam_private/iam.h renamed to ‎include/ydb-cpp-sdk/client/iam_private/iam.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 <src/client/iam/common/iam.h>
3+
#include <ydb-cpp-sdk/client/iam/common/iam.h>
44

55
namespace NYdb {
66

‎src/client/ydb_import/import.h renamed to ‎include/ydb-cpp-sdk/client/import/import.h

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

3-
#include <src/client/ydb_driver/driver.h>
4-
#include <src/client/ydb_types/operation/operation.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/client/types/operation/operation.h>
55

6-
#include <src/client/ydb_types/s3_settings.h>
6+
#include <ydb-cpp-sdk/client/types/s3_settings.h>
77

88
namespace NYdb {
99
namespace NImport {

‎src/client/ydb_monitoring/monitoring.h renamed to ‎include/ydb-cpp-sdk/client/monitoring/monitoring.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 <src/client/ydb_driver/driver.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
44

55
namespace Ydb {
66
namespace Monitoring {

‎src/client/ydb_operation/operation.h renamed to ‎include/ydb-cpp-sdk/client/operation/operation.h

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

3-
#include <src/client/ydb_driver/driver.h>
4-
#include <src/client/ydb_types/operation/operation.h>
3+
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/client/types/operation/operation.h>
55

66
#include <src/util/string/builder.h>
77

0 commit comments

Comments
 (0)