Merge ccb11f8 into 432eaac

Author: kardymonds

ydb/core/fq/libs/checkpoint_storage/ydb_checkpoint_storage.cpp

@@ -803,13 +803,11 @@ TFuture<ICheckpointStorage::TCreateCheckpointResult> TCheckpointStorage::CreateC
             return CreateCheckpointWrapper(future, checkpointContext);
         });
 
-    return future.Apply(
-        [checkpointContext](const TFuture<NYdb::TStatus>& future) {
-            if (NYql::TIssues issues = StatusToIssues(future.GetValue())) {
-                return TCreateCheckpointResult(TString(), std::move(issues));
-            } else {
-                return TCreateCheckpointResult(checkpointContext->CheckpointGraphDescriptionContext->GraphDescId, NYql::TIssues());
-            }
+    return StatusToIssues(future).Apply(
+        [checkpointContext] (const TFuture<TIssues>& future) {
+            NYql::TIssues issues = future.GetValue();
+            TString descId  = !issues ? checkpointContext->CheckpointGraphDescriptionContext->GraphDescId : TString();
+            return TCreateCheckpointResult(descId, std::move(issues));
         });
 }
 
@@ -1097,9 +1095,10 @@ TFuture<ICheckpointStorage::TGetTotalCheckpointsStateSizeResult> TCheckpointStor
                         return status;
                     });
         });
-    return future.Apply(
-        [result](const TFuture<TStatus>& status) {
-          return std::make_pair(std::move(result->Size), std::move(status.GetValue().GetIssues()));
+
+    return StatusToIssues(future).Apply(
+        [result] (const TFuture<TIssues>& future) {
+            return std::make_pair(std::move(result->Size), std::move(future.GetValue()));
         });
 }
 

ydb/core/fq/libs/checkpoint_storage/ydb_state_storage.cpp

@@ -286,6 +286,7 @@ TFuture<IStateStorage::TGetStateResult> TStateStorage::GetState(
         return MakeFuture<IStateStorage::TGetStateResult>(result);
     }
 
+    
     auto context = MakeIntrusive<TContext>(
         YdbConnection->TablePathPrefix,
         taskIds,
@@ -362,15 +363,9 @@ TFuture<IStateStorage::TCountStatesResult> TStateStorage::CountStates(
             });
         });
 
-    return future.Apply(
-        [context] (const TFuture<TStatus>& future) {
-            TCountStatesResult countResult;
-            countResult.first = context->Count;
-            const auto& status = future.GetValue();
-            if (!status.IsSuccess()) {
-                countResult.second = status.GetIssues();
-            }
-            return countResult;
+    return StatusToIssues(future).Apply(
+        [context] (const TFuture<TIssues>& future) {
+            return TCountStatesResult{context->Count, std::move(future.GetValue())};
         });
 }
 TExecDataQuerySettings TStateStorage::DefaultExecDataQuerySettings() {

ydb/core/fq/libs/ydb/ut/ya.make

@@ -0,0 +1,12 @@
+UNITTEST_FOR(ydb/core/fq/libs/ydb)
+
+SRCS(
+    ydb_ut.cpp
+)
+
+PEERDIR(
+    ydb/core/fq/libs/ydb
+)
+
+END()
+

ydb/core/fq/libs/ydb/ut/ydb_ut.cpp

@@ -0,0 +1,23 @@
+#include <ydb/core/fq/libs/ydb/ydb.h>
+
+#include <library/cpp/testing/unittest/registar.h>
+
+namespace NFq {
+
+Y_UNIT_TEST_SUITE(TFqYdbTest) {
+
+    Y_UNIT_TEST(ShouldStatusToIssuesProcessExceptions)
+    {
+        auto promise = NThreading::NewPromise<NYdb::TStatus>();
+        auto future = promise.GetFuture();
+        TString text("Test exception");
+        promise.SetException(text);
+        NThreading::TFuture<NYql::TIssues> future2 = NFq::StatusToIssues(future);
+
+        NYql::TIssues issues = future2.GetValueSync();
+        UNIT_ASSERT(issues.Size() == 1);
+        UNIT_ASSERT(issues.ToString().Contains(text));
+    }
+};
+
+} // namespace NFq

ydb/core/fq/libs/ydb/ya.make

@@ -24,3 +24,7 @@ GENERATE_ENUM_SERIALIZATION(ydb.h)
 YQL_LAST_ABI_VERSION()
 
 END()
+
+RECURSE_FOR_TESTS(
+    ut
+)

ydb/core/fq/libs/ydb/ydb.cpp

@@ -210,7 +210,13 @@ NYql::TIssues StatusToIssues(const NYdb::TStatus& status) {
 TFuture<TIssues> StatusToIssues(const TFuture<TStatus>& future) {
     return future.Apply(
         [] (const TFuture<TStatus>& future) {
-            return StatusToIssues(future.GetValue());
+            try {
+                return StatusToIssues(future.GetValue());
+            } catch (...) {
+                TIssues issues;
+                issues.AddIssue("StatusToIssues failed with exception: " + CurrentExceptionMessage());
+                return issues;
+            }
     });
 }