Skip to content

Commit 354ba24

Browse files
stanislav-shchetininstanislav-shchetinin
committed
fix after review
1 parent f648733 commit 354ba24

File tree

11 files changed

+33
-139
lines changed

11 files changed

+33
-139
lines changed

‎.github/workflows/examples.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
ydb-version: [23.3, 24.1]
18+
ydb-version: [23.3, 24.1, trunk]
1919
services:
2020
ydb:
2121
image: ydbplatform/local-ydb:${{ matrix.ydb-version }}
@@ -66,4 +66,5 @@ jobs:
6666
examples/basic_example/basic_example -e localhost:2136 -d /local -p /local/basic
6767
examples/bulk_upsert_simple/bulk_upsert_simple -e localhost:2136 -d /local -p /local/bulk
6868
examples/pagination/pagination -e localhost:2136 -d /local -p /local/pagination
69-
examples/ttl/ttl -e localhost:2136 -d /local -p /local/ttl
69+
examples/ttl/ttl -e localhost:2136 -d /local -p /local/ttl
70+

‎.github/workflows/tests.yaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ concurrency:
1313
jobs:
1414
unit:
1515
concurrency:
16-
group: unit-${{ github.ref }}-${{ matrix.os }}-${{ matrix.go-version }}
16+
group: unit-${{ github.ref }}-${{ matrix.os }}
1717
cancel-in-progress: true
1818
strategy:
1919
fail-fast: false
20-
matrix:
21-
os: [ubuntu]
2220
env:
23-
OS: ${{ matrix.os }}-latest
24-
runs-on: ${{ matrix.os }}-latest
21+
OS: ubuntu-22.04
22+
runs-on: ubuntu-22.04
2523
steps:
2624
- name: Checkout PR
2725
uses: actions/checkout@v3
@@ -56,15 +54,15 @@ jobs:
5654
run: |
5755
ctest -j32 --preset release-unit
5856
59-
integrtion:
57+
integration:
6058
concurrency:
61-
group: integration-${{ github.ref }}-${{ matrix.os }}-${{ matrix.go-version }}-${{ matrix.ydb-version }}
59+
group: integration-${{ github.ref }}-${{ matrix.ydb-version }}
6260
cancel-in-progress: true
63-
runs-on: ubuntu-latest
61+
runs-on: ubuntu-22.04
6462
strategy:
6563
fail-fast: false
6664
matrix:
67-
ydb-version: [23.3, 24.1]
65+
ydb-version: [23.3, 24.1, trunk]
6866
services:
6967
ydb:
7068
image: ydbplatform/local-ydb:${{ matrix.ydb-version }}

‎CMakePresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
"timeout": 1200
9898
},
9999
"environment": {
100-
"ENDPOINT": "localhost:2136",
101-
"DATABASE": "/local"
100+
"YDB_ENDPOINT": "localhost:2136",
101+
"YDB_DATABASE": "/local"
102102
}
103103
}
104104
]

‎cmake/testing.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ function(add_ydb_test)
7272
target_include_directories(${YDB_TEST_NAME} PRIVATE ${YDB_TEST_INCLUDE_DIRS})
7373
target_link_libraries(${YDB_TEST_NAME} PRIVATE ${YDB_TEST_LINK_LIBRARIES})
7474
target_sources(${YDB_TEST_NAME} PRIVATE ${YDB_TEST_SOURCES})
75-
#set_tests_properties(${YDB_TEST_NAME} PROPERTIES LABELS "${YDB_TEST_LABELS}")
7675

