Skip to content

Commit 580916b

Browse files
committed
Synced SDK from ydb repo
1 parent bc287d9 commit 580916b

File tree

11 files changed

+144
-76
lines changed

11 files changed

+144
-76
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ install_manifest.txt
99
compile_commands.json
1010
CTestTestfile.cmake
1111
_deps
12+
.clangd
1213

1314
# Ignore generated binaries -- any file without extension
1415
# Ignore all

src/api/grpc/draft/ydb_ymq_v1.proto

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,19 @@ option java_package = "com.yandex.ydb.ymq.v1";
1010

1111

1212
service YmqService {
13-
rpc GetQueueUrl(GetQueueUrlRequest) returns (GetQueueUrlResponse);
14-
rpc CreateQueue(CreateQueueRequest) returns (CreateQueueResponse);
15-
rpc SendMessage(SendMessageRequest) returns (SendMessageResponse);
16-
rpc ReceiveMessage(ReceiveMessageRequest) returns (ReceiveMessageResponse);
17-
rpc GetQueueAttributes(GetQueueAttributesRequest) returns (GetQueueAttributesResponse);
18-
rpc ListQueues(ListQueuesRequest) returns (ListQueuesResponse);
19-
rpc DeleteMessage(DeleteMessageRequest) returns (DeleteMessageResponse);
20-
rpc PurgeQueue(PurgeQueueRequest) returns (PurgeQueueResponse);
21-
rpc DeleteQueue(DeleteQueueRequest) returns (DeleteQueueResponse);
22-
rpc ChangeMessageVisibility(ChangeMessageVisibilityRequest) returns (ChangeMessageVisibilityResponse);
13+
rpc YmqGetQueueUrl(GetQueueUrlRequest) returns (GetQueueUrlResponse);
14+
rpc YmqCreateQueue(CreateQueueRequest) returns (CreateQueueResponse);
15+
rpc YmqSendMessage(SendMessageRequest) returns (SendMessageResponse);
16+
rpc YmqReceiveMessage(ReceiveMessageRequest) returns (ReceiveMessageResponse);
17+
rpc YmqGetQueueAttributes(GetQueueAttributesRequest) returns (GetQueueAttributesResponse);
18+
rpc YmqListQueues(ListQueuesRequest) returns (ListQueuesResponse);
19+
rpc YmqDeleteMessage(DeleteMessageRequest) returns (DeleteMessageResponse);
20+
rpc YmqPurgeQueue(PurgeQueueRequest) returns (PurgeQueueResponse);
21+
rpc YmqDeleteQueue(DeleteQueueRequest) returns (DeleteQueueResponse);
22+
rpc YmqChangeMessageVisibility(ChangeMessageVisibilityRequest) returns (ChangeMessageVisibilityResponse);
23+
rpc YmqSetQueueAttributes(SetQueueAttributesRequest) returns (SetQueueAttributesResponse);
24+
rpc YmqSendMessageBatch(SendMessageBatchRequest) returns (SendMessageBatchResponse);
25+
rpc YmqDeleteMessageBatch(DeleteMessageBatchRequest) returns (DeleteMessageBatchResponse);
26+
rpc YmqChangeMessageVisibilityBatch(ChangeMessageVisibilityBatchRequest) returns (ChangeMessageVisibilityBatchResponse);
27+
rpc YmqListDeadLetterSourceQueues(ListDeadLetterSourceQueuesRequest) returns (ListDeadLetterSourceQueuesResponse);
2328
}

src/api/grpc/ydb_cms_v1.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@ service CmsService {
2727

2828
// Describe supported database options.
2929
rpc DescribeDatabaseOptions(Cms.DescribeDatabaseOptionsRequest) returns (Cms.DescribeDatabaseOptionsResponse);
30+
31+
// Get resources scale recommendation for database.
32+
rpc GetScaleRecommendation(Cms.GetScaleRecommendationRequest) returns (Cms.GetScaleRecommendationResponse);
3033
}

