From 995c1c82bc60dd42c701c776eb0342d0227442c5 Mon Sep 17 00:00:00 2001 From: Bulat Gayazov Date: Fri, 8 Nov 2024 17:21:26 +0000 Subject: [PATCH 1/6] Sync YDB proto files with main repo --- src/api/README.md | 5 ----- .../iam/service_account_service.proto | 12 ++++++------ .../yc_private/iam/user_account_service.proto | 2 +- src/api/client/yc_public/README.md | 3 --- src/api/grpc/ydb_query_v1.proto | 2 +- src/api/protos/draft/fq.proto | 5 +++++ src/api/protos/draft/ydb_maintenance.proto | 3 +++ src/api/protos/draft/ymq.proto | 18 +++++++++--------- src/api/protos/ydb_import.proto | 4 ++-- src/api/protos/ydb_issue_message.proto | 2 +- src/api/protos/ydb_scheme.proto | 11 ++++++----- src/api/protos/ydb_table.proto | 8 ++++++++ 12 files changed, 42 insertions(+), 33 deletions(-) delete mode 100644 src/api/README.md delete mode 100644 src/api/client/yc_public/README.md diff --git a/src/api/README.md b/src/api/README.md deleted file mode 100644 index c6a9a1dd13d..00000000000 --- a/src/api/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Proto's in this directory defines public YDB server API. - -This is original proto's for public repository https://github.com/ydb-platform/ydb-api-protos. This proto's syncs to https://github.com/ydb-platform/ydb-api-protos repository **manually**. Manually sync meens not only copy. Some options like `go_package` must be adds to proto's in https://github.com/ydb-platform/ydb-api-protos repository also. - -Everyone may be create pull request to https://github.com/ydb-platform/ydb-api-protos with latest changes from this directory. diff --git a/src/api/client/yc_private/iam/service_account_service.proto b/src/api/client/yc_private/iam/service_account_service.proto index 8a623f47313..aab378611ca 100644 --- a/src/api/client/yc_private/iam/service_account_service.proto +++ b/src/api/client/yc_private/iam/service_account_service.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "google/protobuf/field_mask.proto"; import "src/api/client/yc_private/iam/iam_token.proto"; import "src/api/client/yc_private/iam/service_account.proto"; -//import "src/api/client/yc_private/access/access.proto"; +//import "ydb/public/api/client/yc_private/access/access.proto"; import "src/api/client/yc_private/operation/operation.proto"; import "src/api/client/yc_private/iam/reference.proto"; @@ -19,15 +19,15 @@ service ServiceAccountService { option (google.api.http) = { get: "/iam/v1/serviceAccounts" }; } - rpc Create (CreateServiceAccountRequest) returns (ydb.yc.priv.operation.Operation) { + rpc Create (CreateServiceAccountRequest) returns (.ydb.yc.priv.operation.Operation) { option (google.api.http) = { post: "/iam/v1/serviceAccounts" body: "*" }; } - rpc Update (UpdateServiceAccountRequest) returns (ydb.yc.priv.operation.Operation) { + rpc Update (UpdateServiceAccountRequest) returns (.ydb.yc.priv.operation.Operation) { option (google.api.http) = { patch: "/iam/v1/serviceAccounts/{service_account_id}" body: "*" }; } - rpc Delete (DeleteServiceAccountRequest) returns (ydb.yc.priv.operation.Operation) { + rpc Delete (DeleteServiceAccountRequest) returns (.ydb.yc.priv.operation.Operation) { option (google.api.http) = { delete: "/iam/v1/serviceAccounts/{service_account_id}" }; } @@ -43,7 +43,7 @@ service ServiceAccountService { rpc ListReferences (ListServiceAccountReferencesRequest) returns (ListServiceAccountReferencesResponse); - rpc UpdateReferences (UpdateServiceAccountReferencesRequest) returns (ydb.yc.priv.operation.Operation); + rpc UpdateReferences (UpdateServiceAccountReferencesRequest) returns (.ydb.yc.priv.operation.Operation); } message GetServiceAccountRequest { @@ -104,7 +104,7 @@ message ListServiceAccountOperationsRequest { } message ListServiceAccountOperationsResponse { - repeated ydb.yc.priv.operation.Operation operations = 1; + repeated .ydb.yc.priv.operation.Operation operations = 1; string next_page_token = 2; } diff --git a/src/api/client/yc_private/iam/user_account_service.proto b/src/api/client/yc_private/iam/user_account_service.proto index 6895be2e430..eb530b4fa44 100644 --- a/src/api/client/yc_private/iam/user_account_service.proto +++ b/src/api/client/yc_private/iam/user_account_service.proto @@ -12,7 +12,7 @@ service UserAccountService { option (google.api.http) = { get: "/iam/v1/userAccounts/{user_account_id}" }; } - rpc Delete (DeleteUserAccountRequest) returns (ydb.yc.priv.operation.Operation); + rpc Delete (DeleteUserAccountRequest) returns (.ydb.yc.priv.operation.Operation); rpc GetSettings (GetSettingsRequest) returns (UserSettings); diff --git a/src/api/client/yc_public/README.md b/src/api/client/yc_public/README.md deleted file mode 100644 index f8acff5b1dd..00000000000 --- a/src/api/client/yc_public/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This directory contains copy of ycloud public protobuf in use by YDB from https://github.com/yandex-cloud/cloudapi/tree/master/yandex/cloud. - -Import paths are fixed to contain all required files in a single directory. diff --git a/src/api/grpc/ydb_query_v1.proto b/src/api/grpc/ydb_query_v1.proto index 149b9fd49e4..ccdcc75815b 100644 --- a/src/api/grpc/ydb_query_v1.proto +++ b/src/api/grpc/ydb_query_v1.proto @@ -7,7 +7,7 @@ import "src/api/protos/ydb_operation.proto"; import "src/api/protos/ydb_query.proto"; service QueryService { - // Sessions are basic primitives for communicating with YDB Query Service. The are similar to + // Sessions are basic primitives for communicating with YDB Query Service. They are similar to // connections for classic relational DBs. Sessions serve three main purposes: // 1. Provide a flow control for DB requests with limited number of active channels. // 2. Distribute load evenly across multiple DB nodes. diff --git a/src/api/protos/draft/fq.proto b/src/api/protos/draft/fq.proto index 7e9e7ac0cde..d9effa63ebc 100644 --- a/src/api/protos/draft/fq.proto +++ b/src/api/protos/draft/fq.proto @@ -205,6 +205,10 @@ message ResultSetMeta { bool truncated = 3; } +message QueryTimeline { + string svg = 1; // No validation because generated on server side +} + message Query { QueryMeta meta = 1; QueryContent content = 2; @@ -214,6 +218,7 @@ message Query { QueryStatistics statistics = 6; repeated ResultSetMeta result_set_meta = 7; QueryAst ast = 8; + QueryTimeline timeline = 9; } message QueryStatistics { diff --git a/src/api/protos/draft/ydb_maintenance.proto b/src/api/protos/draft/ydb_maintenance.proto index 5afd5aca2ce..d6c754d807c 100644 --- a/src/api/protos/draft/ydb_maintenance.proto +++ b/src/api/protos/draft/ydb_maintenance.proto @@ -161,12 +161,15 @@ message ActionState { ACTION_REASON_WRONG_REQUEST = 6; // Too many unavailable nodes with system tablets. ACTION_REASON_SYS_TABLETS_NODE_LIMIT_REACHED = 7; + // Generic reason. + ACTION_REASON_GENERIC = 8; } Action action = 1; ActionUid action_uid = 2; ActionStatus status = 3; ActionReason reason = 4; + string reason_details = 6; google.protobuf.Timestamp deadline = 5; } diff --git a/src/api/protos/draft/ymq.proto b/src/api/protos/draft/ymq.proto index 70a10c6b5ed..975f6c68f1a 100644 --- a/src/api/protos/draft/ymq.proto +++ b/src/api/protos/draft/ymq.proto @@ -128,7 +128,7 @@ message GetQueueAttributesResult { message GetQueueUrlRequest { Ydb.Operations.OperationParams operation_params = 1; string queue_name = 2; - optional string queue_owner_aws_account_id = 3; + optional string queue_owner_a_w_s_account_id = 3; } message GetQueueUrlResponse { @@ -194,8 +194,8 @@ message ReceiveMessageResponse { message Message { map attributes = 1; string body = 2; - string md5_of_body = 3; - string md5_of_message_attributes = 4; + string m_d_5_of_body = 3 [(Ydb.FieldTransformation.FieldTransformer) = TRANSFORM_EMPTY_TO_NOTHING]; + string m_d_5_of_message_attributes = 4 [(Ydb.FieldTransformation.FieldTransformer) = TRANSFORM_EMPTY_TO_NOTHING]; map message_attributes = 5; string message_id = 6; string receipt_handle = 7; @@ -221,9 +221,9 @@ message SendMessageResponse { } message SendMessageResult { - string md5_of_message_attributes = 1; - string md5_of_message_body= 2; - string md5_of_message_system_attributes= 3; + string m_d_5_of_message_attributes = 1 [(Ydb.FieldTransformation.FieldTransformer) = TRANSFORM_EMPTY_TO_NOTHING]; + string m_d_5_of_message_body= 2 [(Ydb.FieldTransformation.FieldTransformer) = TRANSFORM_EMPTY_TO_NOTHING]; + string m_d_5_of_message_system_attributes= 3 [(Ydb.FieldTransformation.FieldTransformer) = TRANSFORM_EMPTY_TO_NOTHING]; string message_id = 4; string sequence_number = 5; } @@ -248,10 +248,10 @@ message SendMessageBatchRequestEntry { message SendMessageBatchResultEntry { string id = 1; - string md5_of_message_body = 2; + string m_d_5_of_message_body = 2 [(Ydb.FieldTransformation.FieldTransformer) = TRANSFORM_EMPTY_TO_NOTHING]; string message_id = 3; - string md5_of_message_attributes = 4; - string md5_of_message_system_attributes = 5; + string m_d_5_of_message_attributes = 4 [(Ydb.FieldTransformation.FieldTransformer) = TRANSFORM_EMPTY_TO_NOTHING]; + string m_d_5_of_message_system_attributes = 5 [(Ydb.FieldTransformation.FieldTransformer) = TRANSFORM_EMPTY_TO_NOTHING]; string sequence_number = 6; } diff --git a/src/api/protos/ydb_import.proto b/src/api/protos/ydb_import.proto index a01b9a48603..e7294af87b2 100644 --- a/src/api/protos/ydb_import.proto +++ b/src/api/protos/ydb_import.proto @@ -110,8 +110,8 @@ message ImportDataRequest { // - sorted by primary key; // - all keys must be from the same partition; // - table has no global secondary indexes; - // - size of serialized data is limited to 8 MB. - bytes data = 3 [(length).le = 8388608]; + // - size of serialized data is limited to 16 MB. + bytes data = 3 [(length).le = 16777216]; oneof format { // Result of `ydb tools dump` YdbDumpFormat ydb_dump = 4; diff --git a/src/api/protos/ydb_issue_message.proto b/src/api/protos/ydb_issue_message.proto index 534111d4e3d..1c294d7c593 100644 --- a/src/api/protos/ydb_issue_message.proto +++ b/src/api/protos/ydb_issue_message.proto @@ -16,7 +16,7 @@ message IssueMessage { string message = 2; Position end_position = 3; uint32 issue_code = 4; - // Severity values from src/library/yql_common/issue/protos/issue_severity.proto + // Severity values from ydb/library/yql/public/issue/protos/issue_severity.proto // FATAL = 0; // ERROR = 1; // WARNING = 2; diff --git a/src/api/protos/ydb_scheme.proto b/src/api/protos/ydb_scheme.proto index 3a413f49d5f..679c95b48a6 100644 --- a/src/api/protos/ydb_scheme.proto +++ b/src/api/protos/ydb_scheme.proto @@ -5,6 +5,7 @@ package Ydb.Scheme; option java_package = "com.yandex.ydb.scheme"; option java_outer_classname = "SchemeOperationProtos"; +import "src/api/protos/annotations/validation.proto"; import "src/api/protos/ydb_common.proto"; import "src/api/protos/ydb_operation.proto"; @@ -12,7 +13,7 @@ import "src/api/protos/ydb_operation.proto"; // All intermediate directories must be created message MakeDirectoryRequest { Ydb.Operations.OperationParams operation_params = 1; - string path = 2; + string path = 2 [(required) = true]; } message MakeDirectoryResponse { @@ -22,7 +23,7 @@ message MakeDirectoryResponse { // Remove directory message RemoveDirectoryRequest { Ydb.Operations.OperationParams operation_params = 1; - string path = 2; + string path = 2 [(required) = true]; } message RemoveDirectoryResponse { @@ -32,7 +33,7 @@ message RemoveDirectoryResponse { // List directory message ListDirectoryRequest { Ydb.Operations.OperationParams operation_params = 1; - string path = 2; + string path = 2 [(required) = true]; } message ListDirectoryResponse { @@ -93,7 +94,7 @@ message ListDirectoryResult { // Returns information about object with given path message DescribePathRequest { Ydb.Operations.OperationParams operation_params = 1; - string path = 2; + string path = 2 [(required) = true]; } message DescribePathResponse { @@ -121,7 +122,7 @@ message PermissionsAction { // Modify permissions of given object message ModifyPermissionsRequest { Ydb.Operations.OperationParams operation_params = 1; - string path = 2; + string path = 2 [(required) = true]; repeated PermissionsAction actions = 3; // Clear all permissions on the object for all subjects bool clear_permissions = 4; diff --git a/src/api/protos/ydb_table.proto b/src/api/protos/ydb_table.proto index be2ab062928..a394a466e72 100644 --- a/src/api/protos/ydb_table.proto +++ b/src/api/protos/ydb_table.proto @@ -329,6 +329,8 @@ message PartitionStats { uint64 rows_estimate = 1; // Approximate size of shard (bytes) uint64 store_size = 2; + // id of node that serve shard key range + uint32 leader_node_id = 3; } message TableStats { @@ -531,6 +533,10 @@ message ColumnFamily { // When enabled table data will be kept in memory // WARNING: DO NOT USE Ydb.FeatureFlag.Status keep_in_memory = 4; + + // Not all compression algorithms support + // Set if want to change default value + optional int32 compression_level = 5; } message PartitioningSettings { @@ -783,6 +789,8 @@ message DescribeTableRequest { bool include_partition_stats = 7; // Includes set_val settings for sequences bool include_set_val = 8; + // Includes shard -> node id maping (required include_partition_stats) + bool include_shard_nodes_info = 9; } message DescribeTableResponse { From 424b4039e2e75a590a6020a90a97d12cf259c865 Mon Sep 17 00:00:00 2001 From: Daniil Cherednik Date: Fri, 8 Nov 2024 17:27:30 +0000 Subject: [PATCH 2/6] Moved commit "Implementation of api which can return key_range -> nodeId mapping" from ydb repo --- include/ydb-cpp-sdk/client/table/table.h | 2 ++ src/client/table/impl/table_client.cpp | 4 ++++ src/client/table/table.cpp | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/ydb-cpp-sdk/client/table/table.h b/include/ydb-cpp-sdk/client/table/table.h index 4417e1f6b11..d60bc342a17 100644 --- a/include/ydb-cpp-sdk/client/table/table.h +++ b/include/ydb-cpp-sdk/client/table/table.h @@ -424,6 +424,7 @@ bool operator!=(const TChangefeedDescription& lhs, const TChangefeedDescription& struct TPartitionStats { uint64_t Rows = 0; uint64_t Size = 0; + uint32_t LeaderNodeId = 0; }; class TDateTypeColumnModeSettings { @@ -1643,6 +1644,7 @@ struct TDescribeTableSettings : public TOperationRequestSettings { diff --git a/src/client/table/impl/table_client.cpp b/src/client/table/impl/table_client.cpp index a60f7e99cac..06940d5a61f 100644 --- a/src/client/table/impl/table_client.cpp +++ b/src/client/table/impl/table_client.cpp @@ -529,6 +529,10 @@ TAsyncDescribeTableResult TTableClient::TImpl::DescribeTable(const std::string& request.set_include_set_val(true); } + if (settings.WithShardNodesInfo_) { + request.set_include_shard_nodes_info(true); + } + auto promise = NewPromise(); auto extractor = [promise, settings] diff --git a/src/client/table/table.cpp b/src/client/table/table.cpp index 2ff8ae897c8..a01c53f717f 100644 --- a/src/client/table/table.cpp +++ b/src/client/table/table.cpp @@ -422,7 +422,7 @@ class TTableDescription::TImpl { for (const auto& shardStats : Proto_.table_stats().partition_stats()) { PartitionStats_.emplace_back( - TPartitionStats{shardStats.rows_estimate(), shardStats.store_size()} + TPartitionStats{shardStats.rows_estimate(), shardStats.store_size(), shardStats.leader_node_id()} ); } From f893b3ec9d4ff948c94f40bc88283cf1147fe313 Mon Sep 17 00:00:00 2001 From: Nikolay Shestakov Date: Fri, 8 Nov 2024 17:37:16 +0000 Subject: [PATCH 3/6] Moved commit "Support for autopartitioning topics for replication" from ydb repo --- include/ydb-cpp-sdk/client/topic/read_events.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ydb-cpp-sdk/client/topic/read_events.h b/include/ydb-cpp-sdk/client/topic/read_events.h index 23d44dda9b5..cf967edf1e6 100644 --- a/include/ydb-cpp-sdk/client/topic/read_events.h +++ b/include/ydb-cpp-sdk/client/topic/read_events.h @@ -293,12 +293,12 @@ struct TReadSessionEvent { TEndPartitionSessionEvent(TPartitionSession::TPtr partitionSession, std::vector&& adjacentPartitionIds, std::vector&& childPartitionIds); //! A list of the partition IDs that also participated in the partition's merge. - const std::vector GetAdjacentPartitionIds() const { + const std::vector& GetAdjacentPartitionIds() const { return AdjacentPartitionIds; } //! A list of partition IDs that were obtained as a result of merging or splitting this partition. - const std::vector GetChildPartitionIds() const { + const std::vector& GetChildPartitionIds() const { return ChildPartitionIds; } From d8d3d1b13502484f4538e4cda765fd336d9e7270 Mon Sep 17 00:00:00 2001 From: Alek5andr-Kotov Date: Fri, 8 Nov 2024 18:25:02 +0000 Subject: [PATCH 4/6] Moved commit "Fixed the test `WriteToTopic_Demo_42`" from ydb repo --- src/client/topic/ut/topic_to_table_ut.cpp | 31 +++++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/src/client/topic/ut/topic_to_table_ut.cpp b/src/client/topic/ut/topic_to_table_ut.cpp index f4f1c288c80..b3fcc7368e0 100644 --- a/src/client/topic/ut/topic_to_table_ut.cpp +++ b/src/client/topic/ut/topic_to_table_ut.cpp @@ -181,6 +181,10 @@ class TFixture : public NUnitTest::TBaseFixture { NTable::TDataQueryResult ExecuteDataQuery(NTable::TSession session, const TString& query, const NTable::TTxControl& control); + void Read_Exactly_N_Messages_From_Topic(const TString& topicPath, + const TString& consumerName, + size_t count); + private: template E ReadEvent(TTopicReadSessionPtr reader, NTable::TTransaction& tx); @@ -531,10 +535,13 @@ Y_UNIT_TEST_F(TwoSessionOneConsumer, TFixture) Y_UNIT_TEST_F(Offsets_Cannot_Be_Promoted_When_Reading_In_A_Transaction, TFixture) { WriteMessage("message"); + auto session = CreateTableSession(); auto tx = BeginTx(session); + auto reader = CreateReader(); StartPartitionSession(reader, tx, 0); + UNIT_ASSERT_EXCEPTION(ReadMessage(reader, {.Tx = tx, .CommitOffsets = true}), yexception); } @@ -1002,6 +1009,18 @@ void TFixture::RestartLongTxService() } } +void TFixture::Read_Exactly_N_Messages_From_Topic(const TString& topicPath, + const TString& consumerName, + size_t limit) +{ + size_t count = 0; + while (count < limit) { + auto messages = ReadFromTopic(topicPath, consumerName, TDuration::Seconds(2)); + count += messages.size(); + } + UNIT_ASSERT_VALUES_EQUAL(count, limit); +} + Y_UNIT_TEST_F(WriteToTopic_Demo_1, TFixture) { CreateTopic("topic_A"); @@ -2166,8 +2185,7 @@ Y_UNIT_TEST_F(WriteToTopic_Demo_40, TFixture) CommitTx(tx, EStatus::SUCCESS); - auto messages = ReadFromTopic("topic_A", TEST_CONSUMER, TDuration::Seconds(60)); - UNIT_ASSERT_VALUES_EQUAL(messages.size(), 100); + Read_Exactly_N_Messages_From_Topic("topic_A", TEST_CONSUMER, 100); } Y_UNIT_TEST_F(WriteToTopic_Demo_41, TFixture) @@ -2202,8 +2220,7 @@ Y_UNIT_TEST_F(WriteToTopic_Demo_42, TFixture) CommitTx(tx, EStatus::SUCCESS); - auto messages = ReadFromTopic("topic_A", TEST_CONSUMER, TDuration::Seconds(2)); - UNIT_ASSERT_VALUES_EQUAL(messages.size(), 100); + Read_Exactly_N_Messages_From_Topic("topic_A", TEST_CONSUMER, 100); } Y_UNIT_TEST_F(WriteToTopic_Demo_43, TFixture) @@ -2221,8 +2238,7 @@ Y_UNIT_TEST_F(WriteToTopic_Demo_43, TFixture) ExecuteDataQuery(tableSession, "SELECT 1", NTable::TTxControl::Tx(tx).CommitTx(true)); - auto messages = ReadFromTopic("topic_A", TEST_CONSUMER, TDuration::Seconds(60)); - UNIT_ASSERT_VALUES_EQUAL(messages.size(), 100); + Read_Exactly_N_Messages_From_Topic("topic_A", TEST_CONSUMER, 100); } Y_UNIT_TEST_F(WriteToTopic_Demo_44, TFixture) @@ -2246,8 +2262,7 @@ Y_UNIT_TEST_F(WriteToTopic_Demo_44, TFixture) ExecuteDataQuery(tableSession, "SELECT 2", NTable::TTxControl::Tx(tx).CommitTx(true)); - messages = ReadFromTopic("topic_A", TEST_CONSUMER, TDuration::Seconds(60)); - UNIT_ASSERT_VALUES_EQUAL(messages.size(), 100); + Read_Exactly_N_Messages_From_Topic("topic_A", TEST_CONSUMER, 100); } } From e21d51df46561f8d9da8a0ab0bd0451848ece26d Mon Sep 17 00:00:00 2001 From: Nikolay Shestakov Date: Fri, 8 Nov 2024 18:28:37 +0000 Subject: [PATCH 5/6] Moved commit "Remove unused functions" from ydb repo --- src/client/persqueue_public/impl/write_session.h | 3 --- src/client/topic/impl/write_session.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/client/persqueue_public/impl/write_session.h b/src/client/persqueue_public/impl/write_session.h index 9619fe3c635..41873ceb7d2 100644 --- a/src/client/persqueue_public/impl/write_session.h +++ b/src/client/persqueue_public/impl/write_session.h @@ -89,9 +89,6 @@ class TSimpleBlockingWriteSession : public ISimpleBlockingWriteSession { private: std::optional WaitForToken(const TDuration& timeout); - void HandleAck(TWriteSessionEvent::TAcksEvent&); - void HandleReady(TWriteSessionEvent::TReadyToAcceptEvent&); - void HandleClosed(const TSessionClosedEvent&); std::atomic_bool Closed = false; }; diff --git a/src/client/topic/impl/write_session.h b/src/client/topic/impl/write_session.h index 1a0c918338d..25e77477ddd 100644 --- a/src/client/topic/impl/write_session.h +++ b/src/client/topic/impl/write_session.h @@ -85,9 +85,6 @@ class TSimpleBlockingWriteSession : public ISimpleBlockingWriteSession { private: std::optional WaitForToken(const TDuration& timeout); - void HandleAck(TWriteSessionEvent::TAcksEvent&); - void HandleReady(TWriteSessionEvent::TReadyToAcceptEvent&); - void HandleClosed(const TSessionClosedEvent&); std::atomic_bool Closed = false; }; From 0ee7177bb159c977b56f6eae6cec4c6df1de933f Mon Sep 17 00:00:00 2001 From: niksaveliev Date: Fri, 8 Nov 2024 18:34:55 +0000 Subject: [PATCH 6/6] Moved commit "Fix read session correct close ut" from ydb repo --- src/client/topic/ut/basic_usage_ut.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/client/topic/ut/basic_usage_ut.cpp b/src/client/topic/ut/basic_usage_ut.cpp index 02c1383816d..919438c0c93 100644 --- a/src/client/topic/ut/basic_usage_ut.cpp +++ b/src/client/topic/ut/basic_usage_ut.cpp @@ -624,7 +624,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) { bool res = session->Write(message); UNIT_ASSERT(res); } - bool res = session->Close(TDuration::Seconds(10)); + bool res = session->Close(TDuration::Seconds(30)); UNIT_ASSERT(res); std::shared_ptr ReadSession; @@ -659,8 +659,6 @@ Y_UNIT_TEST_SUITE(BasicUsage) { Cerr << ">>> TEST: Session gracefully closed" << Endl; Sleep(TDuration::Seconds(5)); - - // UNIT_ASSERT(false); } Y_UNIT_TEST(ConflictingWrites) {