From d2fdf03d195fa4e2bccd0c7539ca8b7fee32754e Mon Sep 17 00:00:00 2001
From: Stepan Usatiuk <stepan@usatiuk.com>
Date: Wed, 16 Apr 2025 12:14:33 +0200
Subject: [PATCH] not working dump

---
 dhfs-parent/.run/Main.run.xml                 |  2 +-
 .../src/main/resources/application.properties |  4 +-
 .../java/com/usatiuk/objects/JObjectKey.java  | 28 ++++---
 .../com/usatiuk/objects/JObjectKeyImpl.java   | 74 ++++++++++++++++---
 .../com/usatiuk/objects/JObjectKeyMax.java    |  9 +--
 .../com/usatiuk/objects/JObjectKeyMin.java    |  9 +--
 .../stores/LmdbObjectPersistentStore.java     | 12 ++-
 .../objects/transaction/JObjectManager.java   |  2 +-
 .../main/java/com/usatiuk/dhfs/PeerId.java    |  6 +-
 .../com/usatiuk/dhfs/RemoteObjectMeta.java    |  6 +-
 .../jkleppmanntree/JKleppmannTreeManager.java | 17 +++--
 .../structs/JKleppmannTreePersistentData.java |  3 +-
 .../com/usatiuk/dhfs/jmap/JMapHelper.java     | 13 +++-
 .../com/usatiuk/dhfs/jmap/JMapIterator.java   |  4 +-
 .../java/com/usatiuk/dhfs/jmap/JMapKey.java   |  3 +
 .../com/usatiuk/dhfs/jmap/JMapLongKey.java    | 12 ++-
 .../repository/RemoteObjectServiceClient.java |  8 +-
 .../RemoteObjectServiceServerImpl.java        |  2 +-
 .../TemporaryReceivedObjectSerializer.java    |  5 +-
 .../repository/peersync/PeerInfoService.java  |  6 +-
 .../structs/JKleppmannTreeNodeMetaPeer.java   | 15 ++--
 .../src/main/proto/dhfs_serial.proto          |  2 +-
 22 files changed, 169 insertions(+), 73 deletions(-)

diff --git a/dhfs-parent/.run/Main.run.xml b/dhfs-parent/.run/Main.run.xml
index acf26dc4..0cc01bcd 100644
--- a/dhfs-parent/.run/Main.run.xml
+++ b/dhfs-parent/.run/Main.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Main" type="QsApplicationConfigurationType" factoryName="QuarkusApplication" nameIsGenerated="true">
     <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfs.app.Main" />
     <module name="dhfs-app" />
-    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Dcom.usatiuk.dhfs.supportlib.native-path=$ProjectFileDir$/target/classes/native -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/1/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/1/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/1/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=true -Dquarkus.http.port=8080 -Dquarkus.http.ssl-port=9011 -Ddhfs.peerdiscovery.preset-uuid=11000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=22000000-0000-0000-0000-000000000000:127.0.0.1:9020:9021 -Dquarkus.http.host=0.0.0.0" />
+    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Dcom.usatiuk.dhfs.supportlib.native-path=$ProjectFileDir$/target/classes/native -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/1/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/1/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/1/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=true -Dquarkus.http.port=9010 -Dquarkus.http.ssl-port=9011 -Ddhfs.peerdiscovery.preset-uuid=11000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=22000000-0000-0000-0000-000000000000:127.0.0.1:9020:9021 -Dquarkus.http.host=0.0.0.0" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="com.usatiuk.dhfs.*" />
diff --git a/dhfs-parent/dhfs-app/src/main/resources/application.properties b/dhfs-parent/dhfs-app/src/main/resources/application.properties
index f3000b63..53b31b21 100644
--- a/dhfs-parent/dhfs-app/src/main/resources/application.properties
+++ b/dhfs-parent/dhfs-app/src/main/resources/application.properties
@@ -28,7 +28,7 @@ dhfs.objects.opsender.batch-size=100
 dhfs.objects.lock_timeout_secs=2
 dhfs.local-discovery=true
 dhfs.peerdiscovery.timeout=10000