7776
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
7877
target_link_libraries(${YDB_TEST_NAME} PRIVATE

‎docker-compose.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎examples/basic_example/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ target_link_libraries(basic_example PUBLIC
44
yutil
55
library-getopt
66
YDB-CPP-SDK::Table
7-
public-lib-json_value
87
)
98

109
target_sources(basic_example PRIVATE

‎examples/basic_example/basic_example.cpp

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

33
#include <ydb-cpp-sdk/util/string/cast.h>
4-
#include <ydb-cpp-sdk/json_value/ydb_json_value.h>
54

65
#include <src/util/folder/pathsplit.h>
76

@@ -479,7 +478,7 @@ void PreparedSelect(TTableClient client, const std::string& path, uint32_t serie
479478
ThrowOnError(client.RetryOperationSync([path, seriesId, seasonId, episodeId, &resultSet](TSession session) {
480479
return PreparedSelectTransaction(session, path, seriesId, seasonId, episodeId, resultSet);
481480
}));
482-
481+
483482
TResultSetParser parser(*resultSet);
484483
if (parser.TryNextRow()) {
485484
auto airDate = TInstant::Days(*parser.ColumnParser("air_date").GetOptionalUint64());
@@ -498,7 +497,6 @@ void MultiStep(TTableClient client, const std::string& path) {
498497
}));
499498

500499
TResultSetParser parser(*resultSet);
501-
502500
std::cout << "> MultiStep:" << std::endl;
503501
while (parser.TryNextRow()) {
504502
auto airDate = TInstant::Days(*parser.ColumnParser("air_date").GetOptionalUint64());
@@ -561,6 +559,7 @@ void ScanQuerySelect(TTableClient client, const std::string& path) {
561559
if (streamPart.HasResultSet()) {
562560
auto rs = streamPart.ExtractResultSet();
563561
auto columns = rs.GetColumnsMeta();
562+
564563
TResultSetParser parser(rs);
565564
while (parser.TryNextRow()) {
566565
std::cout << "Season"
@@ -611,4 +610,4 @@ bool Run(const TDriver& driver, const std::string& path) {
611610
}
612611

613612
return true;
614-
}
613+
}

‎tests/integration/basic_example_it/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ add_ydb_test(NAME basic-example_it
66
basic_example.h
77
LINK_LIBRARIES
88
yutil
9-
library-getopt
109
YDB-CPP-SDK::Table
1110
GTest::gtest_main
1211
public-lib-json_value
1312
LABELS
1413
integration
15-
)
14+
)

‎tests/integration/basic_example_it/basic_example.cpp

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

33
#include <src/util/folder/pathsplit.h>
4-
#include <include/ydb-cpp-sdk/json_value/ydb_json_value.h>
4+
#include <ydb-cpp-sdk/json_value/ydb_json_value.h>
55

66
#include <format>
77

@@ -14,11 +14,6 @@ void ThrowOnError(const TStatus& status) {
1414
}
1515
}
1616

17-
void PrintStatus(const TStatus& status) {
18-
std::cerr << "Status: " << ToString(status.GetStatus()) << std::endl;
19-
status.GetIssues().PrintTo(std::cerr);
20-
}
21-
2217
static std::string JoinPath(const std::string& basePath, const std::string& path) {
2318
if (basePath.empty()) {
2419
return path;
@@ -74,25 +69,6 @@ void CreateTables(TTableClient client, const std::string& path) {
7469
}));
7570
}
7671

77-
//! Describe existing table.
78-
void DescribeTable(TTableClient client, const std::string& path, const std::string& name) {
79-
std::optional<TTableDescription> desc;
80-
std::string result;
81-
ThrowOnError(client.RetryOperationSync([path, name, &desc](TSession session) {
82-
auto result = session.DescribeTable(JoinPath(path, name)).GetValueSync();
83-
84-
if (result.IsSuccess()) {
85-
desc = result.GetTableDescription();
86-
}
87-
return result;
88-
}));
89-
90-
std::cout << std::format("> Describe table: {}\n", name);
91-
for (auto& column : desc->GetColumns()) {
92-
std::cout << std::format("Column, name: {}, type: {}\n", column.Name, FormatType(column.Type));
93-
}
94-
}
95-
9672
///////////////////////////////////////////////////////////////////////////////
9773

9874
//! Fills sample tables with data in single parameterized data query.
@@ -430,13 +406,6 @@ std::string SelectSimple(TTableClient client, const std::string& path) {
430406
ThrowOnError(client.RetryOperationSync([path, &resultSet](TSession session) {
431407
return SelectSimpleTransaction(session, path, resultSet);
432408
}));
433-
TResultSetParser parser(*resultSet);
434-
if (parser.TryNextRow()) {
435-
std::cout << std::format("> SelectSimple:\nSeries, Id: {}, Title: {}, Release date: {}\n"
436-
, ToString(parser.ColumnParser("series_id").GetOptionalUint64())
437-
, ToString(parser.ColumnParser("title").GetOptionalUtf8())
438-
, ToString(parser.ColumnParser("release_date").GetOptionalString()));
439-
}
440409
return FormatResultSetJson(resultSet.value(), EBinaryStringEncoding::Unicode);
441410
}
442411

@@ -452,13 +421,6 @@ std::string SelectWithParams(TTableClient client, const std::string& path) {
452421
ThrowOnError(client.RetryOperationSync([path, &resultSet](TSession session) {
453422
return SelectWithParamsTransaction(session, path, 2, 3, resultSet);
454423
}));
455-
456-
TResultSetParser parser(*resultSet);
457-
if (parser.TryNextRow()) {
458-
std::cout << std::format("> SelectWithParams:\nSeason, Title: {}, Series title: {}\n"
459-
, ToString(parser.ColumnParser("season_title").GetOptionalUtf8())
460-
, ToString(parser.ColumnParser("series_title").GetOptionalUtf8()));
461-
}
462424
return FormatResultSetJson(resultSet.value(), EBinaryStringEncoding::Unicode);
463425
}
464426

@@ -467,15 +429,6 @@ std::string PreparedSelect(TTableClient client, const std::string& path, ui32 se
467429
ThrowOnError(client.RetryOperationSync([path, seriesId, seasonId, episodeId, &resultSet](TSession session) {
468430
return PreparedSelectTransaction(session, path, seriesId, seasonId, episodeId, resultSet);
469431
}));
470-
471-
TResultSetParser parser(*resultSet);
472-
if (parser.TryNextRow()) {
473-
auto airDate = TInstant::Days(*parser.ColumnParser("air_date").GetOptionalUint64());
474-
std::cout << std::format("> PreparedSelect:\nEpisode {}, Title: {}, Air date: {}\n"
475-
, ToString(parser.ColumnParser("episode_id").GetOptionalUint64())
476-
, ToString(parser.ColumnParser("title").GetOptionalUtf8())
477-
, airDate.FormatLocalTime("%a %b %d, %Y"));
478-
}
479432
return FormatResultSetJson(resultSet.value(), EBinaryStringEncoding::Unicode);
480433
}
481434

@@ -484,17 +437,6 @@ std::string MultiStep(TTableClient client, const std::string& path) {
484437
ThrowOnError(client.RetryOperationSync([path, &resultSet](TSession session) {
485438
return MultiStepTransaction(session, path, 2, 5, resultSet);
486439
}));
487-
488-
TResultSetParser parser(*resultSet);
489-
std::cout << "> MultiStep:\n";
490-
while (parser.TryNextRow()) {
491-
auto airDate = TInstant::Days(*parser.ColumnParser("air_date").GetOptionalUint64());
492-
std::cout << std::format("Episode {}, Season: {}, Title: {}, Air date: {}\n"
493-
, ToString(parser.ColumnParser("episode_id").GetOptionalUint64())
494-
, ToString(parser.ColumnParser("season_id").GetOptionalUint64())
495-
, ToString(parser.ColumnParser("title").GetOptionalUtf8())
496-
, airDate.FormatLocalTime("%a %b %d, %Y"));
497-
}
498440
return FormatResultSetJson(resultSet.value(), EBinaryStringEncoding::Unicode);
499441
}
500442

@@ -504,7 +446,8 @@ void ExplicitTcl(TTableClient client, const std::string& path) {
504446
}));
505447
}
506448

