Skip to content

Commit f2f074b

Browse files
committed
Moved changes from ydb repo
1 parent 78678ee commit f2f074b

File tree

19 files changed

+342
-126
lines changed

19 files changed

+342
-126
lines changed

include/ydb-cpp-sdk/client/types/status/status.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class TStatus {
2828

2929
void Out(IOutputStream& out) const;
3030
friend IOutputStream& operator<<(IOutputStream& out, const TStatus& st);
31-
friend std::ostream& operator<<(std::ostream& out, const TStatus& st);
3231

3332
protected:
3433
void CheckStatusOk(const std::string& str) const;

src/api/grpc/ydb_bsconfig_v1.proto

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
syntax = "proto3";
2+
3+
package Ydb.BSConfig.V1;
4+
5+
option java_package = "com.yandex.ydb.bsconfig.v1";
6+
option java_outer_classname = "BSConfigGrpc";
7+
option java_multiple_files = true;
8+
9+
import "src/api/protos/ydb_bsconfig.proto";
10+
11+
service BSConfigService {
12+
13+
// Initialize Blobstorage host configs and box
14+
rpc ReplaceStorageConfig(BSConfig.ReplaceStorageConfigRequest) returns (BSConfig.ReplaceStorageConfigResponse);
15+
16+
// Fetch Blobstorage host configs and box
17+
rpc FetchStorageConfig(BSConfig.FetchStorageConfigRequest) returns (BSConfig.FetchStorageConfigResponse);
18+
19+
}

src/api/protos/ydb_bsconfig.proto

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
syntax = "proto3";
2+
option cc_enable_arenas = true;
3+
4+
package Ydb.BSConfig;
5+
6+
option java_package = "com.yandex.ydb.bsconfig.proto";
7+
option java_outer_classname = "BSConfigProtos";
8+
option java_multiple_files = true;
9+
10+
import "src/api/protos/ydb_operation.proto";
11+
12+
//
13+
// BSConfig API.
14+
//
15+
16+
message ReplaceStorageConfigRequest {
17+
Ydb.Operations.OperationParams operation_params = 1;
18+
string yaml_config = 2;
19+
}
20+
21+
message ReplaceStorageConfigResponse {
22+
Ydb.Operations.Operation operation = 1;
23+
}
24+
25+
message ReplaceStorageConfigResult {
26+
}
27+
28+
message FetchStorageConfigRequest {
29+
Ydb.Operations.OperationParams operation_params = 1;
30+
}
31+
32+
message FetchStorageConfigResponse {
33+
Ydb.Operations.Operation operation = 1;
34+
}
35+
36+
message FetchStorageConfigResult {
37+
string yaml_config = 1;
38+
}

src/api/protos/ydb_issue_message.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ option cc_enable_arenas = true;
44
package Ydb.Issue;
55
option java_package = "com.yandex.ydb";
66

7-
// IssueMessage is a transport format for ydb/library/yql/public/issue library
7+
// IssueMessage is a transport format for yql/essentials/public/issue library
88
message IssueMessage {
99
message Position {
1010
uint32 row = 1;
@@ -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/library/yql/public/issue/protos/issue_severity.proto
19+
// Severity values from yql/essentials/public/issue/protos/issue_severity.proto
2020
// FATAL = 0;
2121
// ERROR = 1;
2222
// WARNING = 2;

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
@@ -130,7 +130,7 @@ class SDKTestSetup {
130130

131131
void SetNetDataViaFile(const TString& netDataTsv) {
132132
NetDataFile = MakeHolder<TTempFileHandle>();
133-
NetDataFile->Write(netDataTsv.Data(), netDataTsv.Size());
133+
NetDataFile->Write(netDataTsv.data(), netDataTsv.size());
134134
NetDataFile->FlushData();
135135
Server.ServerSettings.NetClassifierConfig.SetNetDataFilePath(NetDataFile->Name());
136136
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class TTestServer {
100100
if (NetDataFile)
101101
return false;
102102
NetDataFile = MakeHolder<TTempFileHandle>();
103-
NetDataFile->Write(content.Data(), content.Size());
103+
NetDataFile->Write(content.data(), content.size());
104104
NetDataFile->FlushData();
105105
ServerSettings.NetClassifierConfig.SetNetDataFilePath(NetDataFile->Name());
106106
return true;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ struct TYdbPqWriterTestHelper {
436436
auto log = Setup->GetLog();
437437
log << TLOG_INFO << "Enqueue message with sequence number " << SeqNo;
438438
EventLoop->MessageBuffer.Enqueue(::NPersQueue::TAcknowledgableMessage{
439-
message.Empty() ? Message : message,
439+
message.empty() ? Message : message,
440440
SeqNo, TInstant::Now(), promise
441441
});
442442
MessagesWrittenToBuffer.Signal();

src/client/value/value.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ TUuidValue::TUuidValue(const Ydb::Value& valueProto) {
10191019

10201020
TUuidValue::TUuidValue(const std::string& uuidString) {
10211021
ui16 dw[8];
1022-
if (!NKikimr::NUuid::ParseUuidToArray(uuidString, dw, false)) {
1022+
if (!NUuid::ParseUuidToArray(uuidString, dw, false)) {
10231023
ThrowFatalError(TStringBuilder() << "Unable to parse string as uuid");
10241024
}
10251025
static_assert(sizeof(dw) == sizeof(Buf_.Bytes));
@@ -1032,7 +1032,7 @@ std::string TUuidValue::ToString() const {
10321032
ui16 dw[8];
10331033
static_assert(sizeof(dw) == sizeof(Buf_.Bytes));
10341034
std::memcpy(dw, Buf_.Bytes, sizeof(dw));
1035-
NKikimr::NUuid::UuidToString(dw, s);
1035+
NUuid::UuidToString(dw, s);
10361036
return s.Str();
10371037
}
10381038

src/library/uuid/uuid.cpp

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

33
#include <util/stream/str.h>
44

5-
namespace NKikimr {
5+
namespace NYdb {
66
namespace NUuid {
77

88
static void WriteHexDigit(ui8 digit, IOutputStream& out) {

src/library/uuid/uuid.h

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

99
class IOutputStream;
1010

11-
namespace NKikimr {
11+
namespace NYdb {
1212
namespace NUuid {
1313

1414
static constexpr ui32 UUID_LEN = 16;

tests/integration/basic_example_it/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ add_ydb_test(NAME basic-example_it
33
main.cpp
44
basic_example_data.cpp
55
basic_example.cpp
6-
basic_example.h
76
LINK_LIBRARIES
87
yutil
8+
api-protos
9+
YDB-CPP-SDK::Driver
10+
YDB-CPP-SDK::Proto
911
YDB-CPP-SDK::Table
1012
GTest::gtest_main
11-
public-lib-json_value
1213
LABELS
1314
integration
1415
)

0 commit comments

Comments
 (0)