src/api/protos/draft/fq.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ message DataStreams {
442442
string endpoint = 3 [(Ydb.length).le = 1024];
443443
string database = 4 [(Ydb.length).le = 1024];
444444
bool secure = 5;
445+
bool shared_reading = 6;
445446
}
446447

447448
message Monitoring {

src/api/protos/draft/ymq.proto

Lines changed: 68 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ message ChangeMessageVisibilityResult {
2525
message ChangeMessageVisibilityBatchRequestEntry {
2626
string id = 1;
2727
string receipt_handle = 2;
28-
int32 visibility_timeout = 3;
28+
optional int32 visibility_timeout = 3;
2929
}
3030

3131
message ChangeMessageVisibilityBatchRequest {
@@ -128,7 +128,7 @@ message GetQueueAttributesResult {
128128
message GetQueueUrlRequest {
129129
Ydb.Operations.OperationParams operation_params = 1;
130130
string queue_name = 2;
131-
string queue_owner_aws_account_id = 3;
131+
optional string queue_owner_aws_account_id = 3;
132132
}
133133

134134
message GetQueueUrlResponse {
@@ -141,9 +141,9 @@ message GetQueueUrlResult {
141141

142142
message ListQueuesRequest {
143143
Ydb.Operations.OperationParams operation_params = 1;
144-
int64 max_results = 2;
145-
string next_token = 3;
146-
string queue_name_prefix = 4;
144+
optional int64 max_results = 2;
145+
optional string next_token = 3;
146+
optional string queue_name_prefix = 4;
147147
}
148148

149149
message ListQueuesResponse {
@@ -178,13 +178,13 @@ message MessageAttribute {
178178
message ReceiveMessageRequest {
179179
Ydb.Operations.OperationParams operation_params = 1;
180180
repeated string attribute_names = 2;
181-
int32 max_number_of_messages = 3;
181+
optional int32 max_number_of_messages = 3;
182182
repeated string message_attribute_names = 4;
183183
repeated string message_system_attribute_names = 5;
184184
string queue_url = 6;
185-
string receive_request_attempt_id = 7;
186-
int32 visibility_timeout = 8;
187-
int32 wait_time_seconds = 9;
185+
optional string receive_request_attempt_id = 7;
186+
optional int32 visibility_timeout = 8;
187+
optional int32 wait_time_seconds = 9;
188188
}
189189

190190
message ReceiveMessageResponse {
@@ -207,11 +207,11 @@ message ReceiveMessageResult {
207207

208208
message SendMessageRequest {
209209
Ydb.Operations.OperationParams operation_params = 1;
210-
int32 delay_seconds = 2;
210+
optional int32 delay_seconds = 2;
211211
map<string, MessageAttribute> message_attributes = 3;
212212
string message_body = 4;
213-
string message_deduplication_id = 5;
214-
string message_group_id = 6;
213+
optional string message_deduplication_id = 5;
214+
optional string message_group_id = 6;
215215
map<string, MessageAttribute> message_system_attributes = 7;
216216
string queue_url = 8;
217217
}
@@ -228,31 +228,73 @@ message SendMessageResult {
228228
string sequence_number = 5;
229229
}
230230

231-
message SendMessageBatchRequest {
232-
Ydb.Operations.OperationParams operation_params = 1;
233-
repeated SendMessageRequest entries = 2;
234-
}
235-
236-
message SendMessageBatchResponse {
237-
Ydb.Operations.Operation operation = 1;
238-
}
239-
240231
message BatchResultErrorEntry {
241232
string code = 1;
242233
string id = 2;
243234
bool sender_fault = 3;
244235
string message = 4;
245236
}
246237

238+
message SendMessageBatchRequestEntry {
239+
string id = 1;
240+
optional int32 delay_seconds = 2;
241+
map<string, MessageAttribute> message_attributes = 3;
242+
string message_body = 4;
243+
optional string message_deduplication_id = 5;
244+
optional string message_group_id = 6;
245+
map<string, MessageAttribute> message_system_attributes = 7;
246+
string queue_url = 8;
247+
}
248+
247249
message SendMessageBatchResultEntry {
248-
string md5_of_message_attributes = 1;
249-
string md5_of_message_body= 2;
250-
string md5_of_message_system_attributes= 3;
251-
string message_id = 4;
252-
string sequence_number = 5;
250+
string id = 1;
251+
string md5_of_message_body = 2;
252+
string message_id = 3;
253+
string md5_of_message_attributes = 4;
254+
string md5_of_message_system_attributes = 5;
255+
string sequence_number = 6;
256+
}
257+
258+
message SendMessageBatchRequest {
259+
Ydb.Operations.OperationParams operation_params = 1;
260+
repeated SendMessageBatchRequestEntry entries = 2;
261+
string queue_url = 3;
262+
}
263+
264+
message SendMessageBatchResponse {
265+
Ydb.Operations.Operation operation = 1;
253266
}
254267

255268
message SendMessageBatchResult {
256269
repeated BatchResultErrorEntry failed = 1;
257270
repeated SendMessageBatchResultEntry successful = 2;
258271
}
272+
273+
message SetQueueAttributesRequest {
274+
Ydb.Operations.OperationParams operation_params = 1;
275+
map<string, string> attributes = 2;
276+
string queue_url = 3;
277+
}
278+
279+
message SetQueueAttributesResponse {
280+
Ydb.Operations.Operation operation = 1;
281+
}
282+
283+
message SetQueueAttributesResult {
284+
}
285+
286+
message ListDeadLetterSourceQueuesRequest {
287+
Ydb.Operations.OperationParams operation_params = 1;
288+
optional int32 max_results = 2;
289+
optional string next_token = 3;
290+
string queue_url = 4;
291+
}
292+
293+
message ListDeadLetterSourceQueuesResponse {
294+
Ydb.Operations.Operation operation = 1;
295+
}
296+
297+
message ListDeadLetterSourceQueuesResult {
298+
string next_token = 1;
299+
repeated string queue_urls = 2;
300+
}

src/api/protos/ydb_cms.proto

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

7+
import "src/api/protos/ydb_issue_message.proto";
78
import "src/api/protos/ydb_operation.proto";
9+
import "src/api/protos/ydb_status_codes.proto";
810

911
// A set of uniform storage units.
1012
// Single storage unit can be thought of as a reserved part of a RAID.
@@ -104,6 +106,23 @@ message DatabaseQuotas {
104106
repeated StorageQuotas storage_quotas = 6;
105107
}
106108

109+
// A policy that is used for resource scale recommendation. If multiple are used,
110+
// recommender combines them to recommend the largest scale.
111+
message ScaleRecommenderPolicy {
112+
// Policy that tracks metric and reactively recommend to adjust resources scale
113+
// to keep metric close to the specified target value.
114+
message TargetTrackingPolicy {
115+
oneof target {
116+
// A percentage of compute resources' average CPU utilization.
117+
uint32 average_cpu_utilization_percent = 1;
118+
}
119+
}
120+
121+
oneof policy {
122+
TargetTrackingPolicy target_tracking_policy = 1;
123+
}
124+
}
125+
107126
// Request to create a new database. For successfull creation
108127
// specified database shouldn't exist. At least one storage
109128
// unit should be requested for the database.
@@ -129,6 +148,8 @@ message CreateDatabaseRequest {
129148
string idempotency_key = 9;
130149
// Optional quotas for the database
131150
DatabaseQuotas database_quotas = 10;
151+
// Optional scale recommender policies
152+
repeated ScaleRecommenderPolicy scale_recommender_policies = 11;
132153
}
133154

134155
message CreateDatabaseResponse {
@@ -179,6 +200,8 @@ message GetDatabaseStatusResult {
179200
SchemaOperationQuotas schema_operation_quotas = 9;
180201
// Current quotas for the database
181202
DatabaseQuotas database_quotas = 10;
203+
// Current scale recommender policies
204+
repeated ScaleRecommenderPolicy scale_recommender_policies = 11;
182205
}
183206

184207
// Change resources allocated for database.
@@ -207,6 +230,8 @@ message AlterDatabaseRequest {
207230
DatabaseQuotas database_quotas = 11;
208231
// Alter attributes. Leave the value blank to drop an attribute.
209232
map<string, string> alter_attributes = 12;
233+
// Alter scale recommender policies.
234+
repeated ScaleRecommenderPolicy scale_recommender_policies = 13;
210235
}
211236

212237
message AlterDatabaseResponse {
@@ -271,3 +296,16 @@ message DescribeDatabaseOptionsResult {
271296
repeated AvailabilityZoneDescription availability_zones = 2;
272297
repeated ComputationalUnitDescription computational_units = 3;
273298
}
299+
300+
// Get resources scale recommendation for database.
301+
message GetScaleRecommendationRequest {
302+
// Required. Full path to database's home dir.
303+
string path = 1;
304+
}
305+
306+
message GetScaleRecommendationResponse {
307+
StatusIds.StatusCode status = 1;
308+
repeated Ydb.Issue.IssueMessage issues = 2;
309+
// Recommended resources scale to be allocated for database.
310+
Resources recommended_resources = 3;
311+
}

src/client/federated_topic/ut/fds_mock.h

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

33
#include "util/string/builder.h"
44
#include <library/cpp/threading/future/future.h>
5-
#include <ydb/public/api/grpc/ydb_federation_discovery_v1.grpc.pb.h>
5+
#include <src/api/grpc/ydb_federation_discovery_v1.grpc.pb.h>
66

77
#include <deque>
88
#include <optional>

src/client/federated_topic/ut/ya.make

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

src/client/scheme/scheme.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void TSchemeEntry::Out(IOutputStream& out) const {
137137
void TSchemeEntry::SerializeTo(::Ydb::Scheme::ModifyPermissionsRequest& request) const {
138138
request.mutable_actions()->Add()->set_change_owner(TStringType{Owner});
139139
for (const auto& permission : Permissions) {
140-
permission.SerializeTo(*request.mutable_actions()->Add()->mutable_grant());
140+
permission.SerializeTo(*request.mutable_actions()->Add()->mutable_grant());
141141
}
142142
}
143143

src/library/uuid/uuid.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,20 @@ void UuidToString(ui16 dw[8], IOutputStream& out) {
4343
WriteHex(dw[7], out, true);
4444
}
4545

46+
std::string UuidBytesToString(const std::string& in) {
47+
TStringStream ss;
48+
49+
UuidBytesToString(TString(in), ss);
50+
51+
return std::string(ss.Str());
52+
}
53+
54+
void UuidBytesToString(const std::string& in, IOutputStream& out) {
55+
ui16 dw[8];
56+
std::memcpy(dw, in.data(), sizeof(dw));
57+
NUuid::UuidToString(dw, out);
58+
}
59+
4660
void UuidHalfsToByteString(ui64 low, ui64 hi, IOutputStream& out) {
4761
union {
4862
char bytes[16];

src/library/uuid/uuid.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ namespace NUuid {
1313

1414
static constexpr ui32 UUID_LEN = 16;
1515

16+
std::string UuidBytesToString(const std::string& in);
17+
void UuidBytesToString(const std::string& in, IOutputStream& out);
1618
void UuidToString(ui16 dw[8], IOutputStream& out);
1719
void UuidHalfsToByteString(ui64 low, ui64 hi, IOutputStream& out);
1820

0 commit comments

Comments
 (0)