From 643c53c894f5fa07bb2b0c2950b0aeab4b993680 Mon Sep 17 00:00:00 2001
From: Stepan Usatiuk <stepan@usatiuk.com>
Date: Tue, 15 Apr 2025 17:07:03 +0200
Subject: [PATCH] Objects: less string concats

---
 .../stores/WritebackObjectPersistentStore.java       | 12 ++++++------
 .../usatiuk/objects/transaction/JObjectManager.java  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/WritebackObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/WritebackObjectPersistentStore.java
index 9bf75cdb..4ab48c12 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/WritebackObjectPersistentStore.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/WritebackObjectPersistentStore.java
@@ -129,11 +129,11 @@ public class WritebackObjectPersistentStore {
                 for (var e : bundle._entries.values()) {
                     switch (e) {
                         case TxBundle.CommittedEntry(JObjectKey key, JDataVersionedWrapper data, int size) -> {
-                            Log.trace("Writing new " + key);
+                            Log.tracev("Writing new {0}", key);
                             toWrite.add(Pair.of(key, data));
                         }
                         case TxBundle.DeletedEntry(JObjectKey key) -> {
-                            Log.trace("Deleting from persistent storage " + key);
+                            Log.tracev("Deleting from persistent storage {0}", key);
                             toDelete.add(key);
                         }
                         default -> throw new IllegalStateException("Unexpected value: " + e);
@@ -146,7 +146,7 @@ public class WritebackObjectPersistentStore {
                                 Collections.unmodifiableList(toDelete)
                         ), bundle.id());
 
-                Log.trace("Bundle " + bundle.id() + " committed");
+                Log.tracev("Bundle {0} committed", bundle.id());
 
                 while (true) {
                     var curPw = _pendingWrites.get();
@@ -207,7 +207,7 @@ public class WritebackObjectPersistentStore {
                     long waited = System.currentTimeMillis() - started;
                     _waitedTotal.addAndGet(waited);
                     if (Log.isTraceEnabled())
-                        Log.trace("Thread " + Thread.currentThread().getName() + " waited for tx bundle for " + waited + " ms");
+                        Log.tracev("Thread {0} waited for tx bundle for {1} ms", Thread.currentThread().getName(), waited);
                     wait = false;
                 }
             }
@@ -246,11 +246,11 @@ public class WritebackObjectPersistentStore {
                 for (var action : writes) {
                     switch (action) {
                         case TxRecord.TxObjectRecordWrite<?> write -> {
-                            Log.trace("Flushing object " + write.key());
+                            Log.tracev("Flushing object {0}", write.key());
                             bundle.commit(new JDataVersionedWrapperImpl(write.data(), bundle.id()));
                         }
                         case TxRecord.TxObjectRecordDeleted deleted -> {
-                            Log.trace("Deleting object " + deleted.key());
+                            Log.tracev("Deleting object {0}", deleted.key());
                             bundle.delete(deleted.key());
                         }
                         default -> {
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
index 4e43ec72..f5d473ab 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
@@ -193,7 +193,7 @@ public class JObjectManager {
                     var dep = dependenciesLocked.get(read.getKey());
 
                     if (dep.isEmpty() != read.getValue().data().isEmpty()) {
-                        Log.trace("Checking read dependency " + read.getKey() + " - not found");
+                        Log.tracev("Checking read dependency {0} - not found", read.getKey());
                         throw new TxCommitException("Serialization hazard: " + dep.isEmpty() + " vs " + read.getValue().data().isEmpty());
                     }
 
@@ -205,11 +205,11 @@ public class JObjectManager {
                     }
 
                     if (dep.get().version() > snapshotId) {
-                        Log.trace("Checking dependency " + read.getKey() + " - newer than");
+                        Log.tracev("Checking dependency {0} - newer than", read.getKey());
                         throw new TxCommitException("Serialization hazard: " + dep.get().data().key() + " " + dep.get().version() + " vs " + snapshotId);
                     }
 
-                    Log.trace("Checking dependency " + read.getKey() + " - ok with read");
+                    Log.tracev("Checking dependency {0} - ok with read", read.getKey());
                 }
             } else {
                 Log.tracev("Skipped dependency checks: no changes");