stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-28 20:47:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Objects: less string concats

Browse Source
This commit is contained in:
Stepan Usatiuk
2025-04-15 17:07:03 +02:00
parent 29fdd3eb08
commit 643c53c894
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/WritebackObjectPersistentStore.java
View File

@@ -129,11 +129,11 @@ public class WritebackObjectPersistentStore {
for (var e : bundle._entries.values()) { for (var e : bundle._entries.values()) {
switch (e) { switch (e) {
case TxBundle.CommittedEntry(JObjectKey key, JDataVersionedWrapper data, int size) -> { 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)); toWrite.add(Pair.of(key, data));
} }
case TxBundle.DeletedEntry(JObjectKey key) -> { case TxBundle.DeletedEntry(JObjectKey key) -> {
Log.trace("Deleting from persistent storage " + key); Log.tracev("Deleting from persistent storage {0}", key);
toDelete.add(key); toDelete.add(key);
} }
default -> throw new IllegalStateException("Unexpected value: " + e); default -> throw new IllegalStateException("Unexpected value: " + e);
@@ -146,7 +146,7 @@ public class WritebackObjectPersistentStore {
Collections.unmodifiableList(toDelete) Collections.unmodifiableList(toDelete)
), bundle.id()); ), bundle.id());
Log.trace("Bundle " + bundle.id() + " committed"); Log.tracev("Bundle {0} committed", bundle.id());
while (true) { while (true) {
var curPw = _pendingWrites.get(); var curPw = _pendingWrites.get();
@@ -207,7 +207,7 @@ public class WritebackObjectPersistentStore {
long waited = System.currentTimeMillis() - started; long waited = System.currentTimeMillis() - started;
_waitedTotal.addAndGet(waited); _waitedTotal.addAndGet(waited);
if (Log.isTraceEnabled()) 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; wait = false;
} }
} }
@@ -246,11 +246,11 @@ public class WritebackObjectPersistentStore {
for (var action : writes) { for (var action : writes) {
switch (action) { switch (action) {
case TxRecord.TxObjectRecordWrite<?> write -> { 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())); bundle.commit(new JDataVersionedWrapperImpl(write.data(), bundle.id()));
} }
case TxRecord.TxObjectRecordDeleted deleted -> { case TxRecord.TxObjectRecordDeleted deleted -> {
Log.trace("Deleting object " + deleted.key()); Log.tracev("Deleting object {0}", deleted.key());
bundle.delete(deleted.key()); bundle.delete(deleted.key());
} }
default -> { default -> {

6
dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
View File

@@ -193,7 +193,7 @@ public class JObjectManager {
var dep = dependenciesLocked.get(read.getKey()); var dep = dependenciesLocked.get(read.getKey());
if (dep.isEmpty() != read.getValue().data().isEmpty()) { 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()); throw new TxCommitException("Serialization hazard: " + dep.isEmpty() + " vs " + read.getValue().data().isEmpty());
} }
@@ -205,11 +205,11 @@ public class JObjectManager {
} }
if (dep.get().version() > snapshotId) { 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); 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 { } else {
Log.tracev("Skipped dependency checks: no changes"); Log.tracev("Skipped dependency checks: no changes");