Skip to content

Commit a8315ce

Browse files
GazizonokiGazizonoki
authored
Refactor SDK public headers (#275)
1 parent 263fb81 commit a8315ce

Some content is hidden

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

51 files changed

+587
-553
lines changed

‎examples/basic_example/basic_example.cpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

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

7+
#include <filesystem>
78
#include <format>
89

910
using namespace NYdb;
@@ -33,10 +34,10 @@ static std::string JoinPath(const std::string& basePath, const std::string& path
3334
return path;
3435
}
3536

36-
TPathSplitUnix prefixPathSplit(basePath);
37-
prefixPathSplit.AppendComponent(path);
37+
std::filesystem::path prefixPathSplit(basePath);
38+
prefixPathSplit /= path;
3839

39-
return prefixPathSplit.Reconstruct();
40+
return prefixPathSplit;
4041
}
4142

4243
///////////////////////////////////////////////////////////////////////////////
@@ -210,7 +211,7 @@ static TStatus UpsertSimpleTransaction(TSession session, const std::string& path
210211

211212
//! Shows usage of parameters in data queries.
212213
static TStatus SelectWithParamsTransaction(TSession session, const std::string& path,
213-
ui64 seriesId, ui64 seasonId, std::optional<TResultSet>& resultSet)
214+
uint64_t seriesId, uint64_t seasonId, std::optional<TResultSet>& resultSet)
214215
{
215216
auto query = std::format(R"(
216217
--!syntax_v1
@@ -250,7 +251,7 @@ static TStatus SelectWithParamsTransaction(TSession session, const std::string&
250251

251252
//! Shows usage of prepared queries.
252253
static TStatus PreparedSelectTransaction(TSession session, const std::string& path,
253-
ui64 seriesId, ui64 seasonId, ui64 episodeId, std::optional<TResultSet>& resultSet)
254+
uint64_t seriesId, uint64_t seasonId, uint64_t episodeId, std::optional<TResultSet>& resultSet)
254255
{
255256
// Once prepared, query data is stored in the session and identified by QueryId.
256257
// Local query cache is used to keep track of queries, prepared in current session.
@@ -302,7 +303,7 @@ static TStatus PreparedSelectTransaction(TSession session, const std::string& pa
302303
}
303304

304305
//! Shows usage of transactions consisting of multiple data queries with client logic between them.
305-
static TStatus MultiStepTransaction(TSession session, const std::string& path, ui64 seriesId, ui64 seasonId,
306+
static TStatus MultiStepTransaction(TSession session, const std::string& path, uint64_t seriesId, uint64_t seasonId,
306307
std::optional<TResultSet>& resultSet)
307308
{
308309
auto query1 = std::format(R"(
@@ -472,7 +473,7 @@ void SelectWithParams(TTableClient client, const std::string& path) {
472473
}
473474
}
474475

475-
void PreparedSelect(TTableClient client, const std::string& path, ui32 seriesId, ui32 seasonId, ui32 episodeId) {
476+
void PreparedSelect(TTableClient client, const std::string& path, uint32_t seriesId, uint32_t seasonId, uint32_t episodeId) {
476477
std::optional<TResultSet> resultSet;
477478
ThrowOnError(client.RetryOperationSync([path, seriesId, seasonId, episodeId, &resultSet](TSession session) {
478479
return PreparedSelectTransaction(session, path, seriesId, seasonId, episodeId, resultSet);

‎examples/basic_example/basic_example_data.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ using namespace NYdb;
44
using namespace NYdb::NTable;
55

66
struct TSeries {
7-
ui64 SeriesId;
7+
uint64_t SeriesId;
88
std::string Title;
99
TInstant ReleaseDate;
1010
std::string SeriesInfo;
1111

12-
TSeries(ui64 seriesId, const std::string& title, const TInstant& releaseDate, const std::string& seriesInfo)
12+
TSeries(uint64_t seriesId, const std::string& title, const TInstant& releaseDate, const std::string& seriesInfo)
1313
: SeriesId(seriesId)
1414
, Title(title)
1515
, ReleaseDate(releaseDate)
1616
, SeriesInfo(seriesInfo) {}
1717
};
1818

1919
struct TSeason {
20-
ui64 SeriesId;
21-
ui64 SeasonId;
20+
uint64_t SeriesId;
21+
uint64_t SeasonId;
2222
std::string Title;
2323
TInstant FirstAired;
2424
TInstant LastAired;
2525

26-
TSeason(ui64 seriesId, ui64 seasonId, const std::string& title, const TInstant& firstAired, const TInstant& lastAired)
26+
TSeason(uint64_t seriesId, uint64_t seasonId, const std::string& title, const TInstant& firstAired, const TInstant& lastAired)
2727
: SeriesId(seriesId)
2828
, SeasonId(seasonId)
2929
, Title(title)
@@ -32,13 +32,13 @@ struct TSeason {
3232
};
3333

3434
struct TEpisode {
35-
ui64 SeriesId;
36-
ui64 SeasonId;
37-
ui64 EpisodeId;
35+
uint64_t SeriesId;
36+
uint64_t SeasonId;
37+
uint64_t EpisodeId;
3838
std::string Title;
3939
TInstant AirDate;
4040

41-
TEpisode(ui64 seriesId, ui64 seasonId, ui64 episodeId, const std::string& title, const TInstant& airDate)
41+
TEpisode(uint64_t seriesId, uint64_t seasonId, uint64_t episodeId, const std::string& title, const TInstant& airDate)
4242
: SeriesId(seriesId)
4343
, SeasonId(seasonId)
4444
, EpisodeId(episodeId)

‎examples/basic_example/main.cpp‎

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

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

5-
#include <src/util/stream/file.h>
6-
75
#include <cstdlib>
6+
#include <fstream>
87

98
using namespace NLastGetopt;
109
using namespace NYdb;
@@ -13,6 +12,13 @@ void StopHandler(int) {
1312
exit(1);
1413
}
1514

15+
std::string ReadFile(const std::string& filename) {
16+
std::ifstream input(filename);
17+
std::stringstream data;
18+
data << input.rdbuf();
19+
return data.str();
20+
}
21+
1622
int main(int argc, char** argv) {
1723
TOpts opts = TOpts::Default();
1824

@@ -45,7 +51,7 @@ int main(int argc, char** argv) {
4551
.SetAuthToken(std::getenv("YDB_TOKEN") ? std::getenv("YDB_TOKEN") : "");
4652

4753
if (!certPath.empty()) {
48-
std::string cert = TFileInput(certPath).ReadAll();
54+
std::string cert = ReadFile(certPath);
4955
driverConfig.UseSecureConnection(cert);
5056
}
5157

‎examples/bulk_upsert_simple/main.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

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

5-
#include <src/util/folder/pathsplit.h>
5+
#include <filesystem>
66

77
constexpr size_t BATCH_SIZE = 1000;
88

99
struct TLogMessage {
1010
std::string App;
1111
std::string Host;
1212
TInstant Timestamp;
13-
ui32 HttpCode;
13+
uint32_t HttpCode;
1414
std::string Message;
1515
};
1616

17-
void GetLogBatch(ui64 logOffset, std::vector<TLogMessage>& logBatch) {
17+
void GetLogBatch(uint64_t logOffset, std::vector<TLogMessage>& logBatch) {
1818
logBatch.clear();
1919
for (size_t i = 0; i < BATCH_SIZE; ++i) {
2020
TLogMessage message;
@@ -83,7 +83,7 @@ bool CreateLogTable(NYdb::NTable::TTableClient& client, const std::string& table
8383
return true;
8484
}
8585

86-
bool Run(const NYdb::TDriver &driver, const std::string &table, ui32 batchCount) {
86+
bool Run(const NYdb::TDriver &driver, const std::string &table, uint32_t batchCount) {
8787
NYdb::NTable::TTableClient client(driver);
8888
if (!CreateLogTable(client, table)) {
8989
return false;
@@ -95,7 +95,7 @@ bool Run(const NYdb::TDriver &driver, const std::string &table, ui32 batchCount)
9595
.MaxRetries(20);
9696

9797
std::vector<TLogMessage> logBatch;
98-
for (ui32 offset = 0; offset < batchCount; ++offset) {
98+
for (uint32_t offset = 0; offset < batchCount; ++offset) {
9999
GetLogBatch(offset, logBatch);
100100
if (!WriteLogBatch(client, table, logBatch, writeRetrySettings)) {
101101
return false;
@@ -112,10 +112,10 @@ std::string JoinPath(const std::string& basePath, const std::string& path) {
112112
return path;
113113
}
114114

115-
TPathSplitUnix prefixPathSplit(basePath);
116-
prefixPathSplit.AppendComponent(path);
115+
std::filesystem::path prefixPathSplit(basePath);
116+
prefixPathSplit /= path;
117117

118-
return prefixPathSplit.Reconstruct();
118+
return prefixPathSplit;
119119
}
120120

121121
int main(int argc, char** argv) {
@@ -126,7 +126,7 @@ int main(int argc, char** argv) {
126126
std::string endpoint;
127127
std::string database;
128128
std::string table = "bulk_upsert_example";
129-
ui32 count = 1000;
129+
uint32_t count = 1000;
130130

131131
opts.AddLongOption('e', "endpoint", "YDB endpoint").Required().RequiredArgument("HOST:PORT")
132132
.StoreResult(&endpoint);
@@ -137,8 +137,7 @@ int main(int argc, char** argv) {
137137
opts.AddLongOption('c', "count", "count requests").Optional().RequiredArgument("NUM")
138138
.StoreResult(&count).DefaultValue(count);
139139

140-
TOptsParseResult res(&opts, argc, argv);
141-
Y_UNUSED(res);
140+
[[maybe_unused]] TOptsParseResult res(&opts, argc, argv);
142141

143142
table = JoinPath(database, table);
144143

‎examples/pagination/pagination.cpp‎

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

33
#include <ydb-cpp-sdk/util/string/cast.h>
44

5-
#include <src/util/folder/pathsplit.h>
5+
#include <filesystem>
66

77
using namespace NYdb;
88
using namespace NYdb::NTable;
99

10-
const ui32 MaxPages = 10;
10+
const uint32_t MaxPages = 10;
1111

1212
class TYdbErrorException : public yexception {
1313
public:
@@ -33,10 +33,10 @@ static std::string JoinPath(const std::string& basePath, const std::string& path
3333
return path;
3434
}
3535

36-
TPathSplitUnix prefixPathSplit(basePath);
37-
prefixPathSplit.AppendComponent(path);
36+
std::filesystem::path prefixPathSplit(basePath);
37+
prefixPathSplit /= path;
3838

39-
return prefixPathSplit.Reconstruct();
39+
return prefixPathSplit;
4040
}
4141

4242
//! Creates sample table with CrateTable API.
@@ -82,7 +82,7 @@ static TStatus FillTableDataTransaction(TSession& session, const std::string& pa
8282

8383
//! Shows usage of query paging.
8484
static TStatus SelectPagingTransaction(TSession& session, const std::string& path,
85-
ui64 pageLimit, const std::string& lastCity, ui32 lastNumber, std::optional<TResultSet>& resultSet)
85+
uint64_t pageLimit, const std::string& lastCity, uint32_t lastNumber, std::optional<TResultSet>& resultSet)
8686
{
8787
auto query = std::format(R"(
8888
--!syntax_v1
@@ -138,7 +138,7 @@ static TStatus SelectPagingTransaction(TSession& session, const std::string& pat
138138
return result;
139139
}
140140

141-
bool SelectPaging(TTableClient client, const std::string& path, ui64 pageLimit, std::string& lastCity, ui32& lastNumber) {
141+
bool SelectPaging(TTableClient client, const std::string& path, uint64_t pageLimit, std::string& lastCity, uint32_t& lastNumber) {
142142
std::optional<TResultSet> resultSet;
143143
ThrowOnError(client.RetryOperationSync([path, pageLimit, &lastCity, lastNumber, &resultSet](TSession session) {
144144
return SelectPagingTransaction(session, path, pageLimit, lastCity, lastNumber, resultSet);
@@ -167,10 +167,10 @@ bool Run(const TDriver& driver, const std::string& path) {
167167
return FillTableDataTransaction(session, path);
168168
}));
169169

170-
ui64 limit = 3;
170+
uint64_t limit = 3;
171171
std::string lastCity;
172-
ui32 lastNumber = 0;
173-
ui32 page = 0;
172+
uint32_t lastNumber = 0;
173+
uint32_t page = 0;
174174
bool pageNotEmpty = true;
175175

176176
std::cout << "> Pagination, Limit=" << limit << std::endl;

‎examples/pagination/pagination_data.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ using namespace NYdb::NTable;
55

66
struct TSchool {
77
std::string City;
8-
ui32 Number;
8+
uint32_t Number;
99
std::string Address;
1010

11-
TSchool(const std::string& city, ui32 number, const std::string& address)
11+
TSchool(const std::string& city, uint32_t number, const std::string& address)
1212
: City(city)
1313
, Number(number)
1414
, Address(address) {}

‎examples/secondary_index/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ int main(int argc, char** argv) {
6565
return 1;
6666
}
6767

68-
Y_UNREACHABLE();
68+
__builtin_unreachable();
6969
return 1;
7070
}

‎examples/secondary_index/secondary_index.cpp‎

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

3-
#include <src/util/folder/pathsplit.h>
3+
#include <filesystem>
44

55
std::string GetCmdList() {
66
return "create_tables, drop_tables, update_views, list, generate, delete";
@@ -33,8 +33,8 @@ std::string JoinPath(const std::string& prefix, const std::string& path) {
3333
return path;
3434
}
3535

36-
TPathSplitUnix prefixPathSplit(prefix);
37-
prefixPathSplit.AppendComponent(path);
36+
std::filesystem::path prefixPathSplit(prefix);
37+
prefixPathSplit /= path;
3838

39-
return prefixPathSplit.Reconstruct();
39+
return prefixPathSplit;
4040
}

‎examples/secondary_index/secondary_index.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
#define TABLE_SERIES_REV_VIEWS "series_rev_views"
1212

1313
struct TSeries {
14-
ui64 SeriesId;
14+
uint64_t SeriesId;
1515
std::string Title;
1616
std::string SeriesInfo;
1717
TInstant ReleaseDate;
18-
ui64 Views;
18+
uint64_t Views;
1919
};
2020

2121
////////////////////////////////////////////////////////////////////////////////

‎examples/secondary_index/secondary_index_delete.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ using namespace NYdb::NTable;
66

77
////////////////////////////////////////////////////////////////////////////////
88

9-
static TStatus DeleteSeries(TSession& session, const std::string& prefix, ui64 seriesId, ui64& deletedCount) {
9+
static TStatus DeleteSeries(TSession& session, const std::string& prefix, uint64_t seriesId, uint64_t& deletedCount) {
1010
auto queryText = std::format(R"(
1111
--!syntax_v1
1212
PRAGMA TablePathPrefix("{}");
@@ -61,14 +61,14 @@ static TStatus DeleteSeries(TSession& session, const std::string& prefix, ui64 s
6161
int RunDeleteSeries(TDriver& driver, const std::string& prefix, int argc, char** argv) {
6262
TOpts opts = TOpts::Default();
6363

64-
ui64 seriesId;
64+
uint64_t seriesId;
6565

6666
opts.AddLongOption("id", "Series id").Required().RequiredArgument("NUM")
6767
.StoreResult(&seriesId);
6868

6969
TOptsParseResult res(&opts, argc, argv);
7070

71-
ui64 deletedCount = 0;
71+
uint64_t deletedCount = 0;
7272
TTableClient client(driver);
7373
ThrowOnError(client.RetryOperationSync([&](TSession session) -> TStatus {
7474
return DeleteSeries(session, prefix, seriesId, deletedCount);

0 commit comments

Comments
 (0)