-quarkus.log.category."com.usatiuk".min-level=TRACE
-quarkus.log.category."com.usatiuk".level=TRACE
+quarkus.log.category."com.usatiuk".min-level=INFO
+quarkus.log.category."com.usatiuk".level=INFO
 quarkus.http.insecure-requests=enabled
 quarkus.http.ssl.client-auth=required
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKey.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKey.java
index f0063aad..1aab1b6d 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKey.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKey.java
@@ -1,5 +1,8 @@
 package com.usatiuk.objects;
 
+import com.google.protobuf.ByteString;
+import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer;
+
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -10,11 +13,19 @@ public sealed interface JObjectKey extends Serializable, Comparable<JObjectKey>
     JObjectKeyMax MAX = new JObjectKeyMax();
 
     static JObjectKey of(String value) {
-        return new JObjectKeyImpl(value);
+        var heapBb = StandardCharsets.UTF_8.encode(value);
+        if (heapBb.isDirect()) return new JObjectKeyImpl(heapBb);
+        return fromByteBuffer(heapBb);
+    }
+
+    static JObjectKey of(ByteString value) {
+        var heapBb = value.asReadOnlyByteBuffer();
+        if (heapBb.isDirect()) return new JObjectKeyImpl(heapBb);
+        return fromByteBuffer(heapBb);
     }
 
     static JObjectKey random() {
-        return new JObjectKeyImpl(UUID.randomUUID().toString());
+        return JObjectKey.of(UUID.randomUUID().toString());
     }
 
     static JObjectKey first() {
@@ -25,12 +36,11 @@ public sealed interface JObjectKey extends Serializable, Comparable<JObjectKey>
         return MAX;
     }
 
-    static JObjectKey fromBytes(byte[] bytes) {
-        return new JObjectKeyImpl(new String(bytes, StandardCharsets.UTF_8));
-    }
-
     static JObjectKey fromByteBuffer(ByteBuffer buff) {
-        return new JObjectKeyImpl(StandardCharsets.UTF_8.decode(buff).toString());
+        var directBb = UninitializedByteBuffer.allocateUninitialized(buff.remaining());
+        directBb.put(buff);
+        directBb.flip();
+        return new JObjectKeyImpl(directBb);
     }
 
     @Override
@@ -39,9 +49,7 @@ public sealed interface JObjectKey extends Serializable, Comparable<JObjectKey>
     @Override
     String toString();
 
-    byte[] bytes();
-
     ByteBuffer toByteBuffer();
 
-    String value();
+    ByteString value();
 }
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyImpl.java
index 6ebd94f2..6e4edb65 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyImpl.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyImpl.java
@@ -1,16 +1,71 @@
 package com.usatiuk.objects;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.UnsafeByteOperations;
 import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer;
 
+import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.Objects;
+
+public record JObjectKeyImpl(SerializableByteBufferWrapper rawValue) implements JObjectKey {
+    private static class SerializableByteBufferWrapper implements Serializable {
+        @Serial
+        private static final long serialVersionUID = 1L;
+        private ByteBuffer byteBuffer;
+
+        public SerializableByteBufferWrapper(ByteBuffer byteBuffer) {
+            this.byteBuffer = byteBuffer;
+        }
+
+        public ByteBuffer getByteBuffer() {
+            return byteBuffer;
+        }
+
+        @Serial
+        private void writeObject(ObjectOutputStream out) throws IOException {
+            var readOnlyBuffer = byteBuffer.asReadOnlyBuffer();
+            var barr = new byte[readOnlyBuffer.remaining()];
+            readOnlyBuffer.get(barr);
+            out.writeInt(barr.length);
+            out.write(barr);
+        }
+
+        @Serial
+        private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+            int length = in.readInt();
+            ByteBuffer byteBuffer = UninitializedByteBuffer.allocateUninitialized(length);
+            var bytes = new byte[length];
+            in.readFully(bytes);
+            byteBuffer.put(bytes);
+            byteBuffer.flip();
+            this.byteBuffer = byteBuffer;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o == null || getClass() != o.getClass()) return false;
+            SerializableByteBufferWrapper that = (SerializableByteBufferWrapper) o;
+            return Objects.equals(byteBuffer, that.byteBuffer);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hashCode(byteBuffer);
+        }
+    }
+
+    JObjectKeyImpl(ByteBuffer byteBuffer) {
+        this(new SerializableByteBufferWrapper(byteBuffer));
+    }
 