507-
std::string ScanQuerySelect(TTableClient client, const std::string& path) {
449+
std::vector<std::string> ScanQuerySelect(TTableClient client, const std::string& path) {
450+
std::vector<std::string> result;
508451
auto query = std::format(R"(
509452
--!syntax_v1
510453
PRAGMA TablePathPrefix("{}");
@@ -529,11 +472,10 @@ std::string ScanQuerySelect(TTableClient client, const std::string& path) {
529472

530473
if (!resultScanQuery.IsSuccess()) {
531474
std::cerr << "ScanQuery execution failure: " << resultScanQuery.GetIssues().ToString() << std::endl;
532-
return "";
475+
return {};
533476
}
534477

535478
bool eos = false;
536-
std::cout << "> ScanQuerySelect:\n";
537479

538480
while (!eos) {
539481
auto streamPart = resultScanQuery.ReadNext().ExtractValueSync();
@@ -549,17 +491,8 @@ std::string ScanQuerySelect(TTableClient client, const std::string& path) {
549491
if (streamPart.HasResultSet()) {
550492
auto rs = streamPart.ExtractResultSet();
551493
auto columns = rs.GetColumnsMeta();
552-
553-
TResultSetParser parser(rs);
554-
while (parser.TryNextRow()) {
555-
std::cout << std::format("Season, SeriesId: {}, SeasonId: {}, Title: {}, Air date: {}\n"
556-
, ToString(parser.ColumnParser("series_id").GetOptionalUint64())
557-
, ToString(parser.ColumnParser("season_id").GetOptionalUint64())
558-
, ToString(parser.ColumnParser("title").GetOptionalUtf8())
559-
, ToString(parser.ColumnParser("first_aired").GetOptionalString()));
560-
}
561-
return FormatResultSetJson(rs, EBinaryStringEncoding::Unicode);
494+
result.push_back(FormatResultSetJson(rs, EBinaryStringEncoding::Unicode));
562495
}
563496
}
564-
return "";
497+
return result;
565498
}

‎tests/integration/basic_example_it/basic_example.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include <gtest/gtest.h>
77

8+
#include <vector>
9+
810
using namespace NYdb;
911
using namespace NYdb::NTable;
1012

@@ -23,9 +25,7 @@ class TYdbErrorException : public yexception {
2325
NYdb::TParams GetTablesDataParams();
2426

2527
void CreateTables(TTableClient client, const std::string& path);
26-
void DescribeTable(TTableClient client, const std::string& path, const std::string& name);
2728
void ThrowOnError(const TStatus& status);
28-
void PrintStatus(const TStatus& status);
2929
TStatus FillTableDataTransaction(TSession session, const std::string& path);
3030
std::string SelectSimple(TTableClient client, const std::string& path);
3131
void UpsertSimple(TTableClient client, const std::string& path);
@@ -34,4 +34,4 @@ std::string PreparedSelect(TTableClient client, const std::string& path, ui32 se
3434
std::string MultiStep(TTableClient client, const std::string& path);
3535
void ExplicitTcl(TTableClient client, const std::string& path);
3636
std::string PreparedSelect(TTableClient client, const std::string& path, ui32 seriesId, ui32 seasonId, ui32 episodeId);
37-
std::string ScanQuerySelect(TTableClient client, const std::string& path);
37+
std::vector<std::string> ScanQuerySelect(TTableClient client, const std::string& path);

0 commit comments

Comments
 (0)