refactor transaction_id_str() out for future use

project-tsurugi · Oct 12, 2023 · 3276307 · 3276307
1 parent 56007e3
commit 3276307
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/jogasaki/utils/abort_error.cpp b/src/jogasaki/utils/abort_error.cpp
@@ -81,6 +81,13 @@ void handle_code_and_locator(sharksfin::ErrorCode code, sharksfin::ErrorLocator
     }
 }
 
+std::string transaction_id_str(transaction_context& tx) {
+    if(auto txid = tx.object()->transaction_id(); ! txid.empty()) {
+        return "transaction:" + std::string{txid} + " ";
+    }
+    return {};
+}
+
 std::string create_abort_message(
     request_context const& rctx
 ) {
@@ -95,11 +102,7 @@ std::string create_abort_message(
             handle_code_and_locator(result->code(), result->location().get(), *tables, rctx.request_resource(), ss);
         }
     }
-    std::string idstr{};
-    if(auto txid = tx.object()->transaction_id(); ! txid.empty()) {
-        idstr = "transaction:" + std::string{txid} + " ";
-    }
-
+    auto idstr = transaction_id_str(tx);
     return string_builder{} << "serialization failed " << idstr << desc << " " << ss.str() << string_builder::to_string;
 }
 

diff --git a/src/jogasaki/utils/abort_error.h b/src/jogasaki/utils/abort_error.h
@@ -29,5 +29,7 @@ std::shared_ptr<yugawara::storage::index const> find_storage(
     std::string_view storage_name
 );
 
+std::string transaction_id_str(transaction_context& tx);
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,5 +29,7 @@ std::shared_ptr<yugawara::storage::index const> find_storage( @@
         std::string_view storage_name
     );
+    std::string transaction_id_str(transaction_context& tx);
     }