Added ThrowOnError helper for TStatus

Gazizonoki · Gazizonoki · commit 6c869564cb90 · 2024-12-13T16:25:46.000+03:00
diff --git a/examples/basic_example/basic_example.cpp b/examples/basic_example/basic_example.cpp
@@ -8,25 +8,7 @@
 
 using namespace NYdb;
 using namespace NYdb::NQuery;
-
-class TYdbErrorException : public yexception {
-public:
-    TYdbErrorException(const TStatus& status)
-        : Status(status) {}
-
-    TStatus Status;
-};
-
-static void ThrowOnError(const TStatus& status) {
-    if (!status.IsSuccess()) {
-        throw TYdbErrorException(status) << status;
-    }
-}
-
-static void PrintStatus(const TStatus& status) {
-    std::cerr << "Status: " << ToString(status.GetStatus()) << std::endl;
-    std::cerr << status.GetIssues().ToString();
-}
+using namespace NYdb::NStatusHelpers;
 
 template <class T>
 std::string OptionalToString(const std::optional<T>& opt) {
@@ -502,8 +484,7 @@ bool Run(const TDriver& driver) {
         DropTables(client);
     }
     catch (const TYdbErrorException& e) {
-        std::cerr << "Execution failed due to fatal error:" << std::endl;
-        PrintStatus(e.Status);
+        std::cerr << "Execution failed due to fatal error: " << e.what() << std::endl;
         return false;
     }
 
diff --git a/examples/pagination/pagination.cpp b/examples/pagination/pagination.cpp
@@ -7,28 +7,10 @@
 
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 
 const uint32_t MaxPages = 10;
 
-class TYdbErrorException : public yexception {
-public:
-    TYdbErrorException(const TStatus& status)
-        : Status(status) {}
-
-    TStatus Status;
-};
-
-static void ThrowOnError(const TStatus& status) {
-    if (!status.IsSuccess()) {
-        throw TYdbErrorException(status) << status;
-    }
-}
-
-static void PrintStatus(const TStatus& status) {
-    std::cerr << "Status: " << ToString(status.GetStatus()) << std::endl;
-    std::cerr << status.GetIssues().ToString();
-}
-
 static std::string JoinPath(const std::string& basePath, const std::string& path) {
     if (basePath.empty()) {
         return path;
@@ -184,8 +166,7 @@ bool Run(const TDriver& driver, const std::string& path) {
         }
     }
     catch (const TYdbErrorException& e) {
-        std::cerr << "Execution failed due to fatal error:" << std::endl;
-        PrintStatus(e.Status);
+        std::cerr << "Execution failed due to fatal error: " << e.what() << std::endl;
         return false;
     }
 
diff --git a/examples/secondary_index/main.cpp b/examples/secondary_index/main.cpp
@@ -2,6 +2,7 @@
 
 using namespace NLastGetopt;
 using namespace NYdb;
+using namespace NYdb::NStatusHelpers;
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -61,7 +62,7 @@ int main(int argc, char** argv) {
                 return RunDeleteSeries(driver, prefix, argc, argv);
         }
     } catch (const TYdbErrorException& e) {
-        std::cerr << "Execution failed: " << e << std::endl;
+        std::cerr << "Execution failed: " << e.what() << std::endl;
         return 1;
     }
 
diff --git a/examples/secondary_index/secondary_index.h b/examples/secondary_index/secondary_index.h
@@ -41,33 +41,6 @@ std::string JoinPath(const std::string& prefix, const std::string& path);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-class TYdbErrorException : public yexception {
-public:
-    TYdbErrorException(NYdb::TStatus status)
-        : Status(std::move(status))
-    { }
-
-    friend std::ostream& operator<<(std::ostream& out, const TYdbErrorException& e) {
-        out << "Status: " << ToString(e.Status.GetStatus());
-        if (e.Status.GetIssues()) {
-            out << std::endl;
-            out << e.Status.GetIssues().ToString();
-        }
-        return out;
-    }
-
-private:
-    NYdb::TStatus Status;
-};
-
-inline void ThrowOnError(NYdb::TStatus status) {
-    if (!status.IsSuccess()) {
-        throw TYdbErrorException(status) << status;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 int RunCreateTables(NYdb::TDriver& driver, const std::string& prefix, int argc, char** argv);
 int RunDropTables(NYdb::TDriver& driver, const std::string& prefix, int argc, char** argv);
 int RunUpdateViews(NYdb::TDriver& driver, const std::string& prefix, int argc, char** argv);
diff --git a/examples/secondary_index/secondary_index_create.cpp b/examples/secondary_index/secondary_index_create.cpp
@@ -3,6 +3,7 @@
 using namespace NLastGetopt;
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/examples/secondary_index/secondary_index_delete.cpp b/examples/secondary_index/secondary_index_delete.cpp
@@ -3,6 +3,7 @@
 using namespace NLastGetopt;
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/examples/secondary_index/secondary_index_drop.cpp b/examples/secondary_index/secondary_index_drop.cpp
@@ -3,6 +3,7 @@
 using namespace NLastGetopt;
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/examples/secondary_index/secondary_index_generate.cpp b/examples/secondary_index/secondary_index_generate.cpp
@@ -8,6 +8,7 @@
 using namespace NLastGetopt;
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 
 namespace {
 
diff --git a/examples/secondary_index/secondary_index_list.cpp b/examples/secondary_index/secondary_index_list.cpp
@@ -5,6 +5,7 @@
 using namespace NLastGetopt;
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/examples/secondary_index/secondary_index_update.cpp b/examples/secondary_index/secondary_index_update.cpp
@@ -3,6 +3,7 @@
 using namespace NLastGetopt;
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/examples/secondary_index_builtin/main.cpp b/examples/secondary_index_builtin/main.cpp
@@ -2,6 +2,7 @@
 
 using namespace NLastGetopt;
 using namespace NYdb;
+using namespace NYdb::NStatusHelpers;
 
 int main(int argc, char** argv) {
 
@@ -56,7 +57,7 @@ int main(int argc, char** argv) {
         }
 
     } catch (const TYdbErrorException& e) {
-        std::cerr << "Execution failed: " << e << std::endl;
+        std::cerr << "Execution failed: " << e.what() << std::endl;
         return 1;
     }
 }
diff --git a/examples/secondary_index_builtin/secondary_index.h b/examples/secondary_index_builtin/secondary_index.h
@@ -52,30 +52,6 @@ struct TSeries {
         , UploadedUserId(uploadedUserId) {}
 };
 
-class TYdbErrorException: public yexception {
-public:
-    TYdbErrorException(NYdb::TStatus status)
-        : Status(std::move(status))
-    { }
-
-    friend std::ostream& operator<<(std::ostream& out, const TYdbErrorException&  e) {
-        out << "Status:" << ToString(e.Status.GetStatus());
-        if (e.Status.GetIssues()) {
-            out << std::endl;
-            out << e.Status.GetIssues().ToString();
-        }
-        return out;
-    }
-private:
-    NYdb::TStatus Status;
-};
-
-inline void ThrowOnError(NYdb::TStatus status) {
-    if (!status.IsSuccess()){
-        throw TYdbErrorException(status) << status;
-    }
-}
-
 std::string GetCommandsList();
 TCommand Parse(const char *stringCmnd);
 std::string JoinPath(const std::string& prefix, const std::string& path);
diff --git a/examples/secondary_index_builtin/secondary_index_create.cpp b/examples/secondary_index_builtin/secondary_index_create.cpp
@@ -2,6 +2,7 @@
 
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 using namespace NLastGetopt;
 
 static void CreateSeriesTable(TTableClient& client, const std::string& path) {
diff --git a/examples/secondary_index_builtin/secondary_index_drop.cpp b/examples/secondary_index_builtin/secondary_index_drop.cpp
@@ -1,6 +1,7 @@
 #include "secondary_index.h"
 
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 using namespace NYdb;
 
 static void DropTable(TTableClient& client, const std::string& path) {
diff --git a/examples/secondary_index_builtin/secondary_index_fill.cpp b/examples/secondary_index_builtin/secondary_index_fill.cpp
@@ -4,6 +4,7 @@
 
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 
 std::vector<TSeries> GetSeries() {
     std::vector<TSeries> series = {
diff --git a/examples/secondary_index_builtin/secondary_index_select.cpp b/examples/secondary_index_builtin/secondary_index_select.cpp
@@ -2,6 +2,7 @@
 
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 using namespace NLastGetopt;
 
 TStatus SelectSeriesWithViews(TSession session, const std::string& path, std::vector<TSeries>& selectResult, uint64_t minViews) {
diff --git a/examples/secondary_index_builtin/secondary_index_select_join.cpp b/examples/secondary_index_builtin/secondary_index_select_join.cpp
@@ -2,6 +2,7 @@
 
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 using namespace NLastGetopt;
 
 TStatus SelectSeriesWithUserName(TSession session, const std::string& path,
diff --git a/examples/topic_writer/transaction/main.cpp b/examples/topic_writer/transaction/main.cpp
@@ -1,15 +1,6 @@
 #include <ydb-cpp-sdk/client/topic/client.h>
 #include <ydb-cpp-sdk/client/table/table.h>
 
-void ThrowOnError(const NYdb::TStatus& status)
-{
-    if (status.IsSuccess()) {
-        return;
-    }
-
-    ythrow yexception() << status;
-}
-
 int main()
 {
     const std::string ENDPOINT = "HOST:PORT";
diff --git a/examples/ttl/main.cpp b/examples/ttl/main.cpp
@@ -4,6 +4,7 @@
 
 using namespace NLastGetopt;
 using namespace NYdb;
+using namespace NYdb::NStatusHelpers;
 
 void StopHandler(int) {
     exit(1);
diff --git a/examples/ttl/ttl.cpp b/examples/ttl/ttl.cpp
@@ -6,6 +6,7 @@
 using namespace NExample;
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NYdb::NStatusHelpers;
 
 constexpr uint32_t DOC_TABLE_PARTITION_COUNT = 4;
 constexpr uint32_t EXPIRATION_QUEUE_COUNT = 4;
@@ -334,8 +335,7 @@ bool Run(const TDriver& driver, const std::string& path) {
         ReadDocument(client, path, "https://ya.ru/");
     }
     catch (const TYdbErrorException& e) {
-        std::cerr << "Execution failed due to fatal error:" << std::endl;
-        PrintStatus(e.Status);
+        std::cerr << "Execution failed due to fatal error: " << e.what() << std::endl;
         return false;
     }
 
diff --git a/examples/ttl/util.h b/examples/ttl/util.h
@@ -12,25 +12,6 @@ namespace NExample {
 using namespace NYdb;
 using namespace NYdb::NTable;
 
-class TYdbErrorException : public yexception {
-public:
-    TYdbErrorException(const TStatus& status)
-        : Status(status) {}
-
-    TStatus Status;
-};
-
-inline void ThrowOnError(const TStatus& status) {
-    if (!status.IsSuccess()) {
-        throw TYdbErrorException(status) << status;
-    }
-}
-
-inline void PrintStatus(const TStatus& status) {
-    std::cerr << "Status: " << ToString(status.GetStatus()) << std::endl;
-    std::cerr << status.GetIssues().ToString();
-}
-
 inline std::string JoinPath(const std::string& basePath, const std::string& path) {
     if (basePath.empty()) {
         return path;
diff --git a/include/ydb-cpp-sdk/client/table/table.h b/include/ydb-cpp-sdk/client/table/table.h
@@ -1098,8 +1098,8 @@ using TAsyncScanQueryPartIterator = NThreading::TFuture<TScanQueryPartIterator>;
 
 struct TCreateSessionSettings : public TOperationRequestSettings<TCreateSessionSettings> {};
 
-using TBackoffSettings = NYdb::NRetry::TBackoffSettings;
-using TRetryOperationSettings = NYdb::NRetry::TRetryOperationSettings;
+using TBackoffSettings = NYdb::V3::NRetry::TBackoffSettings;
+using TRetryOperationSettings = NYdb::V3::NRetry::TRetryOperationSettings;
 
 struct TSessionPoolSettings {
     using TSelf = TSessionPoolSettings;
diff --git a/include/ydb-cpp-sdk/client/types/status/status.h b/include/ydb-cpp-sdk/client/types/status/status.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ydb-cpp-sdk/client/types/exceptions/exceptions.h>
 #include <ydb-cpp-sdk/client/types/fatal_error_handlers/handlers.h>
 #include <ydb-cpp-sdk/client/types/ydb.h>
 
@@ -45,4 +46,27 @@ class TStreamPartStatus : public TStatus {
     bool EOS() const;
 };
 
+namespace NStatusHelpers {
+
+class TYdbErrorException : public TYdbException {
+public:
+    TYdbErrorException(TStatus status)
+        : Status_(std::move(status))
+    {
+        *this << status;
+    }
+
+    friend IOutputStream& operator<<(IOutputStream& out, const TYdbErrorException& e) {
+        return out << e.Status_;
+    }
+
+private:
+    TStatus Status_;
+};
+
+void ThrowOnError(TStatus status, std::function<void(TStatus)> onSuccess = [](TStatus) {});
+void ThrowOnErrorOrPrintIssues(TStatus status);
+
+}
+
 } // namespace NYdb
diff --git a/src/client/types/status/status.cpp b/src/client/types/status/status.cpp
diff --git a/tests/integration/basic_example_it/basic_example.cpp b/tests/integration/basic_example_it/basic_example.cpp
diff --git a/tests/integration/basic_example_it/basic_example.h b/tests/integration/basic_example_it/basic_example.h
diff --git a/tests/integration/basic_example_it/main.cpp b/tests/integration/basic_example_it/main.cpp
diff --git a/tests/integration/bulk_upsert_simple_it/bulk_upsert.cpp b/tests/integration/bulk_upsert_simple_it/bulk_upsert.cpp
diff --git a/tests/integration/bulk_upsert_simple_it/bulk_upsert.h b/tests/integration/bulk_upsert_simple_it/bulk_upsert.h
diff --git a/tests/integration/bulk_upsert_simple_it/main.cpp b/tests/integration/bulk_upsert_simple_it/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`using namespace NLastGetopt;`
`4`	`4`	`using namespace NYdb;`
	`5`	`+using namespace NYdb::NStatusHelpers;`
`5`	`6`
`6`	`7`	`////////////////////////////////////////////////////////////////////////////////`
`7`	`8`
`@@ -61,7 +62,7 @@ int main(int argc, char** argv) {`
`61`	`62`	`return RunDeleteSeries(driver, prefix, argc, argv);`
`62`	`63`	`}`
`63`	`64`	`} catch (const TYdbErrorException& e) {`
`64`		`- std::cerr << "Execution failed: " << e << std::endl;`
	`65`	`+ std::cerr << "Execution failed: " << e.what() << std::endl;`
`65`	`66`	`return 1;`
`66`	`67`	`}`
`67`	`68`