-public record JObjectKeyImpl(String value) implements JObjectKey {
     @Override
     public int compareTo(JObjectKey o) {
         switch (o) {
             case JObjectKeyImpl jObjectKeyImpl -> {
-                return value.compareTo(jObjectKeyImpl.value());
+                return rawValue.getByteBuffer().compareTo(jObjectKeyImpl.rawValue().getByteBuffer());
             }
             case JObjectKeyMax jObjectKeyMax -> {
                 return -1;
@@ -23,21 +78,18 @@ public record JObjectKeyImpl(String value) implements JObjectKey {
 
     @Override
     public String toString() {
-        return value;
+        var encoded = Base64.getEncoder().encode(toByteBuffer());
+        return StandardCharsets.US_ASCII.decode(encoded).toString();
     }
 
     @Override
-    public byte[] bytes() {
-        return value.getBytes(StandardCharsets.UTF_8);
+    public ByteString value() {
+        return UnsafeByteOperations.unsafeWrap(toByteBuffer());
     }
 
     @Override
     public ByteBuffer toByteBuffer() {
-        var heapBb = StandardCharsets.UTF_8.encode(value);
-        if (heapBb.isDirect()) return heapBb;
-        var directBb = UninitializedByteBuffer.allocateUninitialized(heapBb.remaining());
-        directBb.put(heapBb);
-        directBb.flip();
-        return directBb;
+        return rawValue.getByteBuffer().asReadOnlyBuffer();
     }
+
 }
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyMax.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyMax.java
index 9dc5ed85..fa252ac8 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyMax.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyMax.java
@@ -1,5 +1,7 @@
 package com.usatiuk.objects;
 
+import com.google.protobuf.ByteString;
+
 import java.nio.ByteBuffer;
 
 public record JObjectKeyMax() implements JObjectKey {
@@ -18,18 +20,13 @@ public record JObjectKeyMax() implements JObjectKey {
         }
     }
 
-    @Override
-    public byte[] bytes() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ByteBuffer toByteBuffer() {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public String value() {
+    public ByteString value() {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyMin.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyMin.java
index 82e1091e..9161122e 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyMin.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyMin.java
@@ -1,5 +1,7 @@
 package com.usatiuk.objects;
 
+import com.google.protobuf.ByteString;
+
 import java.nio.ByteBuffer;
 
 public record JObjectKeyMin() implements JObjectKey {
@@ -18,18 +20,13 @@ public record JObjectKeyMin() implements JObjectKey {
         }
     }
 
-    @Override
-    public byte[] bytes() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ByteBuffer toByteBuffer() {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public String value() {
+    public ByteString value() {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java
index 0e7a9fb0..122b5c37 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java
@@ -30,7 +30,6 @@ import java.lang.ref.Cleaner;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 
@@ -118,10 +117,19 @@ public class LmdbObjectPersistentStore implements ObjectPersistentStore {
             private final long _id = commitId;
             private boolean _closed = false;
 
+            private final boolean byteStringAndByteArrEquals(ByteString bs, byte[] arr) {
+                if (bs.size() != arr.length) return false;
+                for (int i = 0; i < arr.length; i++) {
+                    if (bs.byteAt(i) != arr[i]) return false;
+                }
+                return true;
+            }
+
             @Override
             public CloseableKvIterator<JObjectKey, ByteString> getIterator(IteratorStart start, JObjectKey key) {
                 assert !_closed;
-                return new KeyPredicateKvIterator<>(new LmdbKvIterator(_txn.ref(), start, key), start, key, (k) -> !Arrays.equals(k.value().getBytes(StandardCharsets.UTF_8), DB_VER_OBJ_NAME));
+                return new KeyPredicateKvIterator<>(new LmdbKvIterator(_txn.ref(), start, key), start, key,
+                        (k) -> !byteStringAndByteArrEquals(k.value(), DB_VER_OBJ_NAME));
             }
 
             @Nonnull
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 f5d473ab..3ccae8f6 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
@@ -153,7 +153,7 @@ public class JObjectManager {
 
             if (!writes.isEmpty()) {
                 Stream.concat(readSet.keySet().stream(), writes.keySet().stream())
-                        .sorted(Comparator.comparing(JObjectKey::toString))
+                        .sorted()
                         .forEach(k -> {
                             var lock = lockManager.lockObject(k);
                             toUnlock.add(lock);
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/PeerId.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/PeerId.java
index 4ec78c8d..79a923c9 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/PeerId.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/PeerId.java
@@ -10,13 +10,17 @@ public record PeerId(JObjectKey id) implements Serializable, Comparable<PeerId>
         return new PeerId(JObjectKey.of(id));
     }
 
+    public static PeerId of(JObjectKey id) {
+        return new PeerId(id);
+    }
+
     @Override
     public String toString() {
         return id.toString();
     }
 
     public JObjectKey toJObjectKey() {
-        return JObjectKey.of(id.toString());
+        return id();
     }
 
     @Override
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java
index bdc0e6ed..34bcd353 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java
@@ -1,5 +1,6 @@
 package com.usatiuk.dhfs;
 
+import com.google.protobuf.ByteString;
 import com.usatiuk.objects.JObjectKey;
 import org.pcollections.*;
 
@@ -14,6 +15,9 @@ public record RemoteObjectMeta(PCollection<JDataRef> refsFrom, boolean frozen,
                                boolean seen,
                                PMap<PeerId, Long> changelog,
                                boolean hasLocalData) implements JDataRefcounted {
+
+    public static final ByteString DATA_SUFFIX = ByteString.copyFromUtf8(".data");
+
     // Self put
     public RemoteObjectMeta(JDataRemote data, PeerId initialPeer) {
         this(HashTreePSet.empty(), false,
@@ -41,7 +45,7 @@ public record RemoteObjectMeta(PCollection<JDataRef> refsFrom, boolean frozen,
     }
 
     public static JObjectKey ofDataKey(JObjectKey key) {
-        return JObjectKey.of("data_" + key.value());
+        return JObjectKey.of(key.value().concat(DATA_SUFFIX));
     }
 
     @Override
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java
index 0c0a0871..c1ec143a 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java
@@ -1,5 +1,6 @@
 package com.usatiuk.dhfs.jkleppmanntree;
 
+import com.google.protobuf.ByteString;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.dhfs.PeerId;
 import com.usatiuk.dhfs.jkleppmanntree.structs.*;
@@ -35,6 +36,10 @@ public class JKleppmannTreeManager {
     @Inject
     PersistentPeerDataService persistentPeerDataService;
 
+    public static final ByteString ROOT_SUFFIX = ByteString.copyFromUtf8("_jt_root");
+    public static final ByteString TRASH_SUFFIX = ByteString.copyFromUtf8("_jt_trash");
+    public static final ByteString LF_SUFFIX = ByteString.copyFromUtf8("_jt_lf");
+
     public JKleppmannTree getTree(JObjectKey name, LockingStrategy lockingStrategy) {
         return txManager.executeTx(() -> {
             var data = curTx.get(JKleppmannTreePersistentData.class, name, lockingStrategy).orElse(null);
@@ -49,11 +54,11 @@ public class JKleppmannTreeManager {
                         TreePMap.empty()
                 );
                 curTx.put(data);
-                var rootNode = new JKleppmannTreeNode(JObjectKey.of(name.value() + "_jt_root"), null, new JKleppmannTreeNodeMetaDirectory(""));
+                var rootNode = new JKleppmannTreeNode(JObjectKey.of(name.value().concat(ROOT_SUFFIX)), null, new JKleppmannTreeNodeMetaDirectory(""));
                 curTx.put(rootNode);
-                var trashNode = new JKleppmannTreeNode(JObjectKey.of(name.value() + "_jt_trash"), null, new JKleppmannTreeNodeMetaDirectory(""));
+                var trashNode = new JKleppmannTreeNode(JObjectKey.of(name.value().concat(TRASH_SUFFIX)), null, new JKleppmannTreeNodeMetaDirectory(""));
                 curTx.put(trashNode);
-                var lf_node = new JKleppmannTreeNode(JObjectKey.of(name.value() + "_jt_lf"), null, new JKleppmannTreeNodeMetaDirectory(""));
+                var lf_node = new JKleppmannTreeNode(JObjectKey.of(name.value().concat(LF_SUFFIX)), null, new JKleppmannTreeNodeMetaDirectory(""));
                 curTx.put(lf_node);
             }
             return new JKleppmannTree(data);
@@ -258,17 +263,17 @@ public class JKleppmannTreeManager {
 
             @Override
             public JObjectKey getRootId() {
-                return JObjectKey.of(_treeName.value() + "_jt_root");
+                return JObjectKey.of(_treeName.value().concat(ROOT_SUFFIX));
             }
 
             @Override
             public JObjectKey getTrashId() {
-                return JObjectKey.of(_treeName.value() + "_jt_trash");
+                return JObjectKey.of(_treeName.value().concat(TRASH_SUFFIX));
             }
 
             @Override
             public JObjectKey getLostFoundId() {
-                return JObjectKey.of(_treeName.value() + "_jt_lf");
+                return JObjectKey.of(_treeName.value().concat(LF_SUFFIX));
             }
 
             @Override
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java
index d3b41e04..2e03690b 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java
@@ -2,6 +2,7 @@ package com.usatiuk.dhfs.jkleppmanntree.structs;
 
 import com.usatiuk.dhfs.JDataRef;
 import com.usatiuk.dhfs.JDataRefcounted;
+import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.dhfs.PeerId;
 import com.usatiuk.kleppmanntree.CombinedTimestamp;
@@ -49,6 +50,6 @@ public record JKleppmannTreePersistentData(
 
     @Override
     public Collection<JObjectKey> collectRefsTo() {
-        return List.of(JObjectKey.of(key().value() + "_jt_trash"), JObjectKey.of(key().value() + "_jt_root"), JObjectKey.of(key().value() + "_jt_lf"));
+        return List.of(JObjectKey.of(key().value().concat(JKleppmannTreeManager.ROOT_SUFFIX)), JObjectKey.of(key().value().concat(JKleppmannTreeManager.TRASH_SUFFIX)), JObjectKey.of(key().value().concat(JKleppmannTreeManager.LF_SUFFIX)));
     }
 }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java
index a3d6e75b..4b544765 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java
@@ -1,5 +1,6 @@
 package com.usatiuk.dhfs.jmap;
 
+import com.google.protobuf.ByteString;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.CloseableKvIterator;
 import com.usatiuk.objects.iterators.IteratorStart;
@@ -16,20 +17,24 @@ public class JMapHelper {
     @Inject
     Transaction curTx;
 
+    public static final ByteString DATA_SUFFIX = ByteString.copyFromUtf8("=");
+    public static final ByteString FIRST_SUFFIX = ByteString.copyFromUtf8("<");
+    public static final ByteString LAST_SUFFIX = ByteString.copyFromUtf8(">");
+
     static <K extends JMapKey> JObjectKey makePrefix(JObjectKey holder) {
-        return JObjectKey.of(holder.value() + "=");
+        return JObjectKey.of(holder.value().concat(DATA_SUFFIX));
     }
 
     static <K extends JMapKey> JObjectKey makeKeyFirst(JObjectKey holder) {
-        return JObjectKey.of(holder.value() + "<");
+        return JObjectKey.of(holder.value().concat(FIRST_SUFFIX));
     }
 
     static <K extends JMapKey> JObjectKey makeKey(JObjectKey holder, K key) {
-        return JObjectKey.of(makePrefix(holder).value() + key.toString());
+        return JObjectKey.of(makePrefix(holder).value().concat(key.value()));
     }
 
     static <K extends JMapKey> JObjectKey makeKeyLast(JObjectKey holder) {
-        return JObjectKey.of(holder.value() + ">");
+        return JObjectKey.of(holder.value().concat(LAST_SUFFIX));
     }
 
     public <K extends JMapKey> CloseableKvIterator<K, JMapEntry<K>> getIterator(JMapHolder<K> holder, IteratorStart start, K key) {
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java
index c881a81c..9654fc37 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java
@@ -32,8 +32,8 @@ public class JMapIterator<K extends JMapKey> implements CloseableKvIterator<K, J
     }
 
     public K keyToKey(JObjectKey key) {
-        var keyPart = key.value().substring(_prefix.value().length());
-        return (K) JMapLongKey.of(Long.parseLong(keyPart));
+        var keyPart = key.value().substring(_prefix.value().size());
+        return (K) JMapLongKey.of(keyPart.asReadOnlyByteBuffer().getLong());
     }
 
     @Override
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapKey.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapKey.java
index da3435f4..741601d7 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapKey.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapKey.java
@@ -1,4 +1,7 @@
 package com.usatiuk.dhfs.jmap;
 
+import com.google.protobuf.ByteString;
+
 public interface JMapKey extends Comparable<JMapKey> {
+    public ByteString value();
 }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapLongKey.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapLongKey.java
index 3ae655b5..b3445843 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapLongKey.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapLongKey.java
@@ -1,9 +1,13 @@
 package com.usatiuk.dhfs.jmap;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.UnsafeByteOperations;
+import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nonnull;
 import java.io.Serializable;
+import java.nio.ByteBuffer;
 
 public record JMapLongKey(long key) implements JMapKey, Comparable<JMapKey>, Serializable {
     public static JMapLongKey of(long key) {
@@ -14,9 +18,11 @@ public record JMapLongKey(long key) implements JMapKey, Comparable<JMapKey>, Ser
         return new JMapLongKey(Long.MAX_VALUE);
     }
 
-    @Override
-    public String toString() {
-        return StringUtils.leftPad(String.valueOf(key), 20, '0');
+    public ByteString value() {
+        var newByteBuffer = ByteBuffer.allocate(Long.BYTES);
+        newByteBuffer.putLong(key);
+        newByteBuffer.flip();
+        return UnsafeByteOperations.unsafeWrap(newByteBuffer);
     }
 
     @Override
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java
index 8f586e35..4b57e956 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java
@@ -51,7 +51,7 @@ public class RemoteObjectServiceClient {
 
     public Pair<PeerId, ReceivedObject> getSpecificObject(JObjectKey key, PeerId peerId) {
         return rpcClientFactory.withObjSyncClient(peerId, (peer, client) -> {
-            var reply = client.getObject(GetObjectRequest.newBuilder().setName(JObjectKeyP.newBuilder().setName(key.toString()).build()).build());
+            var reply = client.getObject(GetObjectRequest.newBuilder().setName(JObjectKeyP.newBuilder().setName(key.value()).build()).build());
             var deserialized = receivedObjectProtoSerializer.deserialize(reply);
             return Pair.of(peer, deserialized);
         });
@@ -77,7 +77,7 @@ public class RemoteObjectServiceClient {
         Log.info("Downloading object " + key + " from " + targets);
 
         rpcClientFactory.withObjSyncClient(targets, (peer, client) -> {
-            var reply = client.getObject(GetObjectRequest.newBuilder().setName(JObjectKeyP.newBuilder().setName(key.toString()).build()).build());
+            var reply = client.getObject(GetObjectRequest.newBuilder().setName(JObjectKeyP.newBuilder().setName(key.value()).build()).build());
 
             var deserialized = receivedObjectProtoSerializer.deserialize(reply);
 
@@ -110,9 +110,9 @@ public class RemoteObjectServiceClient {
         Log.trace("Asking canDelete for " + objKey + " from " + targets.stream().map(PeerId::toString).collect(Collectors.joining(", ")));
         try {
             return _batchExecutor.invokeAll(targets.stream().<Callable<Pair<PeerId, CanDeleteReply>>>map(h -> () -> {
-                var req = CanDeleteRequest.newBuilder().setName(JObjectKeyP.newBuilder().setName(objKey.toString()).build());
+                var req = CanDeleteRequest.newBuilder().setName(JObjectKeyP.newBuilder().setName(objKey.value()).build());
                 for (var ref : ourReferrers) {
-                    req.addOurReferrers(JObjectKeyP.newBuilder().setName(ref.obj().toString()).build());
+                    req.addOurReferrers(JObjectKeyP.newBuilder().setName(ref.obj().value()).build());
                 }
                 return Pair.of(h, rpcClientFactory.withObjSyncClient(h, (p, client) -> client.canDelete(req.build())));
             }).toList()).stream().map(f -> {
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java
index fea13f06..4172d0cf 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java
@@ -88,7 +88,7 @@ public class RemoteObjectServiceServerImpl {
 
             if (!builder.getDeletionCandidate()) {
                 for (var r : obj.refsFrom()) {
-                    builder.addReferrers(JObjectKeyP.newBuilder().setName(r.obj().toString()).build());
+                    builder.addReferrers(JObjectKeyP.newBuilder().setName(r.obj().value()).build());
                     curTx.onCommit(() -> autosyncProcessor.add(r.obj()));
                 }
             }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java
index ce9840b8..7804b757 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java
@@ -6,6 +6,7 @@ import com.usatiuk.dhfs.ReceivedObject;
 import com.usatiuk.dhfs.persistence.JDataRemoteDtoP;
 import com.usatiuk.dhfs.persistence.JObjectKeyP;
 import com.usatiuk.dhfs.persistence.PeerIdP;
+import com.usatiuk.objects.JObjectKey;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.pcollections.HashTreePMap;
@@ -20,7 +21,7 @@ public class TemporaryReceivedObjectSerializer implements ProtoSerializer<GetObj
     public ReceivedObject deserialize(GetObjectReply message) {
         PMap<PeerId, Long> changelog = HashTreePMap.empty();
         for (var entry : message.getChangelog().getEntriesList()) {
-            changelog = changelog.plus(PeerId.of(entry.getKey().getId().getName()), entry.getValue());
+            changelog = changelog.plus(PeerId.of(JObjectKey.of(entry.getKey().getId().getName())), entry.getValue());
         }
         var data = remoteObjectSerializer.deserialize(message.getPushedData());
         return new ReceivedObject(changelog, data);
@@ -32,7 +33,7 @@ public class TemporaryReceivedObjectSerializer implements ProtoSerializer<GetObj
         var changelogBuilder = builder.getChangelogBuilder();
         object.changelog().forEach((peer, version) -> {
             changelogBuilder.addEntriesBuilder()
-                    .setKey(PeerIdP.newBuilder().setId(JObjectKeyP.newBuilder().setName(peer.id().toString()).build()).build())
+                    .setKey(PeerIdP.newBuilder().setId(JObjectKeyP.newBuilder().setName(peer.id().value()).build()).build())
                     .setValue(version);
         });
         builder.setPushedData(remoteObjectSerializer.serialize(object.data()));
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java
index e67e037d..73590852 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java
@@ -51,7 +51,7 @@ public class PeerInfoService {
 
     public boolean existsPeer(PeerId peer) {
         return jObjectTxManager.run(() -> {
-            var gotKey = getTreeR().traverse(List.of(JKleppmannTreeNodeMetaPeer.peerIdToNodeId(peer).value()));
+            var gotKey = getTreeR().traverse(List.of(JKleppmannTreeNodeMetaPeer.peerIdToNodeId(peer).toString()));
             if (gotKey == null) {
                 return false;
             }
@@ -61,7 +61,7 @@ public class PeerInfoService {
 
     public Optional<PeerInfo> getPeerInfo(PeerId peer) {
         return jObjectTxManager.run(() -> {
-            var gotKey = getTreeR().traverse(List.of(JKleppmannTreeNodeMetaPeer.peerIdToNodeId(peer).value()));
+            var gotKey = getTreeR().traverse(List.of(JKleppmannTreeNodeMetaPeer.peerIdToNodeId(peer).toString()));
             if (gotKey == null) {
                 return Optional.empty();
             }
@@ -114,7 +114,7 @@ public class PeerInfoService {
 
     public void removePeer(PeerId id) {
         jObjectTxManager.run(() -> {
-            var gotKey = getTreeR().traverse(List.of(JKleppmannTreeNodeMetaPeer.peerIdToNodeId(id).value()));
+            var gotKey = getTreeR().traverse(List.of(JKleppmannTreeNodeMetaPeer.peerIdToNodeId(id).toString()));
             if (gotKey == null) {
                 return;
             }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java
index 4e36f609..c5281fa3 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java
@@ -1,29 +1,34 @@
 package com.usatiuk.dhfs.repository.peersync.structs;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.UnsafeByteOperations;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.dhfs.PeerId;
 import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
 //@ProtoMirror(JKleppmannTreeNodeMetaFileP.class)
 public class JKleppmannTreeNodeMetaPeer extends JKleppmannTreeNodeMeta {
     private final JObjectKey _peerId;
+    private static final byte[] SUFFIX = "_tree_node".getBytes(StandardCharsets.UTF_8);
+    private static final ByteString SUFFIX_BS = UnsafeByteOperations.unsafeWrap(SUFFIX);
 
     public JKleppmannTreeNodeMetaPeer(PeerId id) {
-        super(peerIdToNodeId(id).value());
+        super(peerIdToNodeId(id).toString());
         _peerId = id.toJObjectKey();
     }
 
     public static JObjectKey peerIdToNodeId(PeerId id) {
-        return JObjectKey.of(id.toJObjectKey().value() + "_tree_node");
+        return JObjectKey.of(id.toJObjectKey().value().concat(SUFFIX_BS));
     }
 
     public static PeerId nodeIdToPeerId(JObjectKey id) {
-        if (!id.value().endsWith("_tree_node")) {
+        if (!id.value().endsWith(SUFFIX_BS)) {
             throw new IllegalArgumentException("Not a tree node key: " + id);
         }
-        return PeerId.of(id.value().substring(0, id.value().length() - "_tree_node".length()));
+        return PeerId.of(JObjectKey.of(id.value().substring(0, id.value().size() - SUFFIX_BS.size())));
     }
 
     public JObjectKey getPeerId() {
@@ -32,7 +37,7 @@ public class JKleppmannTreeNodeMetaPeer extends JKleppmannTreeNodeMeta {
 
     @Override
     public JKleppmannTreeNodeMeta withName(String name) {
-        assert name.equals(peerIdToNodeId(PeerId.of(getPeerId().value())).toString());
+        assert name.equals(peerIdToNodeId(PeerId.of(getPeerId())).toString());
         assert getName().equals(name);
         return this;
     }
diff --git a/dhfs-parent/sync-base/src/main/proto/dhfs_serial.proto b/dhfs-parent/sync-base/src/main/proto/dhfs_serial.proto
index c92996dc..5bc7464a 100644
--- a/dhfs-parent/sync-base/src/main/proto/dhfs_serial.proto
+++ b/dhfs-parent/sync-base/src/main/proto/dhfs_serial.proto
@@ -7,7 +7,7 @@ option java_outer_classname = "DhfsObjectPersistence";
 package dhfs.persistence;
 
 message JObjectKeyP {
-  string name = 1;
+  bytes name = 1;
 }
 
 message PeerIdP {