Fix Missing Step in EvReadSetAck (#19424)

Vladilen · Gazizonoki · commit d1c65a20c037 · 2025-06-17T23:09:49.000+03:00
diff --git a/.github/last_commit.txt b/.github/last_commit.txt
@@ -1 +1 @@
-6e380d54416c706390bbe2609c7a054de2bf3b89
+a01853cb85b51ba9c678dffd9d2c0cda8e7e55f3
diff --git a/include/ydb-cpp-sdk/library/retry/retry_policy.h b/include/ydb-cpp-sdk/library/retry/retry_policy.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <util/datetime/base.h>
-#include <util/generic/maybe.h>
 #include <util/generic/typetraits.h>
 #include <util/random/random.h>
 
@@ -42,7 +41,7 @@ struct IRetryPolicy {
 
         //! Calculate delay before next retry if next retry is allowed.
         //! Returns empty maybe if retry is not allowed anymore.
-        [[nodiscard]] virtual TMaybe<TDuration> GetNextRetryDelay(typename TTypeTraits<TArgs>::TFuncParam... args) = 0;
+        [[nodiscard]] virtual std::optional<TDuration> GetNextRetryDelay(typename TTypeTraits<TArgs>::TFuncParam... args) = 0;
     };
 
     virtual ~IRetryPolicy() = default;
@@ -82,8 +81,8 @@ struct TNoRetryPolicy : IRetryPolicy<TArgs...> {
     using IRetryState = typename IRetryPolicy<TArgs...>::IRetryState;
 
     struct TNoRetryState : IRetryState {
-        TMaybe<TDuration> GetNextRetryDelay(typename TTypeTraits<TArgs>::TFuncParam...) override {
-            return {};
+        std::optional<TDuration> GetNextRetryDelay(typename TTypeTraits<TArgs>::TFuncParam...) override {
+            return std::nullopt;
         }
     };
 
@@ -124,10 +123,10 @@ struct TExponentialBackoffPolicy : IRetryPolicy<TArgs...> {
         {
         }
 
-        TMaybe<TDuration> GetNextRetryDelay(typename TTypeTraits<TArgs>::TFuncParam... args) override {
+        std::optional<TDuration> GetNextRetryDelay(typename TTypeTraits<TArgs>::TFuncParam... args) override {
             const ERetryErrorClass errorClass = RetryClassFunction(args...);
             if (errorClass == ERetryErrorClass::NoRetry || AttemptsDone >= MaxRetries || StartTime && TInstant::Now() - StartTime >= MaxTime) {
-                return {};
+                return std::nullopt;
             }
 
             if (errorClass == ERetryErrorClass::LongRetry) {
@@ -213,10 +212,10 @@ struct TFixedIntervalPolicy : IRetryPolicy<TArgs...> {
         {
         }
 
-        TMaybe<TDuration> GetNextRetryDelay(typename TTypeTraits<TArgs>::TFuncParam... args) override {
+        std::optional<TDuration> GetNextRetryDelay(typename TTypeTraits<TArgs>::TFuncParam... args) override {
             const ERetryErrorClass errorClass = RetryClassFunction(args...);
             if (errorClass == ERetryErrorClass::NoRetry || AttemptsDone >= MaxRetries || StartTime && TInstant::Now() - StartTime >= MaxTime) {
-                return {};
+                return std::nullopt;
             }
 
             const TDuration delay = NRetryDetails::RandomizeDelay(errorClass == ERetryErrorClass::LongRetry ? LongRetryDelay : Delay);
diff --git a/src/client/topic/ut/topic_to_table_ut.cpp b/src/client/topic/ut/topic_to_table_ut.cpp
@@ -4021,7 +4021,6 @@ Y_UNIT_TEST_F(Sinks_Oltp_WriteToTopicAndTable_6_Query, TFixtureSinksQuery)
 
 void TFixtureSinks::TestSinksOlapWriteToTopicAndTable1()
 {
-    return; // https://github.com/ydb-platform/ydb/issues/17271
     CreateTopic("topic_A");
     CreateColumnTable("/Root/table_A");
 
@@ -4054,7 +4053,6 @@ Y_UNIT_TEST_F(Sinks_Olap_WriteToTopicAndTable_1_Query, TFixtureSinksQuery)
 
 void TFixtureSinks::TestSinksOlapWriteToTopicAndTable2()
 {
-    return; // https://github.com/ydb-platform/ydb/issues/17271
     CreateTopic("topic_A");
     CreateTopic("topic_B");
 
@@ -4141,7 +4139,6 @@ Y_UNIT_TEST_F(Sinks_Olap_WriteToTopicAndTable_3_Query, TFixtureSinksQuery)
 
 void TFixtureSinks::TestSinksOlapWriteToTopicAndTable4()
 {
-    return; // https://github.com/ydb-platform/ydb/issues/17271
     CreateTopic("topic_A");
     CreateTopic("topic_B");
 
diff --git a/src/library/retry/retry.cpp b/src/library/retry/retry.cpp
@@ -17,9 +17,9 @@ class TRetryOptionsWithRetCodePolicy : public IRetryPolicy<bool> {
         {
         }
 
-        TMaybe<TDuration> GetNextRetryDelay(bool ret) override {
+        std::optional<TDuration> GetNextRetryDelay(bool ret) override {
             if (ret || Attempt == Opts.RetryCount) {
-                return {};
+                return std::nullopt;
             }
             return Opts.GetTimeToSleep(Attempt++);
         }
diff --git a/src/library/retry/retry.h b/src/library/retry/retry.h
@@ -104,9 +104,9 @@ class TRetryOptionsPolicy : public IRetryPolicy<const TException&> {
         {
         }
 
-        TMaybe<TDuration> GetNextRetryDelay(const TException&) override {
+        std::optional<TDuration> GetNextRetryDelay(const TException&) override {
             if (Attempt == Opts.RetryCount) {
-                return {};
+                return std::nullopt;
             }
             return Opts.GetTimeToSleep(Attempt++);
         }
@@ -151,7 +151,7 @@ std::optional<TResult> DoWithRetry(std::function<TResult()> func, const typename
                 retryState = retryPolicy->CreateRetryState();
             }
 
-            if (const TMaybe<TDuration> delay = retryState->GetNextRetryDelay(ex)) {
+            if (const std::optional<TDuration> delay = retryState->GetNextRetryDelay(ex)) {
                 if (*delay) {
                     if (sleepFunction) {
                         sleepFunction(*delay);
@@ -167,7 +167,7 @@ std::optional<TResult> DoWithRetry(std::function<TResult()> func, const typename
             }
         }
     }
-    return {};
+    return std::nullopt;
 }
 
 template <typename TResult, typename TException = yexception>
@@ -204,7 +204,7 @@ TRetCode DoWithRetryOnRetCode(std::function<TRetCode()> func, const typename IRe
     auto retryState = retryPolicy->CreateRetryState();
     while (true) {
         TRetCode code = func();
-        if (const TMaybe<TDuration> delay = retryState->GetNextRetryDelay(code)) {
+        if (const std::optional<TDuration> delay = retryState->GetNextRetryDelay(code)) {
             if (*delay) {
                 if (sleepFunction) {
                     sleepFunction(*delay);

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-6e380d54416c706390bbe2609c7a054de2bf3b89`
	`1`	`+a01853cb85b51ba9c678dffd9d2c0cda8e7e55f3`
Original file line number	Diff line number	Diff line change
`@@ -4021,7 +4021,6 @@ Y_UNIT_TEST_F(Sinks_Oltp_WriteToTopicAndTable_6_Query, TFixtureSinksQuery)`
`4021`	`4021`
`4022`	`4022`	`void TFixtureSinks::TestSinksOlapWriteToTopicAndTable1()`
`4023`	`4023`	`{`
`4024`		`- return; // https://github.com/ydb-platform/ydb/issues/17271`
`4025`	`4024`	`CreateTopic("topic_A");`
`4026`	`4025`	`CreateColumnTable("/Root/table_A");`
`4027`	`4026`
`@@ -4054,7 +4053,6 @@ Y_UNIT_TEST_F(Sinks_Olap_WriteToTopicAndTable_1_Query, TFixtureSinksQuery)`
`4054`	`4053`
`4055`	`4054`	`void TFixtureSinks::TestSinksOlapWriteToTopicAndTable2()`
`4056`	`4055`	`{`
`4057`		`- return; // https://github.com/ydb-platform/ydb/issues/17271`
`4058`	`4056`	`CreateTopic("topic_A");`
`4059`	`4057`	`CreateTopic("topic_B");`
`4060`	`4058`
`@@ -4141,7 +4139,6 @@ Y_UNIT_TEST_F(Sinks_Olap_WriteToTopicAndTable_3_Query, TFixtureSinksQuery)`
`4141`	`4139`
`4142`	`4140`	`void TFixtureSinks::TestSinksOlapWriteToTopicAndTable4()`
`4143`	`4141`	`{`
`4144`		`- return; // https://github.com/ydb-platform/ydb/issues/17271`
`4145`	`4142`	`CreateTopic("topic_A");`
`4146`	`4143`	`CreateTopic("topic_B");`
`4147`	`4144`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ class TRetryOptionsWithRetCodePolicy : public IRetryPolicy<bool> {`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`20`		`- TMaybe<TDuration> GetNextRetryDelay(bool ret) override {`
	`20`	`+ std::optional<TDuration> GetNextRetryDelay(bool ret) override {`
`21`	`21`	`if (ret \|\| Attempt == Opts.RetryCount) {`
`22`		`- return {};`
	`22`	`+ return std::nullopt;`
`23`	`23`	`}`
`24`	`24`	`return Opts.GetTimeToSleep(Attempt++);`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,9 @@ class TRetryOptionsPolicy : public IRetryPolicy<const TException&> {`
`104`	`104`	`{`
`105`	`105`	`}`
`106`	`106`
`107`		`- TMaybe<TDuration> GetNextRetryDelay(const TException&) override {`
	`107`	`+ std::optional<TDuration> GetNextRetryDelay(const TException&) override {`
`108`	`108`	`if (Attempt == Opts.RetryCount) {`
`109`		`- return {};`
	`109`	`+ return std::nullopt;`
`110`	`110`	`}`
`111`	`111`	`return Opts.GetTimeToSleep(Attempt++);`
`112`	`112`	`}`
`@@ -151,7 +151,7 @@ std::optional<TResult> DoWithRetry(std::function<TResult()> func, const typename`
`151`	`151`	`retryState = retryPolicy->CreateRetryState();`
`152`	`152`	`}`
`153`	`153`
`154`		`- if (const TMaybe<TDuration> delay = retryState->GetNextRetryDelay(ex)) {`
	`154`	`+ if (const std::optional<TDuration> delay = retryState->GetNextRetryDelay(ex)) {`
`155`	`155`	`if (*delay) {`
`156`	`156`	`if (sleepFunction) {`
`157`	`157`	`sleepFunction(*delay);`
`@@ -167,7 +167,7 @@ std::optional<TResult> DoWithRetry(std::function<TResult()> func, const typename`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`}`
`170`		`- return {};`
	`170`	`+ return std::nullopt;`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`template <typename TResult, typename TException = yexception>`
`@@ -204,7 +204,7 @@ TRetCode DoWithRetryOnRetCode(std::function<TRetCode()> func, const typename IRe`
`204`	`204`	`auto retryState = retryPolicy->CreateRetryState();`
`205`	`205`	`while (true) {`
`206`	`206`	`TRetCode code = func();`
`207`		`- if (const TMaybe<TDuration> delay = retryState->GetNextRetryDelay(code)) {`
	`207`	`+ if (const std::optional<TDuration> delay = retryState->GetNextRetryDelay(code)) {`
`208`	`208`	`if (*delay) {`
`209`	`209`	`if (sleepFunction) {`
`210`	`210`	`sleepFunction(*delay);`