trace log update

project-tsurugi · Jan 21, 2025 · 6024aa1 · 6024aa1
1 parent 8c2c420
commit 6024aa1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/src/concurrency_control/interface/insert.cpp b/src/concurrency_control/interface/insert.cpp
@@ -174,9 +174,9 @@ Status insert(Token const token, Storage const storage, // NOLINT
               const std::string_view val,
               blob_id_type const* blobs_data,
               std::size_t blobs_size) {
-    shirakami_log_entry << "insert, token: " << token
-                        << ", storage: " << storage << shirakami_binstring(key)
-                        << shirakami_binstring(val);
+    shirakami_log_entry_lazy("insert, token: " << token << ", storage: " << storage
+                             << shirakami_binstring(key) << shirakami_binstring(val)
+                             << ", blobs_data: " << blobs_data << ", blobs_size: " << blobs_size);
     auto* ti = static_cast<session*>(token);
     ti->process_before_start_step();
     Status ret{};

diff --git a/src/concurrency_control/interface/update.cpp b/src/concurrency_control/interface/update.cpp
@@ -103,9 +103,9 @@ Status update(Token token, Storage storage,
               std::string_view const val,
               blob_id_type const* blobs_data,
               std::size_t blobs_size) {
-    shirakami_log_entry << "update, token: " << token
-                        << ", storage: " << storage << shirakami_binstring(key)
-                        << shirakami_binstring(val);
+    shirakami_log_entry_lazy("update, token: " << token << ", storage: " << storage
+                             << shirakami_binstring(key) << shirakami_binstring(val)
+                             << ", blobs_data: " << blobs_data << ", blobs_size: " << blobs_size);
     auto* ti = static_cast<session*>(token);
     ti->process_before_start_step();
     Status ret{};

diff --git a/src/concurrency_control/interface/upsert.cpp b/src/concurrency_control/interface/upsert.cpp
@@ -152,9 +152,9 @@ Status upsert(Token token, Storage storage, std::string_view const key,
               std::string_view const val,
               blob_id_type const* blobs_data,
               std::size_t blobs_size) {
-    shirakami_log_entry << "upsert, token: " << token << ", storage; "
-                        << storage << shirakami_binstring(key)
-                        << shirakami_binstring(val);
+    shirakami_log_entry_lazy("upsert, token: " << token << ", storage: " << storage
+                             << shirakami_binstring(key) << shirakami_binstring(val)
+                             << ", blobs_data: " << blobs_data << ", blobs_size: " << blobs_size);
     auto* ti = static_cast<session*>(token);
     ti->process_before_start_step();
     auto ret = upsert_body(token, storage, key, val, blobs_data, blobs_size);

diff --git a/src/datastore/limestone/limestone_api_helper.cpp b/src/datastore/limestone/limestone_api_helper.cpp
@@ -103,20 +103,12 @@ void add_entry(limestone::api::log_channel* lc,
         LOG_FIRST_N(ERROR, 1) << log_location_prefix << "unreachable path";
         return;
     }
-    if (VLOG_IS_ON(log_debug)) {
-        std::ostringstream ss;
-        ss              << "log_channel::add_entry(): storage_id: "
-                        << storage_id << shirakami_binstring(key)
-                        << shirakami_binstring(val)
-                        << ", major write version: " << major_version
-                        << ", minor write version: " << minor_version;
-        if (!large_objects.empty()) {
-            ss << ", large_objects: [" << large_objects.size();
-            std::copy(large_objects.begin(), large_objects.end(), std::ostream_iterator<blob_id_type>(ss, ", "));
-            ss << "]";
-        }
-        shirakami_log_entry << ss.str();
-    }
+    shirakami_log_entry_lazy("log_channel::add_entry(): storage_id: "
+                             << storage_id << shirakami_binstring(key)
+                             << shirakami_binstring(val)
+                             << ", major write version: " << major_version
+                             << ", minor write version: " << minor_version
+                             << shirakami_vecstring(large_objects));
     lc->add_entry(
             storage_id, key, val,
             limestone::api::write_version_type(major_version, minor_version),