fix wrong handling on commit_response_kind::available

project-tsurugi/tsurugi-issues#801

include/jogasaki/commit_response.h

@@ -66,5 +66,4 @@ using commit_response_kind_set = takatori::util::enum_set<
         commit_response_kind::undefined,
         commit_response_kind::propagated>;
 
-}
-
+}  // namespace jogasaki

src/jogasaki/api/impl/service.cpp

@@ -536,22 +536,33 @@ void service::command_commit(
     if(! tx) {
         return;
     }
+    auto nt = from(cm.notification_type());
+    auto cr = nt != commit_response_kind::undefined ? nt : db_->config()->default_commit_response();
+    commit_response_kind_set responses{};
+    if(cr == commit_response_kind::accepted || cr == commit_response_kind::available) {
+        // currently accepted and available are treated the same
+        responses.insert(commit_response_kind::accepted);
+        cr = commit_response_kind::accepted;
+    }
+    if(cr == commit_response_kind::stored || cr == commit_response_kind::propagated) {
+        responses.insert(commit_response_kind::stored);
+        cr = commit_response_kind::stored;
+    }
+
     commit_option opt{};
-    opt.auto_dispose_on_success(cm.auto_dispose())
-        .commit_response(from(cm.notification_type()));
+    opt.auto_dispose_on_success(cm.auto_dispose()).commit_response(cr);
 
     auto tctx = get_transaction_context(tx);
     executor::commit_async(
         get_impl(*db_),
         tctx,
-        [res, req_info](commit_response_kind kind) {
-            (void) kind; // for now, callback does same regardless of kind
+        [res, req_info](commit_response_kind) {
+            // for now, callback does same regardless of kind
             details::success<sql::response::ResultOnly>(*res, req_info);
         },
         commit_response_kind_set{opt.commit_response()},
-        [res, req_info](commit_response_kind kind, status st, std::shared_ptr<error::error_info> info) { //NOLINT(performance-unnecessary-value-param)
-            (void) kind; // for now, callback does same regardless of kind
-            (void) st;
+        [res, req_info](commit_response_kind, status, std::shared_ptr<error::error_info> info) { //NOLINT(performance-unnecessary-value-param)
+            // for now, callback does same regardless of kind
             VLOG(log_error) << log_location_prefix << info->message();
             details::error<sql::response::ResultOnly>(*res, info.get(), req_info);
         },

src/jogasaki/executor/executor.cpp

@@ -83,6 +83,7 @@
 #include <jogasaki/scheduler/task_scheduler.h>
 #include <jogasaki/transaction_context.h>
 #include <jogasaki/utils/abort_error.h>
+#include <jogasaki/utils/assert.h>
 #include <jogasaki/utils/external_log_utils.h>
 #include <jogasaki/utils/hex.h>
 
@@ -761,6 +762,13 @@ scheduler::job_context::job_id_type commit_async(
     api::commit_option option,
     request_info const& req_info
 ) {
+    // currently response_kinds contains at most one element
+    assert_with_exception(response_kinds.size() <= 1, response_kinds);
+    assert_with_exception(
+        response_kinds.empty() || response_kinds.contains(commit_response_kind::accepted) ||
+        response_kinds.contains(commit_response_kind::stored), response_kinds
+    );
+
     auto req = std::make_shared<scheduler::request_detail>(scheduler::request_detail_kind::commit);
     req->status(scheduler::request_detail_status::accepted);
     req->transaction_id(tx->transaction_id());
@@ -782,6 +790,7 @@ scheduler::job_context::job_id_type commit_async(
     auto cr = option.commit_response() != commit_response_kind::undefined ?
         option.commit_response() :
         database.config()->default_commit_response();
+    assert_with_exception((cr == commit_response_kind::accepted || cr == commit_response_kind::stored), cr);
     tx->commit_response(cr);
 
     auto t = scheduler::create_custom_task(rctx.get(),
@@ -855,10 +864,13 @@ scheduler::job_context::job_id_type commit_async(
     if(cr == commit_response_kind::accepted || cr == commit_response_kind::available) {
         // currently accepted and available are treated the same
         responses.insert(commit_response_kind::accepted);
+        cr = commit_response_kind::accepted;
     }
     if(cr == commit_response_kind::stored || cr == commit_response_kind::propagated) {
         responses.insert(commit_response_kind::stored);
+        cr = commit_response_kind::stored;
     }
+    option.commit_response(cr);
     return commit_async(
         database,
         std::move(tx),

src/jogasaki/executor/executor.h

@@ -93,6 +93,7 @@ status commit(
  * @param req_info exchange the original request/response info (mainly for logging purpose)
  * @return id of the job to execute commit
  * @note normal error such as SQL runtime processing failure will be reported by callback
+ * @deprecated Use `commit_async` with commit_response_callback arg. This function is left for testing.
  */
 scheduler::job_context::job_id_type commit_async(
     api::impl::database& database,