cleanup: explicit wso refcnt for update/upsert constructor

project-tsurugi · Jan 24, 2025 · 2c7c534 · 2c7c534
1 parent 70e38e8
commit 2c7c534
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/src/concurrency_control/include/local_set.h b/src/concurrency_control/include/local_set.h
@@ -69,15 +69,6 @@ static_assert(std::is_nothrow_move_constructible_v<read_set_obj>);
 class write_set_obj { // NOLINT
 public:
     // for update / upsert / insert
-    write_set_obj(Storage const storage, OP_TYPE const op,
-                  Record* const rec_ptr, std::string_view const val)
-        : storage_(storage), op_(op), rec_ptr_(rec_ptr), val_(val) {
-        if (op == OP_TYPE::DELETE) {
-            LOG_FIRST_N(ERROR, 1) << log_location_prefix << "unreachable path";
-        }
-    }
-
-    // for upsert / insert
     write_set_obj(Storage const storage, OP_TYPE const op,
                   Record* const rec_ptr, std::string_view const val,
                   bool const inc_tombstone)

diff --git a/src/concurrency_control/interface/update.cpp b/src/concurrency_control/interface/update.cpp
@@ -82,8 +82,7 @@ Status update_body(Token token, Storage storage,
         }
 
         // prepare write
-        ti->push_to_write_set(
-                {storage, OP_TYPE::UPDATE, rec_ptr, val}); // NOLINT
+        ti->push_to_write_set({storage, OP_TYPE::UPDATE, rec_ptr, val, false});
         register_read_if_ltx(ti, rec_ptr);
         return Status::OK;
     }

diff --git a/src/concurrency_control/interface/upsert.cpp b/src/concurrency_control/interface/upsert.cpp
@@ -127,8 +127,7 @@ Status upsert_body(Token token, Storage storage, const std::string_view key,
             }
             if (rc == Status::WARN_ALREADY_EXISTS) {
                 // prepare update
-                ti->push_to_write_set(
-                        {storage, OP_TYPE::UPSERT, rec_ptr, val}); // NOLINT
+                ti->push_to_write_set({storage, OP_TYPE::UPSERT, rec_ptr, val, false});
                 return Status::OK;
             }
             if (rc == Status::WARN_CONCURRENT_INSERT) { continue; } // else