proper pages

tests check for "connected" in logs

.github/workflows/server.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
 
       - name: Install sudo for ACT
         run: apt-get update && apt-get install -y sudo
@@ -32,7 +32,7 @@ jobs:
 
       - name: User allow other for fuse
         run: echo "user_allow_other" | sudo tee -a /etc/fuse.conf
-      
+
       - name: Dump fuse.conf
         run: cat /etc/fuse.conf
 
@@ -43,11 +43,11 @@ jobs:
           distribution: "zulu"
           cache: maven
 
-      - name: Build LazyFS
-        run: cd thirdparty/lazyfs/ && ./build.sh
+      # - name: Build LazyFS
+      #   run: cd thirdparty/lazyfs/ && ./build.sh
 
       - name: Test with Maven
-        run: cd dhfs-parent && mvn -T $(nproc) --batch-mode --update-snapshots package verify
+        run: cd dhfs-parent && mvn -T $(nproc) --batch-mode --update-snapshots javadoc:aggregate
 
       # - name: Build with Maven
       #   run: cd dhfs-parent && mvn --batch-mode --update-snapshots package # -Dquarkus.log.category.\"com.usatiuk.dhfs\".min-level=DEBUG
@@ -55,7 +55,12 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: DHFS Server Package
-          path: dhfs-parent/dhfs-app/target/quarkus-app
+          path: dhfs-parent/dhfs-fuse/target/quarkus-app
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: DHFS Javadocs
+          path: dhfs-parent/target/reports/apidocs/
 
       - uses: actions/upload-artifact@v4
         if: ${{ always() }}
@@ -212,7 +217,7 @@ jobs:
         run: mkdir -p run-wrapper-out/dhfs/data && mkdir -p run-wrapper-out/dhfs/fuse && mkdir -p run-wrapper-out/dhfs/app
 
       - name: Copy DHFS
-        run: cp -r ./dhfs-package-downloaded "run-wrapper-out/dhfs/app/DHFS Package"
+        run: cp -r ./dhfs-package-downloaded "run-wrapper-out/dhfs/app/Server"
 
       - name: Copy Webui
         run: cp -r ./webui-dist-downloaded "run-wrapper-out/dhfs/app/Webui"
@@ -231,3 +236,37 @@ jobs:
         with:
           name: Run wrapper
           path: ~/run-wrapper.tar.gz
+
+  publish-javadoc:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+
+    needs: [build-webui, build-dhfs]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: DHFS Javadocs
+          path: dhfs-javadocs-downloaded
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: 'dhfs-javadocs-downloaded'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+
+

README.md

@@ -14,6 +14,9 @@ Syncthing and allowing you to stream your files like Google Drive File Stream
 This is a simple wrapper around the jar/web ui distribution that allows you to run/stop
 the DHFS server in the background, and update itself (hopefully!)
 
-## How to use it and how it works?
+## How to use it?
 
-TODO 😁
+
+Unpack the run-wrapper and run the `run` script. The filesystem should be mounted to the `fuse` folder in the run-wrapper root directory.
+
+Then, a web interface will be available at `losthost:8080`, that can be used to connect with other peers.

dhfs-parent/.gitignore

@@ -41,3 +41,5 @@ nb-configuration.xml
 
 # Plugin directory
 /.quarkus/cli/plugins/
+
+.jqwik-database

dhfs-parent/.run/Main 2.run.xml

@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Main 2" type="QsApplicationConfigurationType" factoryName="QuarkusApplication">
-    <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 -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/2/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/2/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/2/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=false -Dquarkus.http.port=9020 -Dquarkus.http.ssl-port=9021 -Ddhfs.peerdiscovery.preset-uuid=22000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=11000000-0000-0000-0000-000000000000:127.0.0.1:8080:9011" />
+    <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfsfuse.Main" />
+    <module name="dhfs-fuse" />
+    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+UseParallelGC -XX:+DebugNonSafepoints --enable-preview --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 -Xmx512M -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/2/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/2/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/2/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=false -Dquarkus.http.port=9020 -Dquarkus.http.ssl-port=9021 -Ddhfs.peerdiscovery.preset-uuid=22000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=11000000-0000-0000-0000-000000000000:127.0.0.1:9010:9011" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="com.usatiuk.dhfs.*" />
+        <option name="PATTERN" value="com.usatiuk.dhfs.remoteobj.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

dhfs-parent/.run/Main.run.xml

@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <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 --enable-preview -XX:+UseParallelGC -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 -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="MAIN_CLASS_NAME" value="com.usatiuk.dhfsfuse.Main" />
+    <module name="dhfs-fuse" />
+    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+UseZGC -XX:+ZGenerational --enable-preview -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 -Xmx1G -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.*" />
+        <option name="PATTERN" value="com.usatiuk.dhfs.remoteobj.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

dhfs-parent/dhfs-app/.dockerignore

@@ -1,5 +0,0 @@
-*
-!target/*-runner
-!target/*-runner.jar
-!target/lib/*
-!target/quarkus-app/*

dhfs-parent/dhfs-app/.gitignore

@@ -1,43 +0,0 @@
-#Maven
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-release.properties
-.flattened-pom.xml
-
-# Eclipse
-.project
-.classpath
-.settings/
-bin/
-
-# IntelliJ
-.idea
-*.ipr
-*.iml
-*.iws
-
-# NetBeans
-nb-configuration.xml
-
-# Visual Studio Code
-.vscode
-.factorypath
-
-# OSX
-.DS_Store
-
-# Vim
-*.swp
-*.swo
-
-# patch
-*.orig
-*.rej
-
-# Local environment
-.env
-
-# Plugin directory
-/.quarkus/cli/plugins/

dhfs-parent/dhfs-app/Dockerfile

@@ -1,2 +0,0 @@
-FROM azul/zulu-openjdk-debian:21-jre-latest
-RUN apt update && apt install -y libfuse2 curl

dhfs-parent/dhfs-app/docker-compose.yml

@@ -1,43 +0,0 @@
-version: "3.2"
-
-services:
-  dhfs1:
-    build: .
-    privileged: true
-    devices:
-      - /dev/fuse
-    volumes:
-      - $HOME/dhfs/dhfs1:/dhfs_root
-      - $HOME/dhfs/dhfs1_f:/dhfs_root/fuse:rshared
-      - ./target/quarkus-app:/app
-    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
-     -Ddhfs.objects.root=/dhfs_root/d 
-     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0 
-     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
-     -jar /app/quarkus-run.jar"
-    ports:
-      - 8080:8080
-      - 8081:8443
-      - 5005:5005
-  dhfs2:
-    build: .
-    privileged: true
-    devices:
-      - /dev/fuse
-    volumes:
-      - $HOME/dhfs/dhfs2:/dhfs_root
-      - $HOME/dhfs/dhfs2_f:/dhfs_root/fuse:rshared
-      - ./target/quarkus-app:/app
-    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-     --add-exports java.base/jdk.internal.access=ALL-UNNAMED
-     --add-opens=java.base/java.nio=ALL-UNNAMED
-     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
-     -Ddhfs.objects.root=/dhfs_root/d 
-     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0
-     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010
-     -jar /app/quarkus-run.jar"
-    ports:
-      - 8090:8080
-      - 8091:8443
-      - 5010:5010

dhfs-parent/dhfs-app/pom.xml

@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.usatiuk.dhfs</groupId>
-    <artifactId>dhfs-app</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <parent>
-        <groupId>com.usatiuk.dhfs</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk18on</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk18on</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.openhft</groupId>
-            <artifactId>zero-allocation-hashing</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-grpc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client-jsonb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-jsonb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-scheduler</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.slf4j</groupId>
-            <artifactId>slf4j-jboss-logmanager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.pcollections</groupId>
-            <artifactId>pcollections</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>3.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk</groupId>
-            <artifactId>kleppmanntree</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk.dhfs</groupId>
-            <artifactId>objects</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk.dhfs</groupId>
-            <artifactId>dhfs-fs</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk.dhfs</groupId>
-            <artifactId>dhfs-fuse</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk.dhfs</groupId>
-            <artifactId>sync-base</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk.dhfs</groupId>
-            <artifactId>utils</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>1C</forkCount>
-                    <reuseForks>false</reuseForks>
-                    <parallel>classes</parallel>
-                    <systemPropertyVariables>
-                        <junit.jupiter.execution.parallel.enabled>
-                            false
-                        </junit.jupiter.execution.parallel.enabled>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <forkCount>1C</forkCount>
-                    <reuseForks>false</reuseForks>
-                    <parallel>classes</parallel>
-                    <systemPropertyVariables>
-                        <junit.jupiter.execution.parallel.enabled>
-                            false
-                        </junit.jupiter.execution.parallel.enabled>
-                        <junit.platform.output.capture.stdout>true</junit.platform.output.capture.stdout>
-                        <junit.platform.output.capture.stderr>true</junit.platform.output.capture.stderr>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>${quarkus.platform.group-id}</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>quarkus-plugin</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>generate-code</goal>
-                            <goal>generate-code-tests</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

dhfs-parent/dhfs-app/src/main/docker/Dockerfile.jvm

@@ -1,97 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
-#
-# Before building the container image run:
-#
-# ./mvnw package
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/server-jvm .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/server-jvm
-#
-# If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
-# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
-# when running the container
-#
-# Then run the container using :
-#
-# docker run -i --rm -p 8080:8080 quarkus/server-jvm
-#
-# This image uses the `run-java.sh` script to run the application.
-# This scripts computes the command line to execute your Java application, and
-# includes memory/GC tuning.
-# You can configure the behavior using the following environment properties:
-# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
-# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
-#   in JAVA_OPTS (example: "-Dsome.property=foo")
-# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
-#   used to calculate a default maximal heap memory based on a containers restriction.
-#   If used in a container without any memory constraints for the container then this
-#   option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
-#   of the container available memory as set here. The default is `50` which means 50%
-#   of the available memory is used as an upper boundary. You can skip this mechanism by
-#   setting this value to `0` in which case no `-Xmx` option is added.
-# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
-#   is used to calculate a default initial heap memory based on the maximum heap memory.
-#   If used in a container without any memory constraints for the container then this
-#   option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
-#   of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
-#   is used as the initial heap size. You can skip this mechanism by setting this value
-#   to `0` in which case no `-Xms` option is added (example: "25")
-# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
-#   This is used to calculate the maximum value of the initial heap memory. If used in
-#   a container without any memory constraints for the container then this option has
-#   no effect. If there is a memory constraint then `-Xms` is limited to the value set
-#   here. The default is 4096MB which means the calculated value of `-Xms` never will
-#   be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
-# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
-#   when things are happening. This option, if set to true, will set
-#  `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
-# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
-#    true").
-# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
-# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
-#   https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
-# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
-# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
-#   (example: "20")
-# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
-#   (example: "40")
-# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
-#   (example: "4")
-# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
-#   previous GC times. (example: "90")
-# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
-# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
-# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
-#   contain the necessary JRE command-line options to specify the required GC, which
-#   will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
-# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
-# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
-# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
-#   accessed directly. (example: "foo.example.com,bar.example.com")
-#
-###
-FROM registry.access.redhat.com/ubi8/openjdk-21:1.18
-
-ENV LANGUAGE='en_US:en'
-
-
-# We make four distinct layers so if there are application changes the library layers can be re-used
-COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
-COPY --chown=185 target/quarkus-app/*.jar /deployments/
-COPY --chown=185 target/quarkus-app/app/ /deployments/app/
-COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
-
-EXPOSE 8080
-USER 185
-ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
-
-ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
-

dhfs-parent/dhfs-app/src/main/docker/Dockerfile.legacy-jar

@@ -1,93 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
-#
-# Before building the container image run:
-#
-# ./mvnw package -Dquarkus.package.jar.type=legacy-jar
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/server-legacy-jar .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/server-legacy-jar
-#
-# If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
-# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
-# when running the container
-#
-# Then run the container using :
-#
-# docker run -i --rm -p 8080:8080 quarkus/server-legacy-jar
-#
-# This image uses the `run-java.sh` script to run the application.
-# This scripts computes the command line to execute your Java application, and
-# includes memory/GC tuning.
-# You can configure the behavior using the following environment properties:
-# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
-# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
-#   in JAVA_OPTS (example: "-Dsome.property=foo")
-# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
-#   used to calculate a default maximal heap memory based on a containers restriction.
-#   If used in a container without any memory constraints for the container then this
-#   option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
-#   of the container available memory as set here. The default is `50` which means 50%
-#   of the available memory is used as an upper boundary. You can skip this mechanism by
-#   setting this value to `0` in which case no `-Xmx` option is added.
-# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
-#   is used to calculate a default initial heap memory based on the maximum heap memory.
-#   If used in a container without any memory constraints for the container then this
-#   option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
-#   of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
-#   is used as the initial heap size. You can skip this mechanism by setting this value
-#   to `0` in which case no `-Xms` option is added (example: "25")
-# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
-#   This is used to calculate the maximum value of the initial heap memory. If used in
-#   a container without any memory constraints for the container then this option has
-#   no effect. If there is a memory constraint then `-Xms` is limited to the value set
-#   here. The default is 4096MB which means the calculated value of `-Xms` never will
-#   be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
-# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
-#   when things are happening. This option, if set to true, will set
-#  `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
-# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
-#    true").
-# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
-# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
-#   https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
-# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
-# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
-#   (example: "20")
-# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
-#   (example: "40")
-# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
-#   (example: "4")
-# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
-#   previous GC times. (example: "90")
-# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
-# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
-# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
-#   contain the necessary JRE command-line options to specify the required GC, which
-#   will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
-# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
-# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
-# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
-#   accessed directly. (example: "foo.example.com,bar.example.com")
-#
-###
-FROM registry.access.redhat.com/ubi8/openjdk-21:1.18
-
-ENV LANGUAGE='en_US:en'
-
-
-COPY target/lib/* /deployments/lib/
-COPY target/*-runner.jar /deployments/quarkus-run.jar
-
-EXPOSE 8080
-USER 185
-ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
-
-ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]

dhfs-parent/dhfs-app/src/main/docker/Dockerfile.native

@@ -1,27 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
-#
-# Before building the container image run:
-#
-# ./mvnw package -Dnative
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.native -t quarkus/server .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/server
-#
-###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
-WORKDIR /work/
-RUN chown 1001 /work \
-    && chmod "g+rwX" /work \
-    && chown 1001:root /work
-COPY --chown=1001:root target/*-runner /work/application
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

dhfs-parent/dhfs-app/src/main/docker/Dockerfile.native-micro

@@ -1,30 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
-# It uses a micro base image, tuned for Quarkus native executables.
-# It reduces the size of the resulting container image.
-# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
-#
-# Before building the container image run:
-#
-# ./mvnw package -Dnative
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/server .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/server
-#
-###
-FROM quay.io/quarkus/quarkus-micro-image:2.0
-WORKDIR /work/
-RUN chown 1001 /work \
-    && chmod "g+rwX" /work \
-    && chown 1001:root /work
-COPY --chown=1001:root target/*-runner /work/application
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

dhfs-parent/dhfs-app/src/main/resources/application.properties

@@ -1,34 +0,0 @@
-quarkus.grpc.server.use-separate-server=false
-dhfs.objects.peerdiscovery.port=42069
-dhfs.objects.peerdiscovery.interval=4s
-dhfs.objects.peerdiscovery.broadcast=true
-dhfs.objects.sync.timeout=30
-dhfs.objects.sync.ping.timeout=5
-dhfs.objects.invalidation.threads=16
-dhfs.objects.invalidation.delay=1000
-dhfs.objects.reconnect_interval=5s
-dhfs.objects.write_log=false
-dhfs.objects.periodic-push-op-interval=5m
-dhfs.fuse.root=${HOME}/dhfs_default/fuse
-dhfs.objects.persistence.stuff.root=${HOME}/dhfs_default/data/stuff
-dhfs.fuse.debug=false
-dhfs.fuse.enabled=true
-dhfs.files.allow_recursive_delete=false
-dhfs.files.target_chunk_size=2097152
-dhfs.files.target_chunk_alignment=19
-dhfs.objects.deletion.delay=1000
-dhfs.objects.deletion.can-delete-retry-delay=10000
-dhfs.objects.ref_verification=true
-dhfs.files.use_hash_for_chunks=false
-dhfs.objects.autosync.threads=16
-dhfs.objects.autosync.download-all=false
-dhfs.objects.move-processor.threads=16
-dhfs.objects.ref-processor.threads=16
-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.http.insecure-requests=enabled
-quarkus.http.ssl.client-auth=required

dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java

@@ -1,44 +0,0 @@
-package com.usatiuk.dhfs;
-
-import io.quarkus.logging.Log;
-import io.quarkus.runtime.ShutdownEvent;
-import io.quarkus.runtime.StartupEvent;
-import jakarta.annotation.Priority;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.event.Observes;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Objects;
-
-@ApplicationScoped
-public class TestDataCleaner {
-    @ConfigProperty(name = "dhfs.objects.persistence.files.root")
-    String tempDirectory;
-
-    void init(@Observes @Priority(1) StartupEvent event) throws IOException {
-        try {
-            purgeDirectory(Path.of(tempDirectory).toFile());
-        } catch (Exception ignored) {
-            Log.warn("Couldn't cleanup test data on init");
-        }
-    }
-
-    void shutdown(@Observes @Priority(1000000000) ShutdownEvent event) throws IOException {
-        purgeDirectory(Path.of(tempDirectory).toFile());
-    }
-
-    public static void purgeDirectory(File dir) {
-        try {
-            for (File file : Objects.requireNonNull(dir.listFiles())) {
-                if (file.isDirectory())
-                    purgeDirectory(file);
-                file.delete();
-            }
-        } catch (Exception e) {
-            Log.error("Couldn't purge directory " + dir, e);
-        }
-    }
-}

dhfs-parent/dhfs-app/src/test/resources/application.properties

@@ -1,11 +0,0 @@
-dhfs.objects.persistence.files.root=${HOME}/dhfs_data/dhfs_root_test
-dhfs.objects.root=${HOME}/dhfs_data/dhfs_root_d_test
-dhfs.fuse.root=${HOME}/dhfs_data/dhfs_fuse_root_test
-dhfs.objects.ref_verification=true
-dhfs.objects.deletion.delay=0
-quarkus.log.category."com.usatiuk.dhfs".level=TRACE
-quarkus.log.category."com.usatiuk.dhfs".min-level=TRACE
-quarkus.http.test-port=0
-quarkus.http.test-ssl-port=0
-dhfs.local-discovery=false
-dhfs.objects.persistence.snapshot-extra-checks=true

dhfs-parent/dhfs-fs/pom.xml

@@ -102,26 +102,11 @@
             <artifactId>commons-math3</artifactId>
             <version>3.6.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.usatiuk</groupId>
-            <artifactId>kleppmanntree</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk.dhfs</groupId>
-            <artifactId>objects</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.usatiuk.dhfs</groupId>
             <artifactId>sync-base</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.usatiuk.dhfs</groupId>
-            <artifactId>utils</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 
     <build>

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java

@@ -1,13 +0,0 @@
-package com.usatiuk.dhfs.files.objects;
-
-import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.JDataRemote;
-import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.repository.JDataRemoteDto;
-
-public record ChunkData(JObjectKey key, ByteString data) implements JDataRemote, JDataRemoteDto {
-    @Override
-    public int estimateSize() {
-        return data.size();
-    }
-}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java

@@ -1,26 +0,0 @@
-package com.usatiuk.dhfs.files.objects;
-
-import com.usatiuk.dhfs.ProtoSerializer;
-import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.persistence.ChunkDataP;
-import com.usatiuk.dhfs.persistence.JObjectKeyP;
-import jakarta.inject.Singleton;
-
-@Singleton
-public class ChunkDataProtoSerializer implements ProtoSerializer<ChunkDataP, ChunkData> {
-    @Override
-    public ChunkData deserialize(ChunkDataP message) {
-        return new ChunkData(
-                JObjectKey.of(message.getKey().getName()),
-                message.getData()
-        );
-    }
-
-    @Override
-    public ChunkDataP serialize(ChunkData object) {
-        return ChunkDataP.newBuilder()
-                .setKey(JObjectKeyP.newBuilder().setName(object.key().value()).build())
-                .setData(object.data())
-                .build();
-    }
-}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java

@@ -1,15 +0,0 @@
-package com.usatiuk.dhfs.files.objects;
-
-import com.usatiuk.dhfs.JDataRemote;
-import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.repository.JDataRemoteDto;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.List;
-
-public record FileDto(File file, List<Pair<Long, JObjectKey>> chunks) implements JDataRemoteDto {
-    @Override
-    public Class<? extends JDataRemote> objClass() {
-        return File.class;
-    }
-}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java

@@ -1,25 +0,0 @@
-package com.usatiuk.dhfs.files.objects;
-
-import com.usatiuk.dhfs.ProtoSerializer;
-import com.usatiuk.dhfs.persistence.FileDtoP;
-import com.usatiuk.dhfs.utils.SerializationHelper;
-import jakarta.inject.Singleton;
-
-import java.io.IOException;
-
-@Singleton
-public class FileProtoSerializer implements ProtoSerializer<FileDtoP, FileDto> {
-    @Override
-    public FileDto deserialize(FileDtoP message) {
-        try (var is = message.getSerializedData().newInput()) {
-            return SerializationHelper.deserialize(is);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public FileDtoP serialize(FileDto object) {
-        return FileDtoP.newBuilder().setSerializedData(SerializationHelper.serialize(object)).build();
-    }
-}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java

@@ -1,48 +0,0 @@
-package com.usatiuk.dhfs.files.service;
-
-import com.google.protobuf.ByteString;
-import com.google.protobuf.UnsafeByteOperations;
-import com.usatiuk.objects.JObjectKey;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.Optional;
-
-public interface DhfsFileService {
-    Optional<JObjectKey> open(String name);
-
-    Optional<JObjectKey> create(String name, long mode);
-
-    Pair<String, JObjectKey> inoToParent(JObjectKey ino);
-
-    void mkdir(String name, long mode);
-
-    Optional<GetattrRes> getattr(JObjectKey name);
-
-    Boolean chmod(JObjectKey name, long mode);
-
-    void unlink(String name);
-
-    Boolean rename(String from, String to);
-
-    Boolean setTimes(JObjectKey fileUuid, long atimeMs, long mtimeMs);
-
-    Iterable<String> readDir(String name);
-
-    long size(JObjectKey fileUuid);
-
-    Optional<ByteString> read(JObjectKey fileUuid, long offset, int length);
-
-    Long write(JObjectKey fileUuid, long offset, ByteString data);
-
-    default Long write(JObjectKey fileUuid, long offset, byte[] data) {
-        return write(fileUuid, offset, UnsafeByteOperations.unsafeWrap(data));
-    }
-
-    Boolean truncate(JObjectKey fileUuid, long length);
-
-    String readlink(JObjectKey uuid);
-
-    ByteString readlinkBS(JObjectKey uuid);
-
-    JObjectKey symlink(String oldpath, String newpath);
-}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DirectoryNotEmptyException.java

@@ -1,8 +0,0 @@
-package com.usatiuk.dhfs.files.service;
-
-public class DirectoryNotEmptyException extends RuntimeException {
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrRes.java

@@ -1,4 +0,0 @@
-package com.usatiuk.dhfs.files.service;
-
-public record GetattrRes(long mtime, long ctime, long mode, GetattrType type) {
-}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/ChunkData.java

@@ -0,0 +1,18 @@
+package com.usatiuk.dhfsfs.objects;
+
+import com.google.protobuf.ByteString;
+import com.usatiuk.dhfs.remoteobj.JDataRemote;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
+import com.usatiuk.objects.JObjectKey;
+
+/**
+ * ChunkData is a data structure that represents an immutable binary blob
+ * @param key unique key
+ * @param data binary data
+ */
+public record ChunkData(JObjectKey key, ByteString data) implements JDataRemote, JDataRemoteDto {
+    @Override
+    public int estimateSize() {
+        return data.size();
+    }
+}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/File.java

@@ -1,14 +1,22 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
-import com.usatiuk.dhfs.JDataRemote;
 import com.usatiuk.dhfs.jmap.JMapHolder;
 import com.usatiuk.dhfs.jmap.JMapLongKey;
-import com.usatiuk.dhfs.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.remoteobj.JDataRemote;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
 import com.usatiuk.objects.JObjectKey;
 
 import java.util.Collection;
 import java.util.Set;
 
+/**
+ * File is a data structure that represents a file in the file system
+ * @param key unique key
+ * @param mode file mode
+ * @param cTime creation time
+ * @param mTime modification time
+ * @param symlink true if the file is a symlink, false otherwise
+ */
 public record File(JObjectKey key, long mode, long cTime, long mTime,
                    boolean symlink
 ) implements JDataRemote, JMapHolder<JMapLongKey> {

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileDto.java

@@ -0,0 +1,20 @@
+package com.usatiuk.dhfsfs.objects;
+
+import com.usatiuk.dhfs.remoteobj.JDataRemote;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
+import com.usatiuk.objects.JObjectKey;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.List;
+
+/**
+ * FileDto is a data transfer object that contains a file and its chunks.
+ * @param file the file
+ * @param chunks the list of chunks, each represented as a pair of a long and a JObjectKey
+ */
+public record FileDto(File file, List<Pair<Long, JObjectKey>> chunks) implements JDataRemoteDto {
+    @Override
+    public Class<? extends JDataRemote> objClass() {
+        return File.class;
+    }
+}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileDtoMapper.java

@@ -1,10 +1,13 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
 import com.usatiuk.dhfs.jmap.JMapHelper;
-import com.usatiuk.dhfs.repository.syncmap.DtoMapper;
+import com.usatiuk.dhfs.syncmap.DtoMapper;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
+/**
+ * Maps a {@link File} object to a {@link FileDto} object and vice versa.
+ */
 @ApplicationScoped
 public class FileDtoMapper implements DtoMapper<File, FileDto> {
     @Inject

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileHelper.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
-import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.dhfs.jmap.JMapHelper;
 import com.usatiuk.dhfs.jmap.JMapLongKey;
+import com.usatiuk.objects.JObjectKey;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.apache.commons.lang3.tuple.Pair;
@@ -10,11 +10,20 @@ import org.apache.commons.lang3.tuple.Pair;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Helper class for working with files.
+ */
 @ApplicationScoped
 public class FileHelper {
     @Inject
     JMapHelper jMapHelper;
 
+    /**
+     * Get the chunks of a file.
+     * Transaction is expected to be already started.
+     * @param file the file to get chunks from
+     * @return a list of pairs of chunk offset and chunk key
+     */
     public List<Pair<Long, JObjectKey>> getChunks(File file) {
         ArrayList<Pair<Long, JObjectKey>> chunks = new ArrayList<>();
         try (var it = jMapHelper.getIterator(file)) {
@@ -26,6 +35,13 @@ public class FileHelper {
         return List.copyOf(chunks);
     }
 
+    /**
+     * Replace the chunks of a file.
+     * All previous chunks will be deleted.
+     * Transaction is expected to be already started.
+     * @param file the file to replace chunks in
+     * @param chunks the list of pairs of chunk offset and chunk key
+     */
     public void replaceChunks(File file, List<Pair<Long, JObjectKey>> chunks) {
         jMapHelper.deleteAll(file);
 

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileSyncHandler.java

@@ -1,20 +1,14 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.RemoteObjectDataWrapper;
-import com.usatiuk.dhfs.RemoteObjectMeta;
-import com.usatiuk.dhfs.RemoteTransaction;
-import com.usatiuk.dhfs.files.service.DhfsFileService;
 import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
-import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile;
 import com.usatiuk.dhfs.jmap.JMapHelper;
-import com.usatiuk.dhfs.repository.ObjSyncHandler;
-import com.usatiuk.dhfs.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.repository.SyncHelper;
-import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.objects.transaction.LockingStrategy;
-import com.usatiuk.objects.transaction.Transaction;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.remoteobj.*;
+import com.usatiuk.dhfsfs.service.DhfsFileService;
 import com.usatiuk.kleppmanntree.AlreadyExistsException;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.transaction.Transaction;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.quarkus.logging.Log;
@@ -29,6 +23,9 @@ import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Objects;
 
+/**
+ * Handles synchronization of file objects.
+ */
 @ApplicationScoped
 public class FileSyncHandler implements ObjSyncHandler<File, FileDto> {
     @Inject
@@ -47,14 +44,18 @@ public class FileSyncHandler implements ObjSyncHandler<File, FileDto> {
     @Inject
     DhfsFileService fileService;
 
-    private JKleppmannTreeManager.JKleppmannTree getTreeW() {
-        return jKleppmannTreeManager.getTree(JObjectKey.of("fs"));
-    }
-
-    private JKleppmannTreeManager.JKleppmannTree getTreeR() {
-        return jKleppmannTreeManager.getTree(JObjectKey.of("fs"), LockingStrategy.OPTIMISTIC);
+    private JKleppmannTreeManager.JKleppmannTree getTree() {
+        return jKleppmannTreeManager.getTree(JObjectKey.of("fs")).orElseThrow();
     }
 
+    /**
+     * Resolve conflict between two file versions, update the file in storage and create a conflict file.
+     *
+     * @param from              the peer that sent the update
+     * @param key               the key of the file
+     * @param receivedChangelog the changelog of the received file
+     * @param receivedData      the received file data
+     */
     private void resolveConflict(PeerId from, JObjectKey key, PMap<PeerId, Long> receivedChangelog,
                                  @Nullable FileDto receivedData) {
         var oursCurMeta = curTx.get(RemoteObjectMeta.class, key).orElse(null);
@@ -136,12 +137,12 @@ public class FileSyncHandler implements ObjSyncHandler<File, FileDto> {
 
             do {
                 try {
-                    getTreeW().move(parent.getRight(),
+                    getTree().move(parent.getRight(),
                             new JKleppmannTreeNodeMetaFile(
                                     parent.getLeft() + ".fconflict." + persistentPeerDataService.getSelfUuid() + "." + otherHostname.toString() + "." + i,
                                     newFile.key()
                             ),
-                            getTreeW().getNewNodeId()
+                            getTree().getNewNodeId()
                     );
                 } catch (AlreadyExistsException aex) {
                     i++;

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/JKleppmannTreeNodeMetaDirectory.java

@@ -0,0 +1,22 @@
+package com.usatiuk.dhfsfs.objects;
+
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
+import com.usatiuk.objects.JObjectKey;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * JKleppmannTreeNodeMetaDirectory is a record that represents a directory in the JKleppmann tree.
+ * @param name the name of the directory
+ */
+public record JKleppmannTreeNodeMetaDirectory(String name) implements JKleppmannTreeNodeMeta {
+    public JKleppmannTreeNodeMeta withName(String name) {
+        return new JKleppmannTreeNodeMetaDirectory(name);
+    }
+
+    @Override
+    public Collection<JObjectKey> collectRefsTo() {
+        return List.of();
+    }
+}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/JKleppmannTreeNodeMetaFile.java

@@ -0,0 +1,24 @@
+package com.usatiuk.dhfsfs.objects;
+
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
+import com.usatiuk.objects.JObjectKey;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * JKleppmannTreeNodeMetaFile is a record that represents a file in the JKleppmann tree.
+ * @param name the name of the file
+ * @param fileIno a reference to the `File` object
+ */
+public record JKleppmannTreeNodeMetaFile(String name, JObjectKey fileIno) implements JKleppmannTreeNodeMeta {
+    @Override
+    public JKleppmannTreeNodeMeta withName(String name) {
+        return new JKleppmannTreeNodeMetaFile(name, fileIno);
+    }
+
+    @Override
+    public Collection<JObjectKey> collectRefsTo() {
+        return List.of(fileIno);
+    }
+}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileService.java

@@ -1,27 +1,27 @@
-package com.usatiuk.dhfs.files.service;
+package com.usatiuk.dhfsfs.service;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.UnsafeByteOperations;
-import com.usatiuk.dhfs.JDataRemote;
-import com.usatiuk.dhfs.RemoteObjectMeta;
-import com.usatiuk.dhfs.RemoteTransaction;
-import com.usatiuk.dhfs.files.objects.ChunkData;
-import com.usatiuk.dhfs.files.objects.File;
 import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
 import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeHolder;
 import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
-import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaDirectory;
-import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile;
 import com.usatiuk.dhfs.jmap.JMapEntry;
 import com.usatiuk.dhfs.jmap.JMapHelper;
 import com.usatiuk.dhfs.jmap.JMapLongKey;
-import com.usatiuk.dhfs.utils.StatusRuntimeExceptionNoStacktrace;
+import com.usatiuk.dhfs.remoteobj.JDataRemote;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
+import com.usatiuk.dhfsfs.objects.ChunkData;
+import com.usatiuk.dhfsfs.objects.File;
+import com.usatiuk.dhfsfs.objects.JKleppmannTreeNodeMetaDirectory;
+import com.usatiuk.dhfsfs.objects.JKleppmannTreeNodeMetaFile;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.IteratorStart;
-import com.usatiuk.objects.transaction.LockingStrategy;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
+import com.usatiuk.utils.StatusRuntimeExceptionNoStacktrace;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.quarkus.logging.Log;
@@ -39,80 +39,77 @@ import java.nio.file.Path;
 import java.util.*;
 import java.util.stream.StreamSupport;
 
+/**
+ * Actual filesystem implementation.
+ */
 @ApplicationScoped
-public class DhfsFileServiceImpl implements DhfsFileService {
+public class DhfsFileService {
+    @ConfigProperty(name = "dhfs.files.target_chunk_alignment")
+    int targetChunkAlignment;
+    @ConfigProperty(name = "dhfs.files.target_chunk_size")
+    int targetChunkSize;
+    @ConfigProperty(name = "dhfs.files.max_chunk_size", defaultValue = "524288")
+    int maxChunkSize;
+    @ConfigProperty(name = "dhfs.files.use_hash_for_chunks")
+    boolean useHashForChunks;
+    @ConfigProperty(name = "dhfs.files.allow_recursive_delete")
+    boolean allowRecursiveDelete;
+    @ConfigProperty(name = "dhfs.objects.ref_verification")
+    boolean refVerification;
+    @ConfigProperty(name = "dhfs.objects.write_log")
+    boolean writeLogging;
+
     @Inject
     Transaction curTx;
     @Inject
     RemoteTransaction remoteTx;
     @Inject
     TransactionManager jObjectTxManager;
-
-    @ConfigProperty(name = "dhfs.files.target_chunk_alignment")
-    int targetChunkAlignment;
-
-    @ConfigProperty(name = "dhfs.files.target_chunk_size")
-    int targetChunkSize;
-
-    @ConfigProperty(name = "dhfs.files.use_hash_for_chunks")
-    boolean useHashForChunks;
-
-    @ConfigProperty(name = "dhfs.files.allow_recursive_delete")
-    boolean allowRecursiveDelete;
-
-    @ConfigProperty(name = "dhfs.objects.ref_verification")
-    boolean refVerification;
-
-    @ConfigProperty(name = "dhfs.objects.write_log")
-    boolean writeLogging;
-
     @Inject
     JKleppmannTreeManager jKleppmannTreeManager;
-
     @Inject
     JMapHelper jMapHelper;
 
-    private JKleppmannTreeManager.JKleppmannTree getTreeW() {
-        return jKleppmannTreeManager.getTree(JObjectKey.of("fs"));
-    }
-
-    private JKleppmannTreeManager.JKleppmannTree getTreeR() {
-        return jKleppmannTreeManager.getTree(JObjectKey.of("fs"), LockingStrategy.OPTIMISTIC);
+    private JKleppmannTreeManager.JKleppmannTree getTree() {
+        return jKleppmannTreeManager.getTree(JObjectKey.of("fs"), () -> new JKleppmannTreeNodeMetaDirectory(""));
     }
 
+    /**
+     * Create a new chunk with the given data and a new unique ID.
+     *
+     * @param bytes the data to store in the chunk
+     * @return the created chunk
+     */
     private ChunkData createChunk(ByteString bytes) {
         var newChunk = new ChunkData(JObjectKey.of(UUID.randomUUID().toString()), bytes);
-        remoteTx.putData(newChunk);
+        remoteTx.putDataNew(newChunk);
         return newChunk;
     }
 
     void init(@Observes @Priority(500) StartupEvent event) {
         Log.info("Initializing file service");
-        getTreeW();
+        getTree();
     }
 
-    private JKleppmannTreeNode getDirEntryW(String name) {
-        var res = getTreeW().traverse(StreamSupport.stream(Path.of(name).spliterator(), false).map(p -> p.toString()).toList());
+    private JKleppmannTreeNode getDirEntry(String name) {
+        var res = getTree().traverse(StreamSupport.stream(Path.of(name).spliterator(), false).map(p -> p.toString()).toList());
         if (res == null) throw new StatusRuntimeExceptionNoStacktrace(Status.NOT_FOUND);
-        var ret = curTx.get(JKleppmannTreeNode.class, res).orElseThrow(() -> new StatusRuntimeException(Status.NOT_FOUND.withDescription("Tree node exists but not found as jObject: " + name)));
-        return ret;
-    }
-
-    private JKleppmannTreeNode getDirEntryR(String name) {
-        var res = getTreeR().traverse(StreamSupport.stream(Path.of(name).spliterator(), false).map(p -> p.toString()).toList());
-        if (res == null) throw new StatusRuntimeExceptionNoStacktrace(Status.NOT_FOUND);
-        var ret = curTx.get(JKleppmannTreeNode.class, res).orElseThrow(() -> new StatusRuntimeException(Status.NOT_FOUND.withDescription("Tree node exists but not found as jObject: " + name)));
+        var ret = curTx.get(JKleppmannTreeNodeHolder.class, res).map(JKleppmannTreeNodeHolder::node).orElseThrow(() -> new StatusRuntimeException(Status.NOT_FOUND.withDescription("Tree node exists but not found as jObject: " + name)));
         return ret;
     }
 
     private Optional<JKleppmannTreeNode> getDirEntryOpt(String name) {
-        var res = getTreeW().traverse(StreamSupport.stream(Path.of(name).spliterator(), false).map(p -> p.toString()).toList());
+        var res = getTree().traverse(StreamSupport.stream(Path.of(name).spliterator(), false).map(p -> p.toString()).toList());
         if (res == null) return Optional.empty();
-        var ret = curTx.get(JKleppmannTreeNode.class, res);
+        var ret = curTx.get(JKleppmannTreeNodeHolder.class, res).map(JKleppmannTreeNodeHolder::node);
         return ret;
     }
 
-    @Override
+    /**
+     * Get the attributes of a file or directory.
+     * @param uuid the UUID of the file or directory
+     * @return the attributes of the file or directory
+     */
     public Optional<GetattrRes> getattr(JObjectKey uuid) {
         return jObjectTxManager.executeTx(() -> {
             var ref = curTx.get(JData.class, uuid).orElse(null);
@@ -125,7 +122,7 @@ public class DhfsFileServiceImpl implements DhfsFileService {
                 } else {
                     throw new StatusRuntimeException(Status.DATA_LOSS.withDescription("FsNode is not an FsNode: " + ref.key()));
                 }
-            } else if (ref instanceof JKleppmannTreeNode) {
+            } else if (ref instanceof JKleppmannTreeNodeHolder) {
                 ret = new GetattrRes(100, 100, 0700, GetattrType.DIRECTORY);
             } else {
                 throw new StatusRuntimeException(Status.DATA_LOSS.withDescription("FsNode is not an FsNode: " + ref.key()));
@@ -134,13 +131,17 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         });
     }
 
-    @Override
+    /**
+     * Try to resolve a path to a file or directory.
+     * @param name the path to resolve
+     * @return the key of the file or directory, or an empty optional if it does not exist
+     */
     public Optional<JObjectKey> open(String name) {
         return jObjectTxManager.executeTx(() -> {
             try {
-                var ret = getDirEntryR(name);
+                var ret = getDirEntry(name);
                 return switch (ret.meta()) {
-                    case JKleppmannTreeNodeMetaFile f -> Optional.of(f.getFileIno());
+                    case JKleppmannTreeNodeMetaFile f -> Optional.of(f.fileIno());
                     case JKleppmannTreeNodeMetaDirectory f -> Optional.of(ret.key());
                     default -> Optional.empty();
                 };
@@ -158,11 +159,16 @@ public class DhfsFileServiceImpl implements DhfsFileService {
             throw new StatusRuntimeExceptionNoStacktrace(Status.INVALID_ARGUMENT.withDescription("Not a directory: " + entry.key()));
     }
 
-    @Override
+    /**
+     * Create a new file with the given name and mode.
+     * @param name the name of the file
+     * @param mode the mode of the file
+     * @return the key of the created file
+     */
     public Optional<JObjectKey> create(String name, long mode) {
         return jObjectTxManager.executeTx(() -> {
             Path path = Path.of(name);
-            var parent = getDirEntryW(path.getParent().toString());
+            var parent = getDirEntry(path.getParent().toString());
 
             ensureDir(parent);
 
@@ -174,7 +180,7 @@ public class DhfsFileServiceImpl implements DhfsFileService {
             remoteTx.putData(f);
 
             try {
-                getTreeW().move(parent.key(), new JKleppmannTreeNodeMetaFile(fname, f.key()), getTreeW().getNewNodeId());
+                getTree().move(parent.key(), new JKleppmannTreeNodeMetaFile(fname, f.key()), getTree().getNewNodeId());
             } catch (Exception e) {
 //                fobj.getMeta().removeRef(newNodeId);
                 throw e;
@@ -183,66 +189,91 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         });
     }
 
-    //FIXME: Slow..
-    @Override
+    /**
+     * Get the parent directory of a file or directory.
+     * @param ino the key of the file or directory
+     * @return the parent directory
+     */
     public Pair<String, JObjectKey> inoToParent(JObjectKey ino) {
         return jObjectTxManager.executeTx(() -> {
-            return getTreeW().findParent(w -> {
+            // FIXME: Slow
+            return getTree().findParent(w -> {
                 if (w.meta() instanceof JKleppmannTreeNodeMetaFile f)
-                    return f.getFileIno().equals(ino);
+                    return f.fileIno().equals(ino);
                 return false;
             });
         });
     }
 
-    @Override
+    /**
+     * Create a new directory with the given name and mode.
+     * @param name the name of the directory
+     * @param mode the mode of the directory
+     */
     public void mkdir(String name, long mode) {
         jObjectTxManager.executeTx(() -> {
             Path path = Path.of(name);
-            var parent = getDirEntryW(path.getParent().toString());
+            var parent = getDirEntry(path.getParent().toString());
             ensureDir(parent);
 
             String dname = path.getFileName().toString();
 
             Log.debug("Creating directory " + name);
 
-            getTreeW().move(parent.key(), new JKleppmannTreeNodeMetaDirectory(dname), getTreeW().getNewNodeId());
+            // TODO: No modes for directories yet
+            getTree().move(parent.key(), new JKleppmannTreeNodeMetaDirectory(dname), getTree().getNewNodeId());
         });
     }
 
-    @Override
+    /**
+     * Unlink a file or directory.
+     * @param name the name of the file or directory
+     * @throws DirectoryNotEmptyException if the directory is not empty and recursive delete is not allowed
+     */
     public void unlink(String name) {
         jObjectTxManager.executeTx(() -> {
             var node = getDirEntryOpt(name).orElse(null);
+            if (node == null)
+                throw new StatusRuntimeException(Status.NOT_FOUND.withDescription("File not found when trying to unlink: " + name));
             if (node.meta() instanceof JKleppmannTreeNodeMetaDirectory f) {
                 if (!allowRecursiveDelete && !node.children().isEmpty())
                     throw new DirectoryNotEmptyException();
             }
-            getTreeW().trash(node.meta(), node.key());
+            getTree().trash(node.meta(), node.key());
         });
     }
 
-    @Override
+    /**
+     * Rename a file or directory.
+     * @param from the old name
+     * @param to the new name
+     * @return true if the rename was successful, false otherwise
+     */
     public Boolean rename(String from, String to) {
         return jObjectTxManager.executeTx(() -> {
-            var node = getDirEntryW(from);
+            var node = getDirEntry(from);
             JKleppmannTreeNodeMeta meta = node.meta();
 
             var toPath = Path.of(to);
-            var toDentry = getDirEntryW(toPath.getParent().toString());
+            var toDentry = getDirEntry(toPath.getParent().toString());
             ensureDir(toDentry);
 
-            getTreeW().move(toDentry.key(), meta.withName(toPath.getFileName().toString()), node.key());
+            getTree().move(toDentry.key(), meta.withName(toPath.getFileName().toString()), node.key());
             return true;
         });
     }
 
-    @Override
+    /**
+     * Change the mode of a file or directory.
+     * @param uuid the ID of the file or directory
+     * @param mode the new mode
+     * @return true if the mode was changed successfully, false otherwise
+     */
     public Boolean chmod(JObjectKey uuid, long mode) {
         return jObjectTxManager.executeTx(() -> {
             var dent = curTx.get(JData.class, uuid).orElseThrow(() -> new StatusRuntimeExceptionNoStacktrace(Status.NOT_FOUND));
 
-            if (dent instanceof JKleppmannTreeNode) {
+            if (dent instanceof JKleppmannTreeNodeHolder) {
                 return true;
             } else if (dent instanceof RemoteObjectMeta) {
                 var remote = remoteTx.getData(JDataRemote.class, uuid).orElse(null);
@@ -258,10 +289,14 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         });
     }
 
-    @Override
+    /**
+     * Read the contents of a directory.
+     * @param name the path of the directory
+     * @return an iterable of the names of the files in the directory
+     */
     public Iterable<String> readDir(String name) {
         return jObjectTxManager.executeTx(() -> {
-            var found = getDirEntryW(name);
+            var found = getDirEntry(name);
 
             if (!(found.meta() instanceof JKleppmannTreeNodeMetaDirectory md))
                 throw new StatusRuntimeException(Status.INVALID_ARGUMENT);
@@ -270,8 +305,14 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         });
     }
 
-    @Override
-    public Optional<ByteString> read(JObjectKey fileUuid, long offset, int length) {
+    /**
+     * Read the contents of a file.
+     * @param fileUuid the ID of the file
+     * @param offset the offset to start reading from
+     * @param length the number of bytes to read
+     * @return the contents of the file as a ByteString
+     */
+    public ByteString read(JObjectKey fileUuid, long offset, int length) {
         return jObjectTxManager.executeTx(() -> {
             if (length < 0)
                 throw new StatusRuntimeException(Status.INVALID_ARGUMENT.withDescription("Length should be more than zero: " + length));
@@ -281,12 +322,12 @@ public class DhfsFileServiceImpl implements DhfsFileService {
             var file = remoteTx.getData(File.class, fileUuid).orElse(null);
             if (file == null) {
                 Log.error("File not found when trying to read: " + fileUuid);
-                return Optional.empty();
+                throw new StatusRuntimeException(Status.NOT_FOUND.withDescription("File not found when trying to read: " + fileUuid));
             }
 
             try (var it = jMapHelper.getIterator(file, IteratorStart.LE, JMapLongKey.of(offset))) {
                 if (!it.hasNext())
-                    return Optional.of(ByteString.empty());
+                    return ByteString.empty();
 
 //                if (it.peekNextKey().key() != offset) {
 //                    Log.warnv("Read over the end of file: {0} {1} {2}, next chunk: {3}", fileUuid, offset, length, it.peekNextKey());
@@ -324,14 +365,19 @@ public class DhfsFileServiceImpl implements DhfsFileService {
                     chunk = it.next();
                 }
 
-                return Optional.of(buf);
+                return buf;
             } catch (Exception e) {
                 Log.error("Error reading file: " + fileUuid, e);
-                return Optional.empty();
+                throw new StatusRuntimeException(Status.INTERNAL.withDescription("Error reading file: " + fileUuid));
             }
         });
     }
 
+    /**
+     * Get the size of a file.
+     * @param uuid the ID of the file
+     * @return the size of the file
+     */
     private ByteString readChunk(JObjectKey uuid) {
         var chunkRead = remoteTx.getData(ChunkData.class, uuid).orElse(null);
 
@@ -343,6 +389,11 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         return chunkRead.data();
     }
 
+    /**
+     * Get the size of a chunk.
+     * @param uuid the ID of the chunk
+     * @return the size of the chunk
+     */
     private int getChunkSize(JObjectKey uuid) {
         return readChunk(uuid).size();
     }
@@ -351,24 +402,24 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         return num & -(1L << n);
     }
 
-    @Override
+    /**
+     * Write data to a file.
+     * @param fileUuid the ID of the file
+     * @param offset the offset to write to
+     * @param data the data to write
+     * @return the number of bytes written
+     */
     public Long write(JObjectKey fileUuid, long offset, ByteString data) {
         return jObjectTxManager.executeTx(() -> {
             if (offset < 0)
                 throw new StatusRuntimeException(Status.INVALID_ARGUMENT.withDescription("Offset should be more than zero: " + offset));
 
-            var file = remoteTx.getData(File.class, fileUuid, LockingStrategy.WRITE).orElse(null);
+            var file = remoteTx.getData(File.class, fileUuid).orElse(null);
             if (file == null) {
-                Log.error("File not found when trying to write: " + fileUuid);
-                return -1L;
+                throw new StatusRuntimeException(Status.NOT_FOUND.withDescription("File not found when trying to write: " + fileUuid));
             }
 
-            if (writeLogging) {
-                Log.info("Writing to file: " + file.key() + " size=" + size(fileUuid) + " "
-                        + offset + " " + data.size());
-            }
-
-            NavigableMap<Long, JObjectKey> removedChunks = new TreeMap<>();
+            Map<Long, JObjectKey> removedChunks = new HashMap<>();
 
             long realOffset = targetChunkAlignment >= 0 ? alignDown(offset, targetChunkAlignment) : offset;
             long writeEnd = offset + data.size();
@@ -406,7 +457,7 @@ public class DhfsFileServiceImpl implements DhfsFileService {
             }
 
 
-            NavigableMap<Long, JObjectKey> newChunks = new TreeMap<>();
+            Map<Long, JObjectKey> newChunks = new HashMap<>();
 
             if (existingEnd < offset) {
                 if (!pendingPrefix.isEmpty()) {
@@ -423,12 +474,13 @@ public class DhfsFileServiceImpl implements DhfsFileService {
             int combinedSize = pendingWrites.size();
 
             {
-                int targetChunkSize = 1 << targetChunkAlignment;
                 int cur = 0;
                 while (cur < combinedSize) {
                     int end;
 
-                    if (targetChunkAlignment < 0)
+                    if (combinedSize - cur < maxChunkSize)
+                        end = combinedSize;
+                    else if (targetChunkAlignment < 0)
                         end = combinedSize;
                     else
                         end = Math.min(cur + targetChunkSize, combinedSize);
@@ -459,7 +511,12 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         });
     }
 
-    @Override
+    /**
+     * Truncate a file to the given length.
+     * @param fileUuid the ID of the file
+     * @param length the new length of the file
+     * @return true if the truncate was successful, false otherwise
+     */
     public Boolean truncate(JObjectKey fileUuid, long length) {
         return jObjectTxManager.executeTx(() -> {
             if (length < 0)
@@ -549,7 +606,13 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         });
     }
 
-    private void fillZeros(long fillStart, long length, NavigableMap<Long, JObjectKey> newChunks) {
+    /**
+     * Fill the given range with zeroes.
+     * @param fillStart the start of the range
+     * @param length the end of the range
+     * @param newChunks the map to store the new chunks in
+     */
+    private void fillZeros(long fillStart, long length, Map<Long, JObjectKey> newChunks) {
         long combinedSize = (length - fillStart);
 
         long start = fillStart;
@@ -584,26 +647,39 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         }
     }
 
-    @Override
+    /**
+     * Read the contents of a symlink.
+     * @param uuid the ID of the symlink
+     * @return the contents of the symlink as a string
+     */
     public String readlink(JObjectKey uuid) {
         return jObjectTxManager.executeTx(() -> {
             return readlinkBS(uuid).toStringUtf8();
         });
     }
 
-    @Override
+    /**
+     * Read the contents of a symlink as a ByteString.
+     * @param uuid the ID of the symlink
+     * @return the contents of the symlink as a ByteString
+     */
     public ByteString readlinkBS(JObjectKey uuid) {
         return jObjectTxManager.executeTx(() -> {
             var fileOpt = remoteTx.getData(File.class, uuid).orElseThrow(() -> new StatusRuntimeException(Status.NOT_FOUND.withDescription("File not found when trying to readlink: " + uuid)));
-            return read(uuid, 0, Math.toIntExact(size(uuid))).get();
+            return read(uuid, 0, Math.toIntExact(size(uuid)));
         });
     }
 
-    @Override
+    /**
+     * Create a symlink.
+     * @param oldpath the target of the symlink
+     * @param newpath the path of the symlink
+     * @return the key of the created symlink
+     */
     public JObjectKey symlink(String oldpath, String newpath) {
         return jObjectTxManager.executeTx(() -> {
             Path path = Path.of(newpath);
-            var parent = getDirEntryW(path.getParent().toString());
+            var parent = getDirEntry(path.getParent().toString());
 
             ensureDir(parent);
 
@@ -617,18 +693,24 @@ public class DhfsFileServiceImpl implements DhfsFileService {
             jMapHelper.put(f, JMapLongKey.of(0), newChunkData.key());
 
             remoteTx.putData(f);
-            getTreeW().move(parent.key(), new JKleppmannTreeNodeMetaFile(fname, f.key()), getTreeW().getNewNodeId());
+            getTree().move(parent.key(), new JKleppmannTreeNodeMetaFile(fname, f.key()), getTree().getNewNodeId());
             return f.key();
         });
     }
 
-    @Override
+    /**
+     * Set the access and modification times of a file.
+     * @param fileUuid the ID of the file
+     * @param atimeMs the access time in milliseconds
+     * @param mtimeMs the modification time in milliseconds
+     * @return true if the times were set successfully, false otherwise
+     */
     public Boolean setTimes(JObjectKey fileUuid, long atimeMs, long mtimeMs) {
         return jObjectTxManager.executeTx(() -> {
             var dent = curTx.get(JData.class, fileUuid).orElseThrow(() -> new StatusRuntimeExceptionNoStacktrace(Status.NOT_FOUND));
 
             // FIXME:
-            if (dent instanceof JKleppmannTreeNode) {
+            if (dent instanceof JKleppmannTreeNodeHolder) {
                 return true;
             } else if (dent instanceof RemoteObjectMeta) {
                 var remote = remoteTx.getData(JDataRemote.class, fileUuid).orElse(null);
@@ -644,7 +726,11 @@ public class DhfsFileServiceImpl implements DhfsFileService {
         });
     }
 
-    @Override
+    /**
+     * Get the size of a file.
+     * @param fileUuid the ID of the file
+     * @return the size of the file
+     */
     public long size(JObjectKey fileUuid) {
         return jObjectTxManager.executeTx(() -> {
             long realSize = 0;
@@ -663,4 +749,15 @@ public class DhfsFileServiceImpl implements DhfsFileService {
             return realSize;
         });
     }
+
+    /**
+     * Write data to a file.
+     * @param fileUuid the ID of the file
+     * @param offset the offset to write to
+     * @param data the data to write
+     * @return the number of bytes written
+     */
+    public Long write(JObjectKey fileUuid, long offset, byte[] data) {
+        return write(fileUuid, offset, UnsafeByteOperations.unsafeWrap(data));
+    }
 }

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DirectoryNotEmptyException.java

@@ -0,0 +1,13 @@
+package com.usatiuk.dhfsfs.service;
+
+/**
+ * DirectoryNotEmptyException is thrown when a directory is not empty.
+ * This exception is used to indicate that a directory cannot be deleted
+ * because it contains files or subdirectories.
+ */
+public class DirectoryNotEmptyException extends RuntimeException {
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+        return this;
+    }
+}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/GetattrRes.java

@@ -0,0 +1,11 @@
+package com.usatiuk.dhfsfs.service;
+
+/**
+ * GetattrRes is a record that represents the result of a getattr operation.
+ * @param mtime File modification time
+ * @param ctime File creation time
+ * @param mode File mode
+ * @param type File type
+ */
+ public record GetattrRes(long mtime, long ctime, long mode, GetattrType type) {
+}

dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/GetattrType.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files.service;
+package com.usatiuk.dhfsfs.service;
 
 public enum GetattrType {
     FILE,

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTest.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestImpl.java

@@ -1,9 +1,8 @@
-package com.usatiuk.dhfs.files;
+package com.usatiuk.dhfsfs;
 
-import com.usatiuk.dhfs.RemoteTransaction;
-import com.usatiuk.dhfs.TempDataProfile;
-import com.usatiuk.dhfs.files.objects.File;
-import com.usatiuk.dhfs.files.service.DhfsFileService;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
+import com.usatiuk.dhfsfs.objects.File;
+import com.usatiuk.dhfsfs.service.DhfsFileService;
 import com.usatiuk.kleppmanntree.AlreadyExistsException;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
@@ -90,7 +89,7 @@ public abstract class DhfsFileServiceSimpleTestImpl {
 //            for (int start = 0; start < all.length(); start++) {
 //                for (int end = start; end <= all.length(); end++) {
 //                    var read = fileService.read(fuuid.toString(), start, end - start);
-//                    Assertions.assertArrayEquals(all.substring(start, end).getBytes(), read.get().toByteArray());
+//                    Assertions.assertArrayEquals(all.substring(start, end).getBytes(), read.toByteArray());
 //                }
 //            }
 //        }
@@ -113,20 +112,20 @@ public abstract class DhfsFileServiceSimpleTestImpl {
 
         var curMtime = fileService.getattr(uuid).get().mtime();
         fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
-        Assertions.assertArrayEquals(new byte[]{2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 2, 8).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
+        Assertions.assertArrayEquals(new byte[]{2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 2, 8).toByteArray());
         fileService.write(uuid, 4, new byte[]{10, 11, 12});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 10, 11, 12, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 10, 11, 12, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
         fileService.write(uuid, 10, new byte[]{13, 14});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 10, 11, 12, 7, 8, 9, 13, 14}, fileService.read(uuid, 0, 12).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 10, 11, 12, 7, 8, 9, 13, 14}, fileService.read(uuid, 0, 12).toByteArray());
         fileService.write(uuid, 6, new byte[]{15, 16});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 10, 11, 15, 16, 8, 9, 13, 14}, fileService.read(uuid, 0, 12).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 10, 11, 15, 16, 8, 9, 13, 14}, fileService.read(uuid, 0, 12).toByteArray());
         fileService.write(uuid, 3, new byte[]{17, 18});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 17, 18, 11, 15, 16, 8, 9, 13, 14}, fileService.read(uuid, 0, 12).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 17, 18, 11, 15, 16, 8, 9, 13, 14}, fileService.read(uuid, 0, 12).toByteArray());
 
         var newMtime = fileService.getattr(uuid).get().mtime();
         Assertions.assertTrue(newMtime > curMtime);
-        
+
         fileService.unlink("/writeTest");
         Assertions.assertFalse(fileService.open("/writeTest").isPresent());
     }
@@ -139,7 +138,7 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         var uuid = ret.get();
 
         fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
 
         fileService.unlink("/removeTest");
         Assertions.assertFalse(fileService.open("/removeTest").isPresent());
@@ -153,12 +152,12 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         var uuid = ret.get();
 
         fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
 
         fileService.truncate(uuid, 20);
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, fileService.read(uuid, 0, 20).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, fileService.read(uuid, 0, 20).toByteArray());
         fileService.write(uuid, 5, new byte[]{10, 11, 12, 13, 14, 15, 16, 17});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 10, 11, 12, 13, 14, 15, 16, 17, 0, 0, 0, 0, 0, 0, 0}, fileService.read(uuid, 0, 20).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 10, 11, 12, 13, 14, 15, 16, 17, 0, 0, 0, 0, 0, 0, 0}, fileService.read(uuid, 0, 20).toByteArray());
     }
 
     @RepeatedTest(100)
@@ -170,12 +169,12 @@ public abstract class DhfsFileServiceSimpleTestImpl {
             var uuid = ret.get();
 
             fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-            Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
+            Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
 
             fileService.truncate(uuid, 20);
-            Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, fileService.read(uuid, 0, 20).get().toByteArray());
+            Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, fileService.read(uuid, 0, 20).toByteArray());
             fileService.write(uuid, 10, new byte[]{11, 12, 13, 14, 15, 16, 17, 18, 19, 20});
-            Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}, fileService.read(uuid, 0, 20).get().toByteArray());
+            Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}, fileService.read(uuid, 0, 20).toByteArray());
         } finally {
             fileService.unlink("/truncateTest2");
         }
@@ -189,10 +188,10 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         var uuid = ret.get();
 
         fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
 
         fileService.truncate(uuid, 7);
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6,}, fileService.read(uuid, 0, 20).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6,}, fileService.read(uuid, 0, 20).toByteArray());
     }
 
     @Test
@@ -202,14 +201,14 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         var uuid = ret.get();
 
         fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
 
         Assertions.assertTrue(fileService.rename("/moveTest", "/movedTest"));
         Assertions.assertFalse(fileService.open("/moveTest").isPresent());
         Assertions.assertTrue(fileService.open("/movedTest").isPresent());
 
         Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
-                fileService.read(fileService.open("/movedTest").get(), 0, 10).get().toByteArray());
+                fileService.read(fileService.open("/movedTest").get(), 0, 10).toByteArray());
     }
 
     @Test
@@ -222,9 +221,9 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         var uuid2 = ret2.get();
 
         fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
         fileService.write(uuid2, 0, new byte[]{11, 12, 13, 14, 15, 16, 17, 18, 19, 29});
-        Assertions.assertArrayEquals(new byte[]{11, 12, 13, 14, 15, 16, 17, 18, 19, 29}, fileService.read(uuid2, 0, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{11, 12, 13, 14, 15, 16, 17, 18, 19, 29}, fileService.read(uuid2, 0, 10).toByteArray());
 
 
         jObjectTxManager.run(() -> {
@@ -238,7 +237,7 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         Assertions.assertTrue(fileService.open("/moveOverTest2").isPresent());
 
         Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
-                fileService.read(fileService.open("/moveOverTest2").get(), 0, 10).get().toByteArray());
+                fileService.read(fileService.open("/moveOverTest2").get(), 0, 10).toByteArray());
 
 //        await().atMost(5, TimeUnit.SECONDS).until(() -> {
 //                jObjectTxManager.run(() -> {
@@ -256,8 +255,8 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         var uuid = ret.get();
 
         fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
-        Assertions.assertArrayEquals(new byte[]{}, fileService.read(uuid, 20, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
+        Assertions.assertArrayEquals(new byte[]{}, fileService.read(uuid, 20, 10).toByteArray());
     }
 
     @Test
@@ -267,13 +266,13 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         var uuid = ret.get();
 
         fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
         fileService.write(uuid, 20, new byte[]{10, 11, 12, 13, 14, 15, 16, 17, 18, 19});
         Assertions.assertArrayEquals(new byte[]{
                 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-        }, fileService.read(uuid, 0, 30).get().toByteArray());
+        }, fileService.read(uuid, 0, 30).toByteArray());
     }
 
     @Test
@@ -283,7 +282,7 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         var uuid = ret.get();
 
         fileService.write(uuid, 0, new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).get().toByteArray());
+        Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, fileService.read(uuid, 0, 10).toByteArray());
 
 //        var oldfile = jObjectManager.get(uuid).orElseThrow(IllegalStateException::new);
 //        var chunk = oldfile.runReadLocked(JObjectManager.ResolutionStrategy.LOCAL_ONLY, (m, d) -> d.extractRefs()).stream().toList().get(0);
@@ -298,6 +297,6 @@ public abstract class DhfsFileServiceSimpleTestImpl {
         Assertions.assertTrue(fileService.open("/movedTest2").isPresent());
 
         Assertions.assertArrayEquals(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
-                fileService.read(fileService.open("/movedTest2").get(), 0, 10).get().toByteArray());
+                fileService.read(fileService.open("/movedTest2").get(), 0, 10).toByteArray());
     }
 }

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestNoChunkingTest.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestSmallChunkingTest.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TempDataProfile.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TestDataCleaner.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;
@@ -30,7 +30,7 @@ public class TestDataCleaner {
         purgeDirectory(Path.of(tempDirectory).toFile());
     }
 
-    void purgeDirectory(File dir) {
+    public void purgeDirectory(File dir) {
         for (File file : Objects.requireNonNull(dir.listFiles())) {
             if (file.isDirectory())
                 purgeDirectory(file);

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/Benchmarker.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.benchmarks;
+package com.usatiuk.dhfsfs.benchmarks;
 
 import io.quarkus.logging.Log;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/DhfsFileBenchmarkTest.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.benchmarks;
+package com.usatiuk.dhfsfs.benchmarks;
 
 import com.google.protobuf.UnsafeByteOperations;
-import com.usatiuk.dhfs.TempDataProfile;
-import com.usatiuk.dhfs.files.service.DhfsFileService;
+import com.usatiuk.dhfsfs.TempDataProfile;
+import com.usatiuk.dhfsfs.service.DhfsFileService;
 import com.usatiuk.objects.JObjectKey;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;

dhfs-parent/dhfs-fuse/pom.xml

@@ -107,26 +107,11 @@
             <artifactId>commons-math3</artifactId>
             <version>3.6.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.usatiuk</groupId>
-            <artifactId>kleppmanntree</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk.dhfs</groupId>
-            <artifactId>objects</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.usatiuk.dhfs</groupId>
             <artifactId>dhfs-fs</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.usatiuk.dhfs</groupId>
-            <artifactId>sync-base</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.usatiuk.dhfs</groupId>
             <artifactId>utils</artifactId>
@@ -154,16 +139,13 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
+                    <forkCount>0.5C</forkCount>
+                    <reuseForks>false</reuseForks>
+                    <parallel>classes</parallel>
                     <systemPropertyVariables>
                         <junit.jupiter.execution.parallel.enabled>
-                            true
+                            false
                         </junit.jupiter.execution.parallel.enabled>
-                        <junit.jupiter.execution.parallel.mode.default>
-                            concurrent
-                        </junit.jupiter.execution.parallel.mode.default>
-                        <junit.jupiter.execution.parallel.config.dynamic.factor>
-                            0.5
-                        </junit.jupiter.execution.parallel.config.dynamic.factor>
                         <junit.platform.output.capture.stdout>true</junit.platform.output.capture.stdout>
                         <junit.platform.output.capture.stderr>true</junit.platform.output.capture.stderr>
                     </systemPropertyVariables>

dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutputAccessors.java

@@ -1,29 +0,0 @@
-package com.usatiuk.dhfs.fuse;
-
-import jakarta.inject.Singleton;
-import jdk.internal.access.JavaNioAccess;
-import jdk.internal.access.SharedSecrets;
-import sun.misc.Unsafe;
-
-import java.lang.reflect.Field;
-
-@Singleton
-class JnrPtrByteOutputAccessors {
-    JavaNioAccess _nioAccess;
-    Unsafe _unsafe;
-
-    JnrPtrByteOutputAccessors() throws NoSuchFieldException, IllegalAccessException {
-        _nioAccess = SharedSecrets.getJavaNioAccess();
-        Field f = Unsafe.class.getDeclaredField("theUnsafe");
-        f.setAccessible(true);
-        _unsafe = (Unsafe) f.get(null);
-    }
-
-    public JavaNioAccess getNioAccess() {
-        return _nioAccess;
-    }
-
-    public Unsafe getUnsafe() {
-        return _unsafe;
-    }
-}

dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/DhfsFuse.java

@@ -1,12 +1,15 @@
-package com.usatiuk.dhfs.fuse;
+package com.usatiuk.dhfsfuse;
 
 import com.google.protobuf.UnsafeByteOperations;
+import com.kenai.jffi.MemoryIO;
 import com.sun.security.auth.module.UnixSystem;
-import com.usatiuk.dhfs.files.service.DhfsFileService;
-import com.usatiuk.dhfs.files.service.DirectoryNotEmptyException;
-import com.usatiuk.dhfs.files.service.GetattrRes;
+import com.usatiuk.dhfsfs.service.DhfsFileService;
+import com.usatiuk.dhfsfs.service.DirectoryNotEmptyException;
+import com.usatiuk.dhfsfs.service.GetattrRes;
 import com.usatiuk.kleppmanntree.AlreadyExistsException;
 import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.utils.UninitializedByteBuffer;
+import com.usatiuk.utils.UnsafeAccessor;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.quarkus.logging.Log;
@@ -17,15 +20,15 @@ import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
 import jnr.ffi.Pointer;
+import jnr.ffi.Runtime;
+import jnr.ffi.Struct;
+import jnr.ffi.types.off_t;
 import org.apache.commons.lang3.SystemUtils;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import ru.serce.jnrfuse.ErrorCodes;
 import ru.serce.jnrfuse.FuseFillDir;
 import ru.serce.jnrfuse.FuseStubFS;
-import ru.serce.jnrfuse.struct.FileStat;
-import ru.serce.jnrfuse.struct.FuseFileInfo;
-import ru.serce.jnrfuse.struct.Statvfs;
-import ru.serce.jnrfuse.struct.Timespec;
+import ru.serce.jnrfuse.struct.*;
 
 import java.nio.ByteBuffer;
 import java.nio.file.Paths;
@@ -40,6 +43,8 @@ import static jnr.posix.FileStat.*;
 public class DhfsFuse extends FuseStubFS {
     private static final int blksize = 1048576;
     private static final int iosize = 1048576;
+    private final ConcurrentHashMap<Long, JObjectKey> _openHandles = new ConcurrentHashMap<>();
+    private final AtomicLong _fh = new AtomicLong(1);
     @ConfigProperty(name = "dhfs.fuse.root")
     String root;
     @ConfigProperty(name = "dhfs.fuse.enabled")
@@ -49,13 +54,8 @@ public class DhfsFuse extends FuseStubFS {
     @ConfigProperty(name = "dhfs.files.target_chunk_size")
     int targetChunkSize;
     @Inject
-    JnrPtrByteOutputAccessors jnrPtrByteOutputAccessors;
-    @Inject
     DhfsFileService fileService;
 
-    private final ConcurrentHashMap<Long, JObjectKey> _openHandles = new ConcurrentHashMap<>();
-    private final AtomicLong _fh = new AtomicLong(1);
-
     private long allocateHandle(JObjectKey key) {
         while (true) {
             var newFh = _fh.getAndIncrement();
@@ -73,40 +73,48 @@ public class DhfsFuse extends FuseStubFS {
 
     void init(@Observes @Priority(100000) StartupEvent event) {
         if (!enabled) return;
-        Paths.get(root).toFile().mkdirs();
-
-        if (!Paths.get(root).toFile().isDirectory())
-            throw new IllegalStateException("Could not create directory " + root);
 
         Log.info("Mounting with root " + root);
-
-        var uid = new UnixSystem().getUid();
-        var gid = new UnixSystem().getGid();
-
         var opts = new ArrayList<String>();
 
-        // Assuming macFuse
-        if (SystemUtils.IS_OS_MAC) {
+        if (SystemUtils.IS_OS_WINDOWS) {
             opts.add("-o");
-            opts.add("iosize=" + iosize);
-        } else if (SystemUtils.IS_OS_LINUX) {
-            // FIXME: There's something else missing: the writes still seem to be 32k max
+            opts.add("auto_cache");
+            opts.add("-o");
+            opts.add("uid=-1");
+            opts.add("-o");
+            opts.add("gid=-1");
+        } else {
+            Paths.get(root).toFile().mkdirs();
+
+            if (!Paths.get(root).toFile().isDirectory())
+                throw new IllegalStateException("Could not create directory " + root);
+
+            var uid = new UnixSystem().getUid();
+            var gid = new UnixSystem().getGid();
+
+            // Assuming macFuse
+            if (SystemUtils.IS_OS_MAC) {
+                opts.add("-o");
+                opts.add("iosize=" + iosize);
+            } else if (SystemUtils.IS_OS_LINUX) {
+                // FIXME: There's something else missing: the writes still seem to be 32k max
 //            opts.add("-o");
 //            opts.add("large_read");
+                opts.add("-o");
+                opts.add("big_writes");
+                opts.add("-o");
+                opts.add("max_read=" + iosize);
+                opts.add("-o");
+                opts.add("max_write=" + iosize);
+            }
             opts.add("-o");
-            opts.add("big_writes");
+            opts.add("auto_cache");
             opts.add("-o");
-            opts.add("max_read=" + iosize);
+            opts.add("uid=" + uid);
             opts.add("-o");
-            opts.add("max_write=" + iosize);
+            opts.add("gid=" + gid);
         }
-        opts.add("-o");
-        opts.add("auto_cache");
-        opts.add("-o");
-        opts.add("uid=" + uid);
-        opts.add("-o");
-        opts.add("gid=" + gid);
-
         mount(Paths.get(root), false, debug, opts.toArray(String[]::new));
     }
 
@@ -224,8 +232,8 @@ public class DhfsFuse extends FuseStubFS {
             var fileKey = getFromHandle(fi.fh.get());
             var read = fileService.read(fileKey, offset, (int) size);
             if (read.isEmpty()) return 0;
-            UnsafeByteOperations.unsafeWriteTo(read.get(), new JnrPtrByteOutput(jnrPtrByteOutputAccessors, buf, size));
-            return read.get().size();
+            UnsafeByteOperations.unsafeWriteTo(read, new JnrPtrByteOutput(buf, size));
+            return read.size();
         } catch (Throwable e) {
             Log.error("When reading " + path, e);
             return -ErrorCodes.EIO();
@@ -234,24 +242,22 @@ public class DhfsFuse extends FuseStubFS {
 
     @Override
     public int write(String path, Pointer buf, long size, long offset, FuseFileInfo fi) {
+        var buffer = UninitializedByteBuffer.allocate((int) size);
+        UnsafeAccessor.UNSAFE.copyMemory(
+                buf.address(),
+                UnsafeAccessor.NIO.getBufferAddress(buffer),
+                size
+        );
+        return write(path, buffer, offset, fi);
+    }
+
+    public int write(String path, ByteBuffer buffer, long offset, FuseFileInfo fi) {
         if (offset < 0) return -ErrorCodes.EINVAL();
         try {
             var fileKey = getFromHandle(fi.fh.get());
-            var buffer = ByteBuffer.allocateDirect((int) size);
-
-            if (buffer.isDirect()) {
-                jnrPtrByteOutputAccessors.getUnsafe().copyMemory(
-                        buf.address(),
-                        jnrPtrByteOutputAccessors.getNioAccess().getBufferAddress(buffer),
-                        size
-                );
-            } else {
-                buf.get(0, buffer.array(), 0, (int) size);
-            }
-
             var written = fileService.write(fileKey, offset, UnsafeByteOperations.unsafeWrap(buffer));
             return written.intValue();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             Log.error("When writing " + path, e);
             return -ErrorCodes.EIO();
         }
@@ -387,7 +393,7 @@ public class DhfsFuse extends FuseStubFS {
             var file = fileOpt.get();
             var read = fileService.readlinkBS(fileOpt.get());
             if (read.isEmpty()) return 0;
-            UnsafeByteOperations.unsafeWriteTo(read, new JnrPtrByteOutput(jnrPtrByteOutputAccessors, buf, size));
+            UnsafeByteOperations.unsafeWriteTo(read, new JnrPtrByteOutput(buf, size));
             buf.putByte(Math.min(size - 1, read.size()), (byte) 0);
             return 0;
         } catch (Throwable e) {
@@ -419,4 +425,29 @@ public class DhfsFuse extends FuseStubFS {
             return -ErrorCodes.EIO();
         }
     }
+
+    @Override
+    public int write_buf(String path, FuseBufvec buf, @off_t long off, FuseFileInfo fi) {
+        int size = (int) libFuse.fuse_buf_size(buf);
+        FuseBufvec tmpVec = new FuseBufvec(Runtime.getSystemRuntime());
+        long tmpVecAddr = MemoryIO.getInstance().allocateMemory(Struct.size(tmpVec), false);
+        try {
+            tmpVec.useMemory(Pointer.wrap(Runtime.getSystemRuntime(), tmpVecAddr));
+            FuseBufvec.init(tmpVec, size);
+            var bb = UninitializedByteBuffer.allocate(size);
+            var mem = UninitializedByteBuffer.getAddress(bb);
+            tmpVec.buf.mem.set(mem);
+            tmpVec.buf.size.set(size);
+            int res = (int) libFuse.fuse_buf_copy(tmpVec, buf, 0);
+            if (res != size) {
+                Log.errorv("fuse_buf_copy failed: {0} != {1}", res, size);
+                return -ErrorCodes.ENOMEM();
+            }
+            return write(path, bb, off, fi);
+        } finally {
+            if (tmpVecAddr != 0) {
+                MemoryIO.getInstance().freeMemory(tmpVecAddr);
+            }
+        }
+    }
 }

dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/JnrPtrByteOutput.java

@@ -1,6 +1,7 @@
-package com.usatiuk.dhfs.fuse;
+package com.usatiuk.dhfsfuse;
 
 import com.google.protobuf.ByteOutput;
+import com.usatiuk.utils.UnsafeAccessor;
 import jnr.ffi.Pointer;
 
 import java.nio.ByteBuffer;
@@ -9,14 +10,12 @@ import java.nio.MappedByteBuffer;
 public class JnrPtrByteOutput extends ByteOutput {
     private final Pointer _backing;
     private final long _size;
-    private final JnrPtrByteOutputAccessors _accessors;
     private long _pos;
 
-    public JnrPtrByteOutput(JnrPtrByteOutputAccessors accessors, Pointer backing, long size) {
+    public JnrPtrByteOutput(Pointer backing, long size) {
         _backing = backing;
         _size = size;
         _pos = 0;
-        _accessors = accessors;
     }
 
     @Override
@@ -47,9 +46,9 @@ public class JnrPtrByteOutput extends ByteOutput {
             if (value instanceof MappedByteBuffer mb) {
                 mb.load();
             }
-            long addr = _accessors.getNioAccess().getBufferAddress(value) + value.position();
+            long addr = UnsafeAccessor.NIO.getBufferAddress(value) + value.position();
             var out = _backing.address() + _pos;
-            _accessors.getUnsafe().copyMemory(addr, out, rem);
+            UnsafeAccessor.UNSAFE.copyMemory(addr, out, rem);
         } else {
             _backing.put(_pos, value.array(), value.arrayOffset() + value.position(), rem);
         }

dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/Main.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.app;
+package com.usatiuk.dhfsfuse;
 
 import io.quarkus.runtime.Quarkus;
 import io.quarkus.runtime.QuarkusApplication;

dhfs-parent/dhfs-fuse/src/main/resources/application.properties

@@ -14,8 +14,9 @@ dhfs.objects.persistence.stuff.root=${HOME}/dhfs_default/data/stuff
 dhfs.fuse.debug=false
 dhfs.fuse.enabled=true
 dhfs.files.allow_recursive_delete=false
-dhfs.files.target_chunk_size=2097152
-dhfs.files.target_chunk_alignment=19
+dhfs.files.target_chunk_size=524288
+dhfs.files.max_chunk_size=524288
+dhfs.files.target_chunk_alignment=17
 dhfs.objects.deletion.delay=1000
 dhfs.objects.deletion.can-delete-retry-delay=10000
 dhfs.objects.ref_verification=true

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TempDataProfile.java

@@ -1,29 +0,0 @@
-package com.usatiuk.dhfs;
-
-import io.quarkus.test.junit.QuarkusTestProfile;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
-
-abstract public class TempDataProfile implements QuarkusTestProfile {
-    protected void getConfigOverrides(Map<String, String> toPut) {
-    }
-
-    @Override
-    final public Map<String, String> getConfigOverrides() {
-        Path tempDirWithPrefix;
-        try {
-            tempDirWithPrefix = Files.createTempDirectory("dhfs-test");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        var ret = new HashMap<String, String>();
-        ret.put("dhfs.objects.persistence.files.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
-        ret.put("dhfs.fuse.root", tempDirWithPrefix.resolve("dhfs_fuse_root_test").toString());
-        getConfigOverrides(ret);
-        return ret;
-    }
-}

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/DhfsFuseTest.java

@@ -1,6 +1,5 @@
-package com.usatiuk.dhfs.fuse;
+package com.usatiuk.dhfsfuse;
 
-import com.usatiuk.dhfs.TempDataProfile;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
 import org.eclipse.microprofile.config.inject.ConfigProperty;

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TempDataProfile.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsfuse;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TestDataCleaner.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsfuse;
 
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;
@@ -30,7 +30,7 @@ public class TestDataCleaner {
         purgeDirectory(Path.of(tempDirectory).toFile());
     }
 
-    void purgeDirectory(File dir) {
+    public static void purgeDirectory(File dir) {
         for (File file : Objects.requireNonNull(dir.listFiles())) {
             if (file.isDirectory())
                 purgeDirectory(file);

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/DhfsFuseIT.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsfuse.integration;
 
 import com.github.dockerjava.api.model.Device;
 import io.quarkus.logging.Log;
@@ -67,19 +67,35 @@ public class DhfsFuseIT {
         var c1curl = container1.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c2uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c2uuid);
 
         var c2curl = container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c1uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c1uuid);
 
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
     }
 
+    private void checkConsistency() {
+        await().atMost(45, TimeUnit.SECONDS).until(() -> {
+            Log.info("Listing consistency");
+            var cat1 = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/fuse/*/*");
+            var cat2 = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/fuse/*/*");
+            var ls1 = container1.execInContainer("/bin/sh", "-c", "ls /dhfs_test/fuse/*/*");
+            var ls2 = container2.execInContainer("/bin/sh", "-c", "ls /dhfs_test/fuse/*/*");
+            Log.info(ls1);
+            Log.info(cat1);
+            Log.info(ls2);
+            Log.info(cat2);
+
+            return ls1.equals(ls2) && cat1.equals(cat2);
+        });
+    }
+
     @AfterEach
     void stop() {
         Stream.of(container1, container2).parallel().forEach(GenericContainer::stop);
@@ -152,35 +168,6 @@ public class DhfsFuseIT {
                 "rewritten\n".equals(container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/fuse/testf1").getStdout()));
     }
 
-    // TODO: How this fits with the tree?
-    @Test
-    @Disabled
-    void deleteDelayedTest() throws IOException, InterruptedException, TimeoutException {
-        await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "echo tesempty > /dhfs_test/fuse/testf1").getExitCode());
-        await().atMost(45, TimeUnit.SECONDS).until(() -> "tesempty\n".equals(container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/fuse/testf1").getStdout()));
-        await().atMost(45, TimeUnit.SECONDS).until(() -> "tesempty\n".equals(container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/fuse/testf1").getStdout()));
-
-        var client = DockerClientFactory.instance().client();
-        client.pauseContainerCmd(container2.getContainerId()).exec();
-
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Lost connection to"), 60, TimeUnit.SECONDS);
-
-        await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "rm /dhfs_test/fuse/testf1").getExitCode());
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Delaying deletion check"), 60, TimeUnit.SECONDS, 1);
-
-        client.unpauseContainerCmd(container2.getContainerId()).exec();
-
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
-
-        await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container2.execInContainer("/bin/sh", "-c", "ls /dhfs_test/fuse").getExitCode());
-
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Deleting from persistent"), 60, TimeUnit.SECONDS, 1);
-        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Deleting from persistent"), 60, TimeUnit.SECONDS, 3);
-
-        await().atMost(45, TimeUnit.SECONDS).until(() -> 1 == container2.execInContainer("/bin/sh", "-c", "test -f /dhfs_test/fuse/testf1").getExitCode());
-        await().atMost(45, TimeUnit.SECONDS).until(() -> 1 == container1.execInContainer("/bin/sh", "-c", "test -f /dhfs_test/fuse/testf1").getExitCode());
-    }
-
     @Test
     void deleteTest() throws IOException, InterruptedException, TimeoutException {
         await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "echo tesempty > /dhfs_test/fuse/testf1").getExitCode());
@@ -205,6 +192,28 @@ public class DhfsFuseIT {
                 1 == container1.execInContainer("/bin/sh", "-c", "test -f /dhfs_test/fuse/testf1").getExitCode());
     }
 
+    @Test
+    void deleteTestKickedOut() throws IOException, InterruptedException, TimeoutException {
+        await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "echo tesempty > /dhfs_test/fuse/testf1").getExitCode());
+        await().atMost(45, TimeUnit.SECONDS).until(() ->
+                "tesempty\n".equals(container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/fuse/testf1").getStdout()));
+        await().atMost(45, TimeUnit.SECONDS).until(() ->
+                "tesempty\n".equals(container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/fuse/testf1").getStdout()));
+
+        container2.stop();
+        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("kicked"), 60, TimeUnit.SECONDS, 1);
+
+        Log.info("Deleting");
+        await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "rm /dhfs_test/fuse/testf1").getExitCode());
+        Log.info("Deleted");
+
+        // FIXME?
+        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Deleting from persistent"), 60, TimeUnit.SECONDS, 3);
+
+        await().atMost(45, TimeUnit.SECONDS).until(() ->
+                1 == container1.execInContainer("/bin/sh", "-c", "test -f /dhfs_test/fuse/testf1").getExitCode());
+    }
+
     @Test
     void moveFileTest() throws IOException, InterruptedException, TimeoutException {
         Log.info("Creating");
@@ -248,8 +257,8 @@ public class DhfsFuseIT {
         var c2curl = container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request DELETE " +
-                        "  --data '{\"uuid\":\"" + c1uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c1uuid);
 
         await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container2.execInContainer("/bin/sh", "-c", "echo rewritten > /dhfs_test/fuse/testf1").getExitCode());
         await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container2.execInContainer("/bin/sh", "-c", "echo jioadsd > /dhfs_test/fuse/newfile1").getExitCode());
@@ -264,8 +273,8 @@ public class DhfsFuseIT {
         container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c1uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c1uuid);
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
 
@@ -309,6 +318,33 @@ public class DhfsFuseIT {
         });
     }
 
+    @Test
+    void dirConflictTest2() throws IOException, InterruptedException, TimeoutException {
+        var client = DockerClientFactory.instance().client();
+        client.disconnectFromNetworkCmd().withContainerId(container1.getContainerId()).withNetworkId(network.getId()).exec();
+        client.disconnectFromNetworkCmd().withContainerId(container2.getContainerId()).withNetworkId(network.getId()).exec();
+
+        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Lost connection to"), 60, TimeUnit.SECONDS, 1);
+        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Lost connection to"), 60, TimeUnit.SECONDS, 1);
+
+        await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container2.execInContainer("/bin/sh", "-c", "mkdir /dhfs_test/fuse/a && echo fdsaio >> /dhfs_test/fuse/a/testf").getExitCode());
+        await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "mkdir /dhfs_test/fuse/a && echo exgrg >> /dhfs_test/fuse/a/testf").getExitCode());
+
+        client.connectToNetworkCmd().withContainerId(container1.getContainerId()).withNetworkId(network.getId()).exec();
+        client.connectToNetworkCmd().withContainerId(container2.getContainerId()).withNetworkId(network.getId()).exec();
+
+        Log.warn("Waiting for connections");
+        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS, 1);
+        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS, 1);
+        Log.warn("Connected");
+
+        checkConsistency();
+
+        var ls1 = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/fuse/a*/*");
+        Assertions.assertTrue(ls1.getStdout().contains("fdsaio"));
+        Assertions.assertTrue(ls1.getStdout().contains("exgrg"));
+    }
+
     @Test
     void dirCycleTest() throws IOException, InterruptedException, TimeoutException {
         await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "ls /dhfs_test/fuse").getExitCode());

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/DhfsFusex3IT.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsfuse.integration;
 
 import com.github.dockerjava.api.model.Device;
 import io.quarkus.logging.Log;
@@ -93,26 +93,26 @@ public class DhfsFusex3IT {
         var c1curl = container1.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c2uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c2uuid);
 
         var c2curl1 = container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c1uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c1uuid);
 
         var c2curl3 = container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c3uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c3uuid);
 
         var c3curl = container3.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c2uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c2uuid);
 
         waitingConsumer3.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS, 2);
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS, 2);
@@ -193,8 +193,8 @@ public class DhfsFusex3IT {
         var c3curl = container3.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request DELETE " +
-                        "  --data '{\"uuid\":\"" + c2uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c2uuid);
 
         Thread.sleep(10000);
 

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/DhfsImage.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsfuse.integration;
 
 import io.quarkus.logging.Log;
 import org.jetbrains.annotations.NotNull;
@@ -70,6 +70,7 @@ public class DhfsImage implements Future<String> {
                                         "--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED",
                                         "--add-exports", "java.base/jdk.internal.access=ALL-UNNAMED",
                                         "--add-opens=java.base/java.nio=ALL-UNNAMED",
+                                        "--enable-preview",
                                         "-Ddhfs.objects.peerdiscovery.interval=1s",
                                         "-Ddhfs.objects.invalidation.delay=100",
                                         "-Ddhfs.objects.deletion.delay=0",
@@ -78,6 +79,9 @@ public class DhfsImage implements Future<String> {
                                         "-Ddhfs.objects.sync.timeout=30",
                                         "-Ddhfs.objects.sync.ping.timeout=5",
                                         "-Ddhfs.objects.reconnect_interval=1s",
+                                        "-Ddhfs.objects.last-seen.timeout=30",
+                                        "-Ddhfs.objects.last-seen.update=10",
+                                        "-Ddhfs.sync.cert-check=false",
                                         "-Dquarkus.log.category.\"com.usatiuk\".level=TRACE",
                                         "-Dquarkus.log.category.\"com.usatiuk.dhfs\".level=TRACE",
                                         "-Dquarkus.log.category.\"com.usatiuk.objects.transaction\".level=INFO",

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/KillIT.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsfuse.integration;
 
 import com.github.dockerjava.api.model.Device;
-import com.usatiuk.dhfs.TestDataCleaner;
+import com.usatiuk.dhfsfuse.TestDataCleaner;
 import io.quarkus.logging.Log;
 import org.junit.jupiter.api.*;
 import org.slf4j.LoggerFactory;
@@ -81,14 +81,14 @@ public class KillIT {
         var c1curl = container1.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c2uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c2uuid);
 
         var c2curl = container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c1uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c1uuid);
 
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
@@ -115,7 +115,7 @@ public class KillIT {
             Log.info(ls2);
             Log.info(cat2);
 
-            return ls1.equals(ls2) && cat1.equals(cat2);
+            return ls1.equals(ls2) && cat1.equals(cat2) && ls1.getExitCode() == 0 && ls2.getExitCode() == 0 && cat1.getExitCode() == 0 && cat2.getExitCode() == 0;
         });
     }
 

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/LazyFs.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsfuse.integration;
 
 import io.quarkus.logging.Log;
 
@@ -6,25 +6,26 @@ import java.io.*;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 
 public class LazyFs {
     private static final String lazyFsPath;
 
-    private final String mountRoot;
-    private final String dataRoot;
-    private final String name;
-
-    private final File configFile;
-    private final File fifoFile;
-
     static {
         lazyFsPath = System.getProperty("lazyFsPath");
         System.out.println("LazyFs Path: " + lazyFsPath);
     }
 
+    private final String mountRoot;
+    private final String dataRoot;
+    private final String name;
+    private final File configFile;
+    private final File fifoFile;
+    private Thread errPiper;
+    private Thread outPiper;
+    private CountDownLatch startLatch;
+    private Process fs;
     public LazyFs(String name, String mountRoot, String dataRoot) {
         this.name = name;
         this.mountRoot = mountRoot;
@@ -43,11 +44,6 @@ public class LazyFs {
         Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
     }
 
-    private Thread errPiper;
-    private Thread outPiper;
-    private CountDownLatch startLatch;
-    private Process fs;
-
     private String fifoPath() {
         return fifoFile.getAbsolutePath();
     }

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/LazyFsIT.java

@@ -1,14 +1,11 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsfuse.integration;
 
 import com.github.dockerjava.api.model.Device;
-import com.usatiuk.dhfs.TestDataCleaner;
+import com.usatiuk.dhfsfuse.TestDataCleaner;
 import io.quarkus.logging.Log;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -96,14 +93,14 @@ public class LazyFsIT {
         var c1curl = container1.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c2uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c2uuid);
 
         var c2curl = container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c1uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c1uuid);
 
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
@@ -136,16 +133,10 @@ public class LazyFsIT {
                     + ls2 + "\n"
                     + cat2 + "\n");
 
-            return ls1.equals(ls2) && cat1.equals(cat2);
+            return ls1.equals(ls2) && cat1.equals(cat2) && ls1.getExitCode() == 0 && ls2.getExitCode() == 0 && cat1.getExitCode() == 0 && cat2.getExitCode() == 0;
         });
     }
 
-    private static enum CrashType {
-        CRASH,
-        TORN_OP,
-        TORN_SEQ
-    }
-
     @ParameterizedTest
     @EnumSource(CrashType.class)
     void killTest(CrashType crashType, TestInfo testInfo) throws Exception {
@@ -163,7 +154,7 @@ public class LazyFsIT {
         Thread.sleep(3000);
         Log.info("Killing");
         lazyFs1.crash();
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Caused by: org.lmdbjava"), 60, TimeUnit.SECONDS);
+        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("org.lmdbjava.LmdbNativeException"), 60, TimeUnit.SECONDS);
         var client = DockerClientFactory.instance().client();
         client.killContainerCmd(container1.getContainerId()).exec();
         container1.stop();
@@ -185,9 +176,7 @@ public class LazyFsIT {
             waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         } catch (TimeoutException e) {
             Log.info("Failed to connect: " + testInfo.getDisplayName());
-            if (crashType.equals(CrashType.CRASH))
-                throw e;
-            // LazyFs can crash too early
+            // Sometimes it doesn't get mounted properly for some reason
             Assumptions.assumeTrue(false);
         }
 
@@ -205,7 +194,15 @@ public class LazyFsIT {
             Thread.sleep(3000);
             lazyFs1.crash();
         }
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Caused by: org.lmdbjava"), 60, TimeUnit.SECONDS);
+        try {
+            waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("org.lmdbjava.LmdbNativeException"), 60, TimeUnit.SECONDS);
+        } catch (TimeoutException e) {
+            // Sometimes crash doesn't work
+            Log.info("Failed to crash: " + testInfo.getDisplayName());
+            if (crashType.equals(CrashType.CRASH))
+                throw e;
+            Assumptions.assumeTrue(false);
+        }
         client.killContainerCmd(container1.getContainerId()).exec();
         container1.stop();
         lazyFs1.stop();
@@ -223,7 +220,6 @@ public class LazyFsIT {
         checkConsistency(testInfo.getDisplayName());
     }
 
-
     @ParameterizedTest
     @EnumSource(CrashType.class)
     void killTestDirs(CrashType crashType, TestInfo testInfo) throws Exception {
@@ -241,7 +237,7 @@ public class LazyFsIT {
         Thread.sleep(3000);
         Log.info("Killing");
         lazyFs1.crash();
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Caused by: org.lmdbjava"), 60, TimeUnit.SECONDS);
+        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("org.lmdbjava.LmdbNativeException"), 60, TimeUnit.SECONDS);
         var client = DockerClientFactory.instance().client();
         client.killContainerCmd(container1.getContainerId()).exec();
         container1.stop();
@@ -263,9 +259,7 @@ public class LazyFsIT {
             waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         } catch (TimeoutException e) {
             Log.info("Failed to connect: " + testInfo.getDisplayName());
-            if (crashType.equals(CrashType.CRASH))
-                throw e;
-            // LazyFs can crash too early
+            // Sometimes it doesn't get mounted properly for some reason
 
             Assumptions.assumeTrue(false);
         }
@@ -284,7 +278,15 @@ public class LazyFsIT {
             Thread.sleep(3000);
             lazyFs1.crash();
         }
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Caused by: org.lmdbjava"), 60, TimeUnit.SECONDS);
+        try {
+            waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("org.lmdbjava.LmdbNativeException"), 60, TimeUnit.SECONDS);
+        } catch (TimeoutException e) {
+            // Sometimes crash doesn't work
+            Log.info("Failed to crash: " + testInfo.getDisplayName());
+            if (crashType.equals(CrashType.CRASH))
+                throw e;
+            Assumptions.assumeTrue(false);
+        }
         client.killContainerCmd(container1.getContainerId()).exec();
         container1.stop();
         lazyFs1.stop();
@@ -320,7 +322,7 @@ public class LazyFsIT {
         Log.info("Killing");
         lazyFs2.crash();
         container1.execInContainer("/bin/sh", "-c", "touch /tmp/stopprinting1");
-        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Caused by: org.lmdbjava"), 60, TimeUnit.SECONDS);
+        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("org.lmdbjava.LmdbNativeException"), 60, TimeUnit.SECONDS);
         var client = DockerClientFactory.instance().client();
         client.killContainerCmd(container2.getContainerId()).exec();
         container2.stop();
@@ -342,9 +344,7 @@ public class LazyFsIT {
             waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         } catch (TimeoutException e) {
             Log.info("Failed to connect: " + testInfo.getDisplayName());
-            if (crashType.equals(CrashType.CRASH))
-                throw e;
-            // LazyFs can crash too early
+            // Sometimes it doesn't get mounted properly for some reason
 
             Assumptions.assumeTrue(false);
         }
@@ -365,7 +365,15 @@ public class LazyFsIT {
             lazyFs2.crash();
         }
         container1.execInContainer("/bin/sh", "-c", "touch /tmp/stopprinting2");
-        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Caused by: org.lmdbjava"), 60, TimeUnit.SECONDS);
+        try {
+            waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("org.lmdbjava.LmdbNativeException"), 60, TimeUnit.SECONDS);
+        } catch (TimeoutException e) {
+            // Sometimes crash doesn't work
+            Log.info("Failed to crash: " + testInfo.getDisplayName());
+            if (crashType.equals(CrashType.CRASH))
+                throw e;
+            Assumptions.assumeTrue(false);
+        }
         client.killContainerCmd(container2.getContainerId()).exec();
         container2.stop();
         lazyFs2.stop();
@@ -383,7 +391,6 @@ public class LazyFsIT {
         checkConsistency(testInfo.getDisplayName());
     }
 
-
     @ParameterizedTest
     @EnumSource(CrashType.class)
     void killTestDirs2(CrashType crashType, TestInfo testInfo) throws Exception {
@@ -402,7 +409,7 @@ public class LazyFsIT {
         Log.info("Killing");
         lazyFs2.crash();
         container1.execInContainer("/bin/sh", "-c", "touch /tmp/stopprinting1");
-        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Caused by: org.lmdbjava"), 60, TimeUnit.SECONDS);
+        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("org.lmdbjava.LmdbNativeException"), 60, TimeUnit.SECONDS);
         var client = DockerClientFactory.instance().client();
         client.killContainerCmd(container2.getContainerId()).exec();
         container2.stop();
@@ -424,10 +431,7 @@ public class LazyFsIT {
             waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         } catch (TimeoutException e) {
             Log.info("Failed to connect: " + testInfo.getDisplayName());
-            if (crashType.equals(CrashType.CRASH))
-                throw e;
-            // LazyFs can crash too early
-
+            // Sometimes it doesn't get mounted properly for some reason
             Assumptions.assumeTrue(false);
         }
 
@@ -448,7 +452,15 @@ public class LazyFsIT {
             lazyFs2.crash();
         }
         container1.execInContainer("/bin/sh", "-c", "touch /tmp/stopprinting2");
-        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Caused by: org.lmdbjava"), 60, TimeUnit.SECONDS);
+        try {
+            waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("org.lmdbjava.LmdbNativeException"), 60, TimeUnit.SECONDS);
+        } catch (TimeoutException e) {
+            // Sometimes crash doesn't work
+            Log.info("Failed to crash: " + testInfo.getDisplayName());
+            if (crashType.equals(CrashType.CRASH))
+                throw e;
+            Assumptions.assumeTrue(false);
+        }
         client.killContainerCmd(container2.getContainerId()).exec();
         container2.stop();
         lazyFs2.stop();
@@ -467,4 +479,11 @@ public class LazyFsIT {
     }
 
 
+    private static enum CrashType {
+        CRASH,
+        TORN_OP,
+        TORN_SEQ
+    }
+
+
 }

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/ResyncIT.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsfuse.integration;
 
 import com.github.dockerjava.api.model.Device;
 import org.junit.jupiter.api.*;
@@ -75,14 +75,14 @@ public class ResyncIT {
         var c1curl = container1.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c2uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c2uuid);
 
         var c2curl = container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c1uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c1uuid);
 
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
@@ -115,14 +115,14 @@ public class ResyncIT {
         var c1curl = container1.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c2uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c2uuid);
 
         var c2curl = container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c1uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c1uuid);
 
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
@@ -155,14 +155,14 @@ public class ResyncIT {
         var c1curl = container1.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c2uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c2uuid);
 
         var c2curl = container2.execInContainer("/bin/sh", "-c",
                 "curl --header \"Content-Type: application/json\" " +
                         "  --request PUT " +
-                        "  --data '{\"uuid\":\"" + c1uuid + "\"}' " +
-                        "  http://localhost:8080/peers-manage/known-peers");
+                        "  --data '{}' " +
+                        "  http://localhost:8080/peers-manage/known-peers/" + c1uuid);
 
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);

dhfs-parent/kleppmanntree/src/main/java/com/usatiuk/kleppmanntree/AtomicClock.java

@@ -1,32 +0,0 @@
-package com.usatiuk.kleppmanntree;
-
-import java.io.Serializable;
-
-public class AtomicClock implements Clock<Long>, Serializable {
-    private long _max = 0;
-
-    public AtomicClock(long counter) {
-        _max = counter;
-    }
-
-    @Override
-    public Long getTimestamp() {
-        return ++_max;
-    }
-
-    public void setTimestamp(Long timestamp) {
-        _max = timestamp;
-    }
-
-    @Override
-    public Long peekTimestamp() {
-        return _max;
-    }
-
-    @Override
-    public Long updateTimestamp(Long receivedTimestamp) {
-        var old = _max;
-        _max = Math.max(_max, receivedTimestamp) + 1;
-        return old;
-    }
-}

dhfs-parent/kleppmanntree/src/main/java/com/usatiuk/kleppmanntree/KleppmannTree.java

@@ -1,7 +1,5 @@
 package com.usatiuk.kleppmanntree;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.*;
@@ -17,7 +15,6 @@ public class KleppmannTree<TimestampT extends Comparable<TimestampT>, PeerIdT ex
     private final PeerInterface<PeerIdT> _peers;
     private final Clock<TimestampT> _clock;
     private final OpRecorder<TimestampT, PeerIdT, MetaT, NodeIdT> _opRecorder;
-    private HashMap<NodeIdT, TreeNode<TimestampT, PeerIdT, MetaT, NodeIdT>> _undoCtx = null;
 
     public KleppmannTree(StorageInterface<TimestampT, PeerIdT, MetaT, NodeIdT> storage,
                          PeerInterface<PeerIdT> peers,
@@ -89,7 +86,6 @@ public class KleppmannTree<TimestampT extends Comparable<TimestampT>, PeerIdT ex
                     node.withParent(null)
                             .withLastEffectiveOp(null)
             );
-            _undoCtx.put(node.key(), node);
         }
     }
 
@@ -217,31 +213,16 @@ public class KleppmannTree<TimestampT extends Comparable<TimestampT>, PeerIdT ex
         }
         assert cmp != 0;
         if (cmp < 0) {
-            try {
-                if (log.containsKey(op.timestamp())) return;
-                var toUndo = log.newestSlice(op.timestamp(), false);
-                _undoCtx = new HashMap<>();
-                for (var entry : toUndo.reversed()) {
-                    undoOp(entry.getValue());
-                }
-                try {
-                    doAndPut(op, failCreatingIfExists);
-                } finally {
-                    for (var entry : toUndo) {
-                        redoOp(entry);
-                    }
-
-                    if (!_undoCtx.isEmpty()) {
-                        for (var e : _undoCtx.entrySet()) {
-                            LOGGER.log(Level.FINE, "Dropping node " + e.getKey());
-                            _storage.removeNode(e.getKey());
-                        }
-                    }
-                    _undoCtx = null;
-                }
-            } finally {
-                tryTrimLog();
+            if (log.containsKey(op.timestamp())) return;
+            var toUndo = log.newestSlice(op.timestamp(), false);
+            for (var entry : toUndo.reversed()) {
+                undoOp(entry.getValue());
             }
+            doAndPut(op, failCreatingIfExists);
+            for (var entry : toUndo) {
+                redoOp(entry);
+            }
+            tryTrimLog();
         } else {
             doAndPut(op, failCreatingIfExists);
             tryTrimLog();
@@ -264,8 +245,7 @@ public class KleppmannTree<TimestampT extends Comparable<TimestampT>, PeerIdT ex
         } catch (AlreadyExistsException aex) {
             throw aex;
         } catch (Exception e) {
-            LOGGER.log(Level.SEVERE, "Error computing effects for op" + op.toString(), e);
-            computed = new LogRecord<>(op, null);
+            throw new RuntimeException("Error computing effects for op " + op.toString(), e);
         }
 
         if (computed.effects() != null)
@@ -274,24 +254,6 @@ public class KleppmannTree<TimestampT extends Comparable<TimestampT>, PeerIdT ex
     }
 
     private TreeNode<TimestampT, PeerIdT, MetaT, NodeIdT> getNewNode(NodeIdT key, NodeIdT parent, MetaT meta) {
-        if (_undoCtx != null) {
-            var node = _undoCtx.get(key);
-            if (node != null) {
-                try {
-                    if (!node.children().isEmpty()) {
-                        LOGGER.log(Level.WARNING, "Not empty children for undone node " + key);
-                    }
-                    node = node.withParent(parent).withMeta(meta);
-                } catch (Exception e) {
-                    LOGGER.log(Level.SEVERE, "Error while fixing up node " + key, e);
-                    node = null;
-                }
-            }
-            if (node != null) {
-                _undoCtx.remove(key);
-                return node;
-            }
-        }
         return _storage.createNewNode(key, parent, meta);
     }
 
@@ -372,10 +334,6 @@ public class KleppmannTree<TimestampT extends Comparable<TimestampT>, PeerIdT ex
                 var conflictNode = _storage.getById(conflictNodeId);
                 MetaT conflictNodeMeta = conflictNode.meta();
 
-                if (Objects.equals(conflictNodeMeta, op.newMeta())) {
-                    return new LogRecord<>(op, null);
-                }
-
                 LOGGER.finer(() -> "Node creation conflict: " + conflictNode);
 
                 String newConflictNodeName = op.newName() + ".conflict." + conflictNode.key();
@@ -400,18 +358,14 @@ public class KleppmannTree<TimestampT extends Comparable<TimestampT>, PeerIdT ex
         if (oldMeta != null
                 && op.newMeta() != null
                 && !oldMeta.getClass().equals(op.newMeta().getClass())) {
-            LOGGER.log(Level.SEVERE, "Class mismatch for meta for node " + node.key());
-            return new LogRecord<>(op, null);
+            throw new RuntimeException("Class mismatch for meta for node " + node.key());
         }
+
         var replaceNodeId = newParent.children().get(op.newName());
         if (replaceNodeId != null) {
             var replaceNode = _storage.getById(replaceNodeId);
             var replaceNodeMeta = replaceNode.meta();
 
-            if (Objects.equals(replaceNodeMeta, op.newMeta())) {
-                return new LogRecord<>(op, null);
-            }
-
             LOGGER.finer(() -> "Node replacement: " + replaceNode);
 
             return new LogRecord<>(op, List.of(

dhfs-parent/kleppmanntree/src/main/java/com/usatiuk/kleppmanntree/LogEffect.java

@@ -10,14 +10,14 @@ public record LogEffect<TimestampT extends Comparable<TimestampT>, PeerIdT exten
         NodeIdT childId) implements Serializable {
     public String oldName() {
         if (oldInfo.oldMeta() != null) {
-            return oldInfo.oldMeta().getName();
+            return oldInfo.oldMeta().name();
         }
         return childId.toString();
     }
 
     public String newName() {
         if (newMeta != null) {
-            return newMeta.getName();
+            return newMeta.name();
         }
         return childId.toString();
     }

dhfs-parent/kleppmanntree/src/main/java/com/usatiuk/kleppmanntree/NodeMeta.java

@@ -3,7 +3,7 @@ package com.usatiuk.kleppmanntree;
 import java.io.Serializable;
 
 public interface NodeMeta extends Serializable {
-    String getName();
+    String name();
 
     NodeMeta withName(String name);
 }

dhfs-parent/kleppmanntree/src/main/java/com/usatiuk/kleppmanntree/OpMove.java

@@ -7,7 +7,7 @@ public record OpMove<TimestampT extends Comparable<TimestampT>, PeerIdT extends
          NodeIdT childId) implements Serializable {
     public String newName() {
         if (newMeta != null)
-            return newMeta.getName();
+            return newMeta.name();
         return childId.toString();
     }
 }

dhfs-parent/kleppmanntree/src/main/java/com/usatiuk/kleppmanntree/TreeNode.java

@@ -17,7 +17,7 @@ public interface TreeNode<TimestampT extends Comparable<TimestampT>, PeerIdT ext
 
     default String name() {
         var meta = meta();
-        if (meta != null) return meta.getName();
+        if (meta != null) return meta.name();
         return key().toString();
     }
 

dhfs-parent/kleppmanntree/src/test/java/com/usatiuk/kleppmanntree/TestNodeMeta.java

@@ -8,7 +8,7 @@ public abstract class TestNodeMeta implements NodeMeta {
     }
 
     @Override
-    public String getName() {
+    public String name() {
         return _name;
     }
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperLazy.java

@@ -3,9 +3,9 @@ package com.usatiuk.objects;
 import java.util.function.Supplier;
 
 public final class JDataVersionedWrapperLazy implements JDataVersionedWrapper {
-    private JData _data;
     private final long _version;
     private final int _estimatedSize;
+    private JData _data;
     private Supplier<JData> _producer;
 
     public JDataVersionedWrapperLazy(long version, int estimatedSize, Supplier<JData> producer) {

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperSerializer.java

@@ -8,11 +8,10 @@ import jakarta.inject.Singleton;
 import java.nio.ByteBuffer;
 
 @Singleton
-public class JDataVersionedWrapperSerializer implements ObjectSerializer<JDataVersionedWrapper> {
+public class JDataVersionedWrapperSerializer {
     @Inject
     ObjectSerializer<JData> dataSerializer;
 
-    @Override
     public ByteString serialize(JDataVersionedWrapper obj) {
         ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);
         buffer.putLong(obj.version());
@@ -20,12 +19,10 @@ public class JDataVersionedWrapperSerializer implements ObjectSerializer<JDataVe
         return ByteString.copyFrom(buffer).concat(dataSerializer.serialize(obj.data()));
     }
 
-    @Override
-    public JDataVersionedWrapper deserialize(ByteString data) {
-        var version = data.substring(0, Long.BYTES).asReadOnlyByteBuffer().getLong();
-        var rawData = data.substring(Long.BYTES);
-        return new JDataVersionedWrapperLazy(version, rawData.size(),
-                () -> dataSerializer.deserialize(rawData)
+    public JDataVersionedWrapper deserialize(ByteBuffer data) {
+        var version = data.getLong();
+        return new JDataVersionedWrapperLazy(version, data.remaining(),
+                () -> dataSerializer.deserialize(data)
         );
     }
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKeyImpl.java

@@ -1,5 +1,7 @@
 package com.usatiuk.objects;
 
+import com.usatiuk.utils.UninitializedByteBuffer;
+
 import java.io.Serial;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -46,7 +48,7 @@ public final class JObjectKeyImpl implements JObjectKey {
         synchronized (this) {
             if (_bb != null) return _bb;
             var bytes = value.getBytes(StandardCharsets.ISO_8859_1);
-            var directBb = ByteBuffer.allocateDirect(bytes.length);
+            var directBb = UninitializedByteBuffer.allocate(bytes.length);
             directBb.put(bytes);
             directBb.flip();
             _bb = directBb;
@@ -69,7 +71,7 @@ public final class JObjectKeyImpl implements JObjectKey {
 
     @Override
     public int hashCode() {
-        return Objects.hash(value);
+        return value.hashCode();
     }
 
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JavaDataSerializer.java

@@ -2,11 +2,13 @@ package com.usatiuk.objects;
 
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.utils.SerializationHelper;
+import com.google.protobuf.UnsafeByteOperations;
+import com.usatiuk.utils.SerializationHelper;
 import io.quarkus.arc.DefaultBean;
 import jakarta.enterprise.context.ApplicationScoped;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 
 @ApplicationScoped
 @DefaultBean
@@ -16,9 +18,8 @@ public class JavaDataSerializer implements ObjectSerializer<JData> {
         return SerializationHelper.serialize(obj);
     }
 
-    @Override
-    public JData deserialize(ByteString data) {
-        try (var is = data.newInput()) {
+    public JData deserialize(ByteBuffer data) {
+        try (var is = UnsafeByteOperations.unsafeWrap(data).newInput()) {
             return SerializationHelper.deserialize(is);
         } catch (IOException e) {
             throw new RuntimeException(e);

dhfs-parent/objects/src/main/java/com/usatiuk/objects/ObjectSerializer.java

@@ -2,8 +2,10 @@ package com.usatiuk.objects;
 
 import com.google.protobuf.ByteString;
 
+import java.nio.ByteBuffer;
+
 public interface ObjectSerializer<T> {
     ByteString serialize(T obj);
 
-    T deserialize(ByteString data);
+    T deserialize(ByteBuffer data);
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java

@@ -1,11 +1,10 @@
 package com.usatiuk.objects.iterators;
 
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.Iterator;
 
-public interface CloseableKvIterator<K extends Comparable<? super K>, V> extends Iterator<Pair<K, V>>, AutoCloseableNoThrow {
+public interface CloseableKvIterator<K extends Comparable<? super K>, V> extends Iterator<Pair<K, V>>, AutoCloseable {
     K peekNextKey();
 
     void skip();
@@ -21,4 +20,7 @@ public interface CloseableKvIterator<K extends Comparable<? super K>, V> extends
     default CloseableKvIterator<K, V> reversed() {
         return new ReversedKvIterator<K, V>(this);
     }
+
+    @Override
+    void close();
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/Data.java

@@ -1,7 +1,5 @@
 package com.usatiuk.objects.iterators;
 
-import java.util.Optional;
-
 public interface Data<V> extends MaybeTombstone<V> {
     V value();
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/DataWrapper.java

@@ -1,6 +1,4 @@
 package com.usatiuk.objects.iterators;
 
-import java.util.Optional;
-
 public record DataWrapper<V>(V value) implements Data<V> {
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/IterProdFn.java

@@ -1,6 +0,0 @@
-package com.usatiuk.objects.iterators;
-
-@FunctionalInterface
-public interface IterProdFn<K extends Comparable<K>, V> {
-    CloseableKvIterator<K, V> get(IteratorStart start, K key);
-}

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MaybeTombstone.java

@@ -1,6 +1,4 @@
 package com.usatiuk.objects.iterators;
 
-import java.util.Optional;
-
 public interface MaybeTombstone<T> {
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MergingKvIterator.java

@@ -10,25 +10,16 @@ import java.util.NoSuchElementException;
 import java.util.TreeMap;
 
 public class MergingKvIterator<K extends Comparable<K>, V> extends ReversibleKvIterator<K, V> {
-    private record IteratorEntry<K extends Comparable<K>, V>(int priority, CloseableKvIterator<K, V> iterator) {
-        public IteratorEntry<K, V> reversed() {
-            return new IteratorEntry<>(priority, iterator.reversed());
-        }
-    }
-
     private final NavigableMap<K, IteratorEntry<K, V>> _sortedIterators = new TreeMap<>();
-    private final String _name;
     private final List<IteratorEntry<K, V>> _iterators;
 
-    public MergingKvIterator(String name, IteratorStart startType, K startKey, List<IterProdFn<K, V>> iterators) {
+    public MergingKvIterator(IteratorStart startType, K startKey, List<CloseableKvIterator<K, V>> iterators) {
         _goingForward = true;
-        _name = name;
 
-        // Why streams are so slow?
         {
             IteratorEntry<K, V>[] iteratorEntries = new IteratorEntry[iterators.size()];
             for (int i = 0; i < iterators.size(); i++) {
-                iteratorEntries[i] = new IteratorEntry<>(i, iterators.get(i).get(startType, startKey));
+                iteratorEntries[i] = new IteratorEntry<>(i, iterators.get(i));
             }
             _iterators = List.of(iteratorEntries);
         }
@@ -98,8 +89,8 @@ public class MergingKvIterator<K extends Comparable<K>, V> extends ReversibleKvI
     }
 
     @SafeVarargs
-    public MergingKvIterator(String name, IteratorStart startType, K startKey, IterProdFn<K, V>... iterators) {
-        this(name, startType, startKey, List.of(iterators));
+    public MergingKvIterator(IteratorStart startType, K startKey, CloseableKvIterator<K, V>... iterators) {
+        this(startType, startKey, List.of(iterators));
     }
 
     private void advanceIterator(IteratorEntry<K, V> iteratorEntry) {
@@ -158,7 +149,6 @@ public class MergingKvIterator<K extends Comparable<K>, V> extends ReversibleKvI
                 || (!_goingForward && peekImpl().compareTo(cur.getKey()) >= 0))) {
             skipImpl();
         }
-        Log.tracev("{0} Reversed to {1}", _name, _sortedIterators);
     }
 
     @Override
@@ -206,22 +196,14 @@ public class MergingKvIterator<K extends Comparable<K>, V> extends ReversibleKvI
     @Override
     public String toString() {
         return "MergingKvIterator{" +
-                "_name='" + _name + '\'' +
                 ", _sortedIterators=" + _sortedIterators.keySet() +
                 ", _iterators=" + _iterators +
                 '}';
     }
 
-    private interface FirstMatchState<K extends Comparable<K>, V> {
-    }
-
-    private record FirstMatchNone<K extends Comparable<K>, V>() implements FirstMatchState<K, V> {
-    }
-
-    private record FirstMatchFound<K extends Comparable<K>, V>(
-            CloseableKvIterator<K, V> iterator) implements FirstMatchState<K, V> {
-    }
-
-    private record FirstMatchConsumed<K extends Comparable<K>, V>() implements FirstMatchState<K, V> {
+    private record IteratorEntry<K extends Comparable<K>, V>(int priority, CloseableKvIterator<K, V> iterator) {
+        public IteratorEntry<K, V> reversed() {
+            return new IteratorEntry<>(priority, iterator.reversed());
+        }
     }
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/Tombstone.java

@@ -1,6 +1,4 @@
 package com.usatiuk.objects.iterators;
 
-import java.util.Optional;
-
 public interface Tombstone<V> extends MaybeTombstone<V> {
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/TombstoneMergingKvIterator.java

@@ -1,24 +0,0 @@
-package com.usatiuk.objects.iterators;
-
-import io.quarkus.logging.Log;
-
-import java.util.List;
-
-public abstract class TombstoneMergingKvIterator {
-    public static <K extends Comparable<K>, V> CloseableKvIterator<K, V> of(String name, IteratorStart startType, K startKey, List<IterProdFn<K, MaybeTombstone<V>>> iterators) {
-        return new PredicateKvIterator<K, MaybeTombstone<V>, V>(
-                new MergingKvIterator<K, MaybeTombstone<V>>(name + "-merging", startType, startKey, iterators),
-                startType, startKey,
-                pair -> {
-//                    Log.tracev("{0} - Processing pair {1}", name, pair);
-                    if (pair instanceof Tombstone<V>) {
-                        return null;
-                    }
-                    return ((Data<V>) pair).value();
-                });
-    }
-
-    public static <K extends Comparable<K>, V> CloseableKvIterator<K, V> of(String name, IteratorStart startType, K startKey, IterProdFn<K, MaybeTombstone<V>>... iterators) {
-        return of(name, startType, startKey, List.of(iterators));
-    }
-}

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/TombstoneSkippingIterator.java

@@ -1,28 +1,27 @@
 package com.usatiuk.objects.iterators;
 
-import io.quarkus.logging.Log;
 import org.apache.commons.lang3.tuple.Pair;
 
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.function.Function;
 
-public class PredicateKvIterator<K extends Comparable<K>, V, V_T> extends ReversibleKvIterator<K, V_T> {
-    private final CloseableKvIterator<K, V> _backing;
-    private final Function<V, V_T> _transformer;
-    private Pair<K, V_T> _next = null;
+public class TombstoneSkippingIterator<K extends Comparable<K>, V> extends ReversibleKvIterator<K, V> {
+    private final MergingKvIterator<K, MaybeTombstone<V>> _backing;
+    private Pair<K, V> _next = null;
     private boolean _checkedNext = false;
 
-    public PredicateKvIterator(CloseableKvIterator<K, V> backing, IteratorStart start, K startKey, Function<V, V_T> transformer) {
+    public TombstoneSkippingIterator(IteratorStart start, K startKey, List<CloseableKvIterator<K, MaybeTombstone<V>>> iterators) {
         _goingForward = true;
-        _backing = backing;
-        _transformer = transformer;
+        _backing = new MergingKvIterator<>(start, startKey, iterators);
 
         if (start == IteratorStart.GE || start == IteratorStart.GT)
             return;
 
-        fillNext();
-
         boolean shouldGoBack = false;
+        if (canHaveNext())
+            tryFillNext();
+
         if (start == IteratorStart.LE) {
             if (_next == null || _next.getKey().compareTo(startKey) > 0) {
                 shouldGoBack = true;
@@ -39,34 +38,27 @@ public class PredicateKvIterator<K extends Comparable<K>, V, V_T> extends Revers
             _backing.skipPrev();
             fillNext();
             _goingForward = true;
-            _backing.skip();
+            if (_next != null)
+                _backing.skip();
             fillNext();
         }
+    }
 
+    private boolean canHaveNext() {
+        return (_goingForward ? _backing.hasNext() : _backing.hasPrev());
+    }
 
-//        switch (start) {
-//            case LT -> {
-////                assert _next == null || _next.getKey().compareTo(startKey) < 0;
-//            }
-//            case LE -> {
-////                assert _next == null || _next.getKey().compareTo(startKey) <= 0;
-//            }
-//            case GT -> {
-//                assert _next == null || _next.getKey().compareTo(startKey) > 0;
-//            }
-//            case GE -> {
-//                assert _next == null || _next.getKey().compareTo(startKey) >= 0;
-//            }
-//        }
+    private boolean tryFillNext() {
+        var next = _goingForward ? _backing.next() : _backing.prev();
+        if (next.getValue() instanceof Tombstone<?>)
+            return false;
+        _next = Pair.of(next.getKey(), ((Data<V>) next.getValue()).value());
+        return true;
     }
 
     private void fillNext() {
-        while ((_goingForward ? _backing.hasNext() : _backing.hasPrev()) && _next == null) {
-            var next = _goingForward ? _backing.next() : _backing.prev();
-            var transformed = _transformer.apply(next.getValue());
-            if (transformed == null)
-                continue;
-            _next = Pair.of(next.getKey(), transformed);
+        while (_next == null && canHaveNext()) {
+            tryFillNext();
         }
         _checkedNext = true;
     }
@@ -81,9 +73,6 @@ public class PredicateKvIterator<K extends Comparable<K>, V, V_T> extends Revers
         else if (!_goingForward && !wasAtEnd)
             _backing.skipPrev();
 
-//        if (!wasAtEnd)
-//            Log.tracev("Skipped in reverse: {0}", _next);
-
         _next = null;
         _checkedNext = false;
     }
@@ -118,7 +107,7 @@ public class PredicateKvIterator<K extends Comparable<K>, V, V_T> extends Revers
     }
 
     @Override
-    protected Pair<K, V_T> nextImpl() {
+    protected Pair<K, V> nextImpl() {
         if (!_checkedNext)
             fillNext();
 
@@ -138,7 +127,6 @@ public class PredicateKvIterator<K extends Comparable<K>, V, V_T> extends Revers
     @Override
     public String toString() {
         return "PredicateKvIterator{" +
-                "_backing=" + _backing +
                 ", _next=" + _next +
                 '}';
     }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java

@@ -1,18 +1,22 @@
 package com.usatiuk.objects.snapshot;
 
-import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.CloseableKvIterator;
 import com.usatiuk.objects.iterators.IteratorStart;
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
+import com.usatiuk.objects.iterators.MaybeTombstone;
 
 import javax.annotation.Nonnull;
+import java.util.List;
 import java.util.Optional;
 
-public interface Snapshot<K extends Comparable<K>, V> extends AutoCloseableNoThrow {
-    CloseableKvIterator<K, V> getIterator(IteratorStart start, K key);
+public interface Snapshot<K extends Comparable<K>, V> extends AutoCloseable {
+    List<CloseableKvIterator<K, MaybeTombstone<V>>> getIterator(IteratorStart start, K key);
 
     @Nonnull
     Optional<V> readObject(K name);
 
     long id();
+
+    @Override
+    void close();
+
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/CachingObjectPersistentStore.java

@@ -5,6 +5,7 @@ import com.usatiuk.objects.JDataVersionedWrapperLazy;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.*;
 import com.usatiuk.objects.snapshot.Snapshot;
+import com.usatiuk.utils.ListUtils;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.StartupEvent;
 import jakarta.annotation.Priority;
@@ -16,6 +17,7 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.pcollections.TreePMap;
 
 import javax.annotation.Nonnull;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -24,48 +26,11 @@ import java.util.concurrent.atomic.AtomicReference;
 
 @ApplicationScoped
 public class CachingObjectPersistentStore {
+    private final AtomicReference<Cache> _cache;
     @Inject
     SerializingObjectPersistentStore delegate;
     @ConfigProperty(name = "dhfs.objects.lru.print-stats")
     boolean printStats;
-
-    private record Cache(TreePMap<JObjectKey, CacheEntry> map,
-                         int size,
-                         long version,
-                         int sizeLimit) {
-        public Cache withPut(JObjectKey key, Optional<JDataVersionedWrapper> obj) {
-            var entry = obj.<CacheEntry>map(o -> new CacheEntryPresent(o, o.estimateSize())).orElse(new CacheEntryMiss());
-
-            int newSize = size() + entry.size();
-
-            var old = map.get(key);
-            if (old != null)
-                newSize -= old.size();
-
-            TreePMap<JObjectKey, CacheEntry> newCache = map();
-
-            while (newSize > sizeLimit) {
-                var del = newCache.firstEntry();
-                newCache = newCache.minusFirstEntry();
-                newSize -= del.getValue().size();
-            }
-
-            newCache = newCache.plus(key, entry);
-            return new Cache(
-                    newCache,
-                    newSize,
-                    version,
-                    sizeLimit
-            );
-        }
-
-        public Cache withVersion(long version) {
-            return new Cache(map, size, version, sizeLimit);
-        }
-    }
-
-    private final AtomicReference<Cache> _cache;
-    private ExecutorService _commitExecutor;
     private ExecutorService _statusExecutor;
     private AtomicLong _cached = new AtomicLong();
     private AtomicLong _cacheTries = new AtomicLong();
@@ -81,7 +46,6 @@ public class CachingObjectPersistentStore {
             _cache.set(_cache.get().withVersion(s.id()));
         }
 
-        _commitExecutor = Executors.newSingleThreadExecutor();
         if (printStats) {
             _statusExecutor = Executors.newSingleThreadExecutor();
             _statusExecutor.submit(() -> {
@@ -102,7 +66,6 @@ public class CachingObjectPersistentStore {
         Log.tracev("Committing: {0} writes, {1} deletes", objs.written().size(), objs.deleted().size());
 
         var cache = _cache.get();
-        var commitFuture = _commitExecutor.submit(() -> delegate.prepareTx(objs, txId).run());
         for (var write : objs.written()) {
             cache = cache.withPut(write.getLeft(), Optional.of(write.getRight()));
         }
@@ -110,11 +73,7 @@ public class CachingObjectPersistentStore {
             cache = cache.withPut(del, Optional.empty());
         }
         cache = cache.withVersion(txId);
-        try {
-            commitFuture.get();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        delegate.commitTx(objs, txId);
         _cache.set(cache);
 
         Log.tracev("Committed: {0} writes, {1} deletes", objs.written().size(), objs.deleted().size());
@@ -142,10 +101,10 @@ public class CachingObjectPersistentStore {
                 Snapshot<JObjectKey, JDataVersionedWrapper> finalBacking = backing;
                 Cache finalCurCache = curCache;
                 return new Snapshot<JObjectKey, JDataVersionedWrapper>() {
-                    private boolean _invalid = false;
-                    private boolean _closed = false;
                     private final Cache _curCache = finalCurCache;
                     private final Snapshot<JObjectKey, JDataVersionedWrapper> _backing = finalBacking;
+                    private boolean _invalid = false;
+                    private boolean _closed = false;
 
                     private void doCache(JObjectKey key, Optional<JDataVersionedWrapper> obj) {
                         _cacheTries.incrementAndGet();
@@ -187,10 +146,12 @@ public class CachingObjectPersistentStore {
                     }
 
                     @Override
-                    public CloseableKvIterator<JObjectKey, JDataVersionedWrapper> getIterator(IteratorStart start, JObjectKey key) {
-                        return TombstoneMergingKvIterator.<JObjectKey, JDataVersionedWrapper>of("cache", start, key,
-                                (mS, mK) -> new NavigableMapKvIterator<JObjectKey, MaybeTombstone<JDataVersionedWrapper>>(_curCache.map(), mS, mK),
-                                (mS, mK) -> new CachingKvIterator(_backing.getIterator(start, key)));
+                    public List<CloseableKvIterator<JObjectKey, MaybeTombstone<JDataVersionedWrapper>>> getIterator(IteratorStart start, JObjectKey key) {
+                        return ListUtils.prependAndMap(
+                                new NavigableMapKvIterator<JObjectKey, MaybeTombstone<JDataVersionedWrapper>>(_curCache.map(), start, key),
+                                _backing.getIterator(start, key),
+                                i -> new CachingKvIterator((CloseableKvIterator<JObjectKey, JDataVersionedWrapper>) (CloseableKvIterator<JObjectKey, ?>) i)
+                        );
                     }
 
                     @Nonnull
@@ -292,6 +253,41 @@ public class CachingObjectPersistentStore {
         int size();
     }
 
+    private record Cache(TreePMap<JObjectKey, CacheEntry> map,
+                         int size,
+                         long version,
+                         int sizeLimit) {
+        public Cache withPut(JObjectKey key, Optional<JDataVersionedWrapper> obj) {
+            var entry = obj.<CacheEntry>map(o -> new CacheEntryPresent(o, o.estimateSize())).orElse(new CacheEntryMiss());
+
+            int newSize = size() + entry.size();
+
+            var old = map.get(key);
+            if (old != null)
+                newSize -= old.size();
+
+            TreePMap<JObjectKey, CacheEntry> newCache = map();
+
+            while (newSize > sizeLimit) {
+                var del = newCache.firstEntry();
+                newCache = newCache.minusFirstEntry();
+                newSize -= del.getValue().size();
+            }
+
+            newCache = newCache.plus(key, entry);
+            return new Cache(
+                    newCache,
+                    newSize,
+                    version,
+                    sizeLimit
+            );
+        }
+
+        public Cache withVersion(long version) {
+            return new Cache(map, size, version, sizeLimit);
+        }
+    }
+
     private record CacheEntryPresent(JDataVersionedWrapper value,
                                      int size) implements CacheEntry, Data<JDataVersionedWrapper> {
     }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java

@@ -1,15 +1,9 @@
 package com.usatiuk.objects.stores;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.UnsafeByteOperations;
-import com.usatiuk.dhfs.utils.RefcountedCloseable;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.JObjectKeyMax;
 import com.usatiuk.objects.JObjectKeyMin;
-import com.usatiuk.objects.iterators.CloseableKvIterator;
-import com.usatiuk.objects.iterators.IteratorStart;
-import com.usatiuk.objects.iterators.KeyPredicateKvIterator;
-import com.usatiuk.objects.iterators.ReversibleKvIterator;
+import com.usatiuk.objects.iterators.*;
 import com.usatiuk.objects.snapshot.Snapshot;
 import io.quarkus.arc.properties.IfBuildProperty;
 import io.quarkus.logging.Log;
@@ -29,8 +23,10 @@ import java.lang.ref.Cleaner;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import static org.lmdbjava.DbiFlags.MDB_CREATE;
 import static org.lmdbjava.Env.create;
@@ -42,6 +38,9 @@ public class LmdbObjectPersistentStore implements ObjectPersistentStore {
     private static final String DB_VER_OBJ_NAME_STR = "__DB_VER_OBJ";
     private static final ByteBuffer DB_VER_OBJ_NAME;
 
+    @ConfigProperty(name = "dhfs.objects.persistence.lmdb.size", defaultValue = "1000000000000")
+    long lmdbSize;
+
     static {
         byte[] tmp = DB_VER_OBJ_NAME_STR.getBytes(StandardCharsets.ISO_8859_1);
         var bb = ByteBuffer.allocateDirect(tmp.length);
@@ -65,7 +64,7 @@ public class LmdbObjectPersistentStore implements ObjectPersistentStore {
             _root.toFile().mkdirs();
         }
         _env = create()
-                .setMapSize(1_000_000_000_000L)
+                .setMapSize(lmdbSize)
                 .setMaxDbs(1)
                 .open(_root.toFile(), EnvFlags.MDB_NOTLS);
         _db = _env.openDbi(DB_NAME, MDB_CREATE);
@@ -101,60 +100,54 @@ public class LmdbObjectPersistentStore implements ObjectPersistentStore {
         if (!_ready) throw new IllegalStateException("Wrong service order!");
     }
 
-    @Nonnull
     @Override
-    public Optional<ByteString> readObject(JObjectKey name) {
-        verifyReady();
-        try (Txn<ByteBuffer> txn = _env.txnRead()) {
-            var value = _db.get(txn, name.toByteBuffer());
-            return Optional.ofNullable(value).map(ByteString::copyFrom);
+    public Snapshot<JObjectKey, ByteBuffer> getSnapshot() {
+        var txn = _env.txnRead();
+        try {
+            long commitId = readTxId(txn).orElseThrow();
+            return new Snapshot<JObjectKey, ByteBuffer>() {
+                private final Txn<ByteBuffer> _txn = txn;
+                private final long _id = commitId;
+                private boolean _closed = false;
+
+                @Override
+                public List<CloseableKvIterator<JObjectKey, MaybeTombstone<ByteBuffer>>> getIterator(IteratorStart start, JObjectKey key) {
+                    assert !_closed;
+                    return List.of(new KeyPredicateKvIterator<>(new LmdbKvIterator(_txn, start, key), start, key, (k) -> !k.value().equals(DB_VER_OBJ_NAME_STR)));
+                }
+
+                @Nonnull
+                @Override
+                public Optional<ByteBuffer> readObject(JObjectKey name) {
+                    assert !_closed;
+                    var got = _db.get(_txn, name.toByteBuffer());
+                    var ret = Optional.ofNullable(got).map(ByteBuffer::asReadOnlyBuffer);
+                    return ret;
+                }
+
+                @Override
+                public long id() {
+                    assert !_closed;
+                    return _id;
+                }
+
+                @Override
+                public void close() {
+                    assert !_closed;
+                    _closed = true;
+                    _txn.close();
+                }
+            };
+        } catch (Exception e) {
+            txn.close();
+            throw e;
         }
     }
 
     @Override
-    public Snapshot<JObjectKey, ByteString> getSnapshot() {
-        var txn = new RefcountedCloseable<>(_env.txnRead());
-        long commitId = readTxId(txn.get()).orElseThrow();
-        return new Snapshot<JObjectKey, ByteString>() {
-            private final RefcountedCloseable<Txn<ByteBuffer>> _txn = txn;
-            private final long _id = commitId;
-            private boolean _closed = false;
-
-            @Override
-            public CloseableKvIterator<JObjectKey, ByteString> getIterator(IteratorStart start, JObjectKey key) {
-                assert !_closed;
-                return new KeyPredicateKvIterator<>(new LmdbKvIterator(_txn.ref(), start, key), start, key, (k) -> !k.value().equals(DB_VER_OBJ_NAME_STR));
-            }
-
-            @Nonnull
-            @Override
-            public Optional<ByteString> readObject(JObjectKey name) {
-                assert !_closed;
-                var got = _db.get(_txn.get(), name.toByteBuffer());
-                var ret = Optional.ofNullable(got).map(UnsafeByteOperations::unsafeWrap);
-                return ret;
-            }
-
-            @Override
-            public long id() {
-                assert !_closed;
-                return _id;
-            }
-
-            @Override
-            public void close() {
-                assert !_closed;
-                _closed = true;
-                _txn.unref();
-            }
-        };
-    }
-
-    @Override
-    public Runnable prepareTx(TxManifestRaw names, long txId) {
+    public void commitTx(TxManifestRaw names, long txId) {
         verifyReady();
-        var txn = _env.txnWrite();
-        try {
+        try (var txn = _env.txnWrite()) {
             for (var written : names.written()) {
                 var putBb = _db.reserve(txn, written.getKey().toByteBuffer(), written.getValue().size());
                 written.getValue().copyTo(putBb);
@@ -169,17 +162,8 @@ public class LmdbObjectPersistentStore implements ObjectPersistentStore {
             bbData.putLong(txId);
             bbData.flip();
             _db.put(txn, DB_VER_OBJ_NAME.asReadOnlyBuffer(), bbData);
-        } catch (Throwable t) {
-            txn.close();
-            throw t;
+            txn.commit();
         }
-        return () -> {
-            try {
-                txn.commit();
-            } finally {
-                txn.close();
-            }
-        };
     }
 
     @Override
@@ -194,36 +178,30 @@ public class LmdbObjectPersistentStore implements ObjectPersistentStore {
         return _root.toFile().getFreeSpace();
     }
 
-    @Override
-    public long getUsableSpace() {
-        verifyReady();
-        return _root.toFile().getUsableSpace();
-    }
-
-    private class LmdbKvIterator extends ReversibleKvIterator<JObjectKey, ByteString> {
+    private class LmdbKvIterator extends ReversibleKvIterator<JObjectKey, MaybeTombstone<ByteBuffer>> {
         private static final Cleaner CLEANER = Cleaner.create();
-        private final RefcountedCloseable<Txn<ByteBuffer>> _txn;
+        private final Txn<ByteBuffer> _txn; // Managed by the snapshot
         private final Cursor<ByteBuffer> _cursor;
         private final MutableObject<Boolean> _closed = new MutableObject<>(false);
         //        private final Exception _allocationStacktrace = new Exception();
-        private final Exception _allocationStacktrace = null;
+//        private final Exception _allocationStacktrace = null;
         private boolean _hasNext = false;
         private JObjectKey _peekedNextKey = null;
 
-        LmdbKvIterator(RefcountedCloseable<Txn<ByteBuffer>> txn, IteratorStart start, JObjectKey key) {
+        LmdbKvIterator(Txn<ByteBuffer> txn, IteratorStart start, JObjectKey key) {
             _txn = txn;
             _goingForward = true;
 
-            _cursor = _db.openCursor(_txn.get());
+            _cursor = _db.openCursor(_txn);
 
             var closedRef = _closed;
-            var bt = _allocationStacktrace;
-            CLEANER.register(this, () -> {
-                if (!closedRef.getValue()) {
-                    Log.error("Iterator was not closed before GC, allocated at: {0}", bt);
-                    System.exit(-1);
-                }
-            });
+//            var bt = _allocationStacktrace;
+//            CLEANER.register(this, () -> {
+//                if (!closedRef.getValue()) {
+//                    Log.error("Iterator was not closed before GC, allocated at: {0}", bt);
+//                    System.exit(-1);
+//                }
+//            });
 
             verifyReady();
 
@@ -305,7 +283,6 @@ public class LmdbObjectPersistentStore implements ObjectPersistentStore {
             }
             _closed.setValue(true);
             _cursor.close();
-            _txn.unref();
         }
 
         @Override
@@ -356,14 +333,13 @@ public class LmdbObjectPersistentStore implements ObjectPersistentStore {
         }
 
         @Override
-        protected Pair<JObjectKey, ByteString> nextImpl() {
+        protected Pair<JObjectKey, MaybeTombstone<ByteBuffer>> nextImpl() {
             if (!_hasNext) {
                 throw new NoSuchElementException("No more elements");
             }
             // TODO: Right now with java serialization it doesn't matter, it's all copied to arrays anyway
             var val = _cursor.val();
-            var bs = UnsafeByteOperations.unsafeWrap(val);
-            var ret = Pair.of(JObjectKey.fromByteBuffer(_cursor.key()), bs);
+            Pair<JObjectKey, MaybeTombstone<ByteBuffer>> ret = Pair.of(JObjectKey.fromByteBuffer(_cursor.key()), new DataWrapper<>(val.asReadOnlyBuffer()));
             if (_goingForward)
                 _hasNext = _cursor.next();
             else

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/MemoryObjectPersistentStore.java

@@ -2,18 +2,18 @@ package com.usatiuk.objects.stores;
 
 import com.google.protobuf.ByteString;
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.objects.JObjectKeyImpl;
-import com.usatiuk.objects.iterators.CloseableKvIterator;
-import com.usatiuk.objects.iterators.IteratorStart;
-import com.usatiuk.objects.iterators.NavigableMapKvIterator;
+import com.usatiuk.objects.iterators.*;
 import com.usatiuk.objects.snapshot.Snapshot;
 import io.quarkus.arc.properties.IfBuildProperty;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.pcollections.TreePMap;
 
 import javax.annotation.Nonnull;
+import java.nio.ByteBuffer;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Stream;
 
 @ApplicationScoped
 @IfBuildProperty(name = "dhfs.objects.persistence", stringValue = "memory")
@@ -22,30 +22,22 @@ public class MemoryObjectPersistentStore implements ObjectPersistentStore {
     private TreePMap<JObjectKey, ByteString> _objects = TreePMap.empty();
     private long _lastCommitId = 0;
 
-    @Nonnull
     @Override
-    public Optional<ByteString> readObject(JObjectKey name) {
+    public Snapshot<JObjectKey, ByteBuffer> getSnapshot() {
         synchronized (this) {
-            return Optional.ofNullable(_objects.get(name));
-        }
-    }
-
-    @Override
-    public Snapshot<JObjectKey, ByteString> getSnapshot() {
-        synchronized (this) {
-            return new Snapshot<JObjectKey, ByteString>() {
+            return new Snapshot<JObjectKey, ByteBuffer>() {
                 private final TreePMap<JObjectKey, ByteString> _objects = MemoryObjectPersistentStore.this._objects;
                 private final long _lastCommitId = MemoryObjectPersistentStore.this._lastCommitId;
 
                 @Override
-                public CloseableKvIterator<JObjectKey, ByteString> getIterator(IteratorStart start, JObjectKey key) {
-                    return new NavigableMapKvIterator<>(_objects, start, key);
+                public List<CloseableKvIterator<JObjectKey, MaybeTombstone<ByteBuffer>>> getIterator(IteratorStart start, JObjectKey key) {
+                    return List.of(new MappingKvIterator<>(new NavigableMapKvIterator<>(_objects, start, key), s -> new DataWrapper<>(s.asReadOnlyByteBuffer())));
                 }
 
                 @Nonnull
                 @Override
-                public Optional<ByteString> readObject(JObjectKey name) {
-                    return Optional.ofNullable(_objects.get(name));
+                public Optional<ByteBuffer> readObject(JObjectKey name) {
+                    return Optional.ofNullable(_objects.get(name)).map(ByteString::asReadOnlyByteBuffer);
                 }
 
                 @Override
@@ -61,19 +53,18 @@ public class MemoryObjectPersistentStore implements ObjectPersistentStore {
         }
     }
 
-    public Runnable prepareTx(TxManifestRaw names, long txId) {
-        return () -> {
-            synchronized (this) {
-                for (var written : names.written()) {
-                    _objects = _objects.plus(written.getKey(), written.getValue());
-                }
-                for (JObjectKey key : names.deleted()) {
-                    _objects = _objects.minus(key);
-                }
-                assert txId > _lastCommitId;
-                _lastCommitId = txId;
+    @Override
+    public void commitTx(TxManifestRaw names, long txId) {
+        synchronized (this) {
+            for (var written : names.written()) {
+                _objects = _objects.plus(written.getKey(), written.getValue());
             }
-        };
+            for (JObjectKey key : names.deleted()) {
+                _objects = _objects.minus(key);
+            }
+            assert txId > _lastCommitId;
+            _lastCommitId = txId;
+        }
     }
 
     @Override
@@ -85,9 +76,4 @@ public class MemoryObjectPersistentStore implements ObjectPersistentStore {
     public long getFreeSpace() {
         return 0;
     }
-
-    @Override
-    public long getUsableSpace() {
-        return 0;
-    }
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/ObjectPersistentStore.java

@@ -2,27 +2,20 @@ package com.usatiuk.objects.stores;
 
 import com.google.protobuf.ByteString;
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.objects.iterators.CloseableKvIterator;
-import com.usatiuk.objects.iterators.IteratorStart;
 import com.usatiuk.objects.snapshot.Snapshot;
 
 import javax.annotation.Nonnull;
+import java.nio.ByteBuffer;
 import java.util.Optional;
-import java.util.function.Consumer;
 
 // Persistent storage of objects
 // All changes are written as sequential transactions
 public interface ObjectPersistentStore {
-    @Nonnull
-    Optional<ByteString> readObject(JObjectKey name);
+    Snapshot<JObjectKey, ByteBuffer> getSnapshot();
 
-    Snapshot<JObjectKey, ByteString> getSnapshot();
-
-    Runnable prepareTx(TxManifestRaw names, long txId);
+    void commitTx(TxManifestRaw names, long txId);
 
     long getTotalSpace();
 
     long getFreeSpace();
-
-    long getUsableSpace();
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingWrite.java

@@ -3,5 +3,6 @@ package com.usatiuk.objects.stores;
 import com.usatiuk.objects.JDataVersionedWrapper;
 import com.usatiuk.objects.iterators.Data;
 
-public record PendingWrite(JDataVersionedWrapper value, long bundleId) implements PendingWriteEntry, Data<JDataVersionedWrapper> {
+public record PendingWrite(JDataVersionedWrapper value,
+                           long bundleId) implements PendingWriteEntry, Data<JDataVersionedWrapper> {
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/SerializingObjectPersistentStore.java

@@ -1,40 +1,38 @@
 package com.usatiuk.objects.stores;
 
-import com.google.protobuf.ByteString;
 import com.usatiuk.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JDataVersionedWrapperSerializer;
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.objects.ObjectSerializer;
-import com.usatiuk.objects.iterators.CloseableKvIterator;
-import com.usatiuk.objects.iterators.IteratorStart;
-import com.usatiuk.objects.iterators.MappingKvIterator;
+import com.usatiuk.objects.iterators.*;
 import com.usatiuk.objects.snapshot.Snapshot;
+import com.usatiuk.utils.ListUtils;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nonnull;
+import java.nio.ByteBuffer;
+import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 @ApplicationScoped
 public class SerializingObjectPersistentStore {
     @Inject
-    ObjectSerializer<JDataVersionedWrapper> serializer;
+    JDataVersionedWrapperSerializer serializer;
 
     @Inject
     ObjectPersistentStore delegateStore;
 
-    @Nonnull
-    Optional<JDataVersionedWrapper> readObject(JObjectKey name) {
-        return delegateStore.readObject(name).map(serializer::deserialize);
-    }
-
     public Snapshot<JObjectKey, JDataVersionedWrapper> getSnapshot() {
         return new Snapshot<JObjectKey, JDataVersionedWrapper>() {
-            private final Snapshot<JObjectKey, ByteString> _backing = delegateStore.getSnapshot();
+            private final Snapshot<JObjectKey, ByteBuffer> _backing = delegateStore.getSnapshot();
 
             @Override
-            public CloseableKvIterator<JObjectKey, JDataVersionedWrapper> getIterator(IteratorStart start, JObjectKey key) {
-                return new MappingKvIterator<>(_backing.getIterator(start, key), d -> serializer.deserialize(d));
+            public List<CloseableKvIterator<JObjectKey, MaybeTombstone<JDataVersionedWrapper>>> getIterator(IteratorStart start, JObjectKey key) {
+                return ListUtils.map(_backing.getIterator(start, key),
+                        i -> new MappingKvIterator<JObjectKey, MaybeTombstone<ByteBuffer>, MaybeTombstone<JDataVersionedWrapper>>(i,
+                                d -> serializer.deserialize(((DataWrapper<ByteBuffer>) d).value())));
             }
 
             @Nonnull
@@ -64,7 +62,7 @@ public class SerializingObjectPersistentStore {
                 , objs.deleted());
     }
 
-    Runnable prepareTx(TxManifestObj<? extends JDataVersionedWrapper> objects, long txId) {
-        return delegateStore.prepareTx(prepareManifest(objects), txId);
+    void commitTx(TxManifestObj<? extends JDataVersionedWrapper> objects, long txId) {
+        delegateStore.commitTx(prepareManifest(objects), txId);
     }
 }

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

@@ -3,10 +3,13 @@ package com.usatiuk.objects.stores;
 import com.usatiuk.objects.JDataVersionedWrapper;
 import com.usatiuk.objects.JDataVersionedWrapperImpl;
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.objects.iterators.*;
+import com.usatiuk.objects.iterators.CloseableKvIterator;
+import com.usatiuk.objects.iterators.IteratorStart;
+import com.usatiuk.objects.iterators.MaybeTombstone;
+import com.usatiuk.objects.iterators.NavigableMapKvIterator;
 import com.usatiuk.objects.snapshot.Snapshot;
-import com.usatiuk.objects.transaction.TxCommitException;
 import com.usatiuk.objects.transaction.TxRecord;
+import com.usatiuk.utils.ListUtils;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
@@ -26,33 +29,38 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 
 @ApplicationScoped
 public class WritebackObjectPersistentStore {
-    private final LinkedList<TxBundle> _pendingBundles = new LinkedList<>();
-    private final LinkedHashMap<Long, TxBundle> _notFlushedBundles = new LinkedHashMap<>();
+    @Inject
+    CachingObjectPersistentStore cachedStore;
+    @Inject
+    ExecutorService _callbackExecutor;
 
-    private record PendingWriteData(TreePMap<JObjectKey, PendingWriteEntry> pendingWrites,
-                                    long lastFlushedId,
-                                    long lastCommittedId) {
-    }
+    @ConfigProperty(name = "dhfs.objects.writeback.limit")
+    int sizeLimit;
+
+    private TxBundle _pendingBundle = null;
+    private int _curSize = 0;
 
     private final AtomicReference<PendingWriteData> _pendingWrites = new AtomicReference<>(null);
 
-    private final Object _flushWaitSynchronizer = new Object();
+    private final ReentrantLock _pendingBundleLock = new ReentrantLock();
 
-    private final AtomicLong _lastWrittenId = new AtomicLong(-1);
-    private final AtomicLong _lastCommittedId = new AtomicLong();
+    private final Condition _newBundleCondition = _pendingBundleLock.newCondition();
+    private final Condition _flushCondition = _pendingBundleLock.newCondition();
+
+    private final AtomicLong _lastFlushedId = new AtomicLong(-1);
+    private final AtomicLong _lastCommittedId = new AtomicLong(-1);
 
     private final AtomicLong _waitedTotal = new AtomicLong(0);
-    @Inject
-    CachingObjectPersistentStore cachedStore;
-    @ConfigProperty(name = "dhfs.objects.writeback.limit")
-    long sizeLimit;
-    private long currentSize = 0;
+
     private ExecutorService _writebackExecutor;
     private ExecutorService _statusExecutor;
+
     private volatile boolean _ready = false;
 
     void init(@Observes @Priority(120) StartupEvent event) {
@@ -70,8 +78,8 @@ public class WritebackObjectPersistentStore {
             try {
                 while (true) {
                     Thread.sleep(1000);
-                    if (currentSize > 0)
-                        Log.info("Tx commit status: size=" + currentSize / 1024 / 1024 + "MB");
+                    if (_curSize > 0)
+                        Log.info("Tx commit status: size=" + _curSize / 1024 / 1024 + "MB");
                 }
             } catch (InterruptedException ignored) {
             }
@@ -81,7 +89,7 @@ public class WritebackObjectPersistentStore {
             lastTxId = s.id();
         }
         _lastCommittedId.set(lastTxId);
-        _lastWrittenId.set(lastTxId);
+        _lastFlushedId.set(lastTxId);
         _pendingWrites.set(new PendingWriteData(TreePMap.empty(), lastTxId, lastTxId));
         _ready = true;
     }
@@ -89,11 +97,14 @@ public class WritebackObjectPersistentStore {
     void shutdown(@Observes @Priority(890) ShutdownEvent event) throws InterruptedException {
         Log.info("Waiting for all transactions to drain");
 
-        synchronized (_flushWaitSynchronizer) {
-            _ready = false;
-            while (currentSize > 0) {
-                _flushWaitSynchronizer.wait();
+        _ready = false;
+        _pendingBundleLock.lock();
+        try {
+            while (_curSize > 0) {
+                _flushCondition.await();
             }
+        } finally {
+            _pendingBundleLock.unlock();
         }
 
         _writebackExecutor.shutdownNow();
@@ -107,21 +118,19 @@ public class WritebackObjectPersistentStore {
     private void writeback() {
         while (!Thread.interrupted()) {
             try {
-                TxBundle bundle = new TxBundle(0);
-                synchronized (_pendingBundles) {
-                    while (_pendingBundles.isEmpty() || !_pendingBundles.peek()._ready)
-                        _pendingBundles.wait();
+                TxBundle bundle;
+                _pendingBundleLock.lock();
+                try {
+                    while (_pendingBundle == null)
+                        _newBundleCondition.await();
+                    bundle = _pendingBundle;
+                    _pendingBundle = null;
 
-                    long diff = 0;
-                    while (!_pendingBundles.isEmpty() && _pendingBundles.peek()._ready) {
-                        var toCompress = _pendingBundles.poll();
-                        diff -= toCompress.size();
-                        bundle.compress(toCompress);
-                    }
-                    diff += bundle.size();
-                    synchronized (_flushWaitSynchronizer) {
-                        currentSize += diff;
-                    }
+                    _curSize -= bundle.size();
+                    assert _curSize == 0;
+                    _flushCondition.signal();
+                } finally {
+                    _pendingBundleLock.unlock();
                 }
 
                 var toWrite = new ArrayList<Pair<JObjectKey, JDataVersionedWrapper>>();
@@ -141,15 +150,12 @@ public class WritebackObjectPersistentStore {
                     }
                 }
 
-                cachedStore.commitTx(
-                        new TxManifestObj<>(
-                                Collections.unmodifiableList(toWrite),
-                                Collections.unmodifiableList(toDelete)
-                        ), bundle.id());
+                cachedStore.commitTx(new TxManifestObj<>(toWrite, toDelete), bundle.id());
 
                 Log.tracev("Bundle {0} committed", bundle.id());
 
-                while (true) {
+                _pendingBundleLock.lock();
+                try {
                     var curPw = _pendingWrites.get();
                     var curPwMap = curPw.pendingWrites();
                     for (var e : bundle._entries.values()) {
@@ -162,25 +168,16 @@ public class WritebackObjectPersistentStore {
                             bundle.id(),
                             curPw.lastCommittedId()
                     );
-                    if (_pendingWrites.compareAndSet(curPw, newCurPw))
-                        break;
+                    _pendingWrites.compareAndSet(curPw, newCurPw);
+                } finally {
+                    _pendingBundleLock.unlock();
                 }
 
-                List<List<Runnable>> callbacks = new ArrayList<>();
-                synchronized (_notFlushedBundles) {
-                    _lastWrittenId.set(bundle.id());
-                    while (!_notFlushedBundles.isEmpty() && _notFlushedBundles.firstEntry().getKey() <= bundle.id()) {
-                        callbacks.add(_notFlushedBundles.pollFirstEntry().getValue().setCommitted());
-                    }
-                }
-                callbacks.forEach(l -> l.forEach(Runnable::run));
-
-                synchronized (_flushWaitSynchronizer) {
-                    currentSize -= bundle.size();
-                    // FIXME:
-                    if (currentSize <= sizeLimit || !_ready)
-                        _flushWaitSynchronizer.notifyAll();
-                }
+                _lastFlushedId.set(bundle.id());
+                var callbacks = bundle.callbacks();
+                _callbackExecutor.submit(() -> {
+                    callbacks.forEach(Runnable::run);
+                });
             } catch (InterruptedException ignored) {
             } catch (Exception e) {
                 Log.error("Uncaught exception in writeback", e);
@@ -191,125 +188,99 @@ public class WritebackObjectPersistentStore {
         Log.info("Writeback thread exiting");
     }
 
-    public long commitBundle(Collection<TxRecord.TxObjectRecord<?>> writes) {
+    private long commitBundle(Collection<TxRecord.TxObjectRecord<?>> writes) {
         verifyReady();
-        boolean wait = false;
-        while (true) {
-            if (wait) {
-                synchronized (_flushWaitSynchronizer) {
-                    long started = System.currentTimeMillis();
-                    while (currentSize > sizeLimit) {
-                        try {
-                            _flushWaitSynchronizer.wait();
-                        } catch (InterruptedException e) {
-                            throw new RuntimeException(e);
-                        }
-                    }
-                    long waited = System.currentTimeMillis() - started;
-                    _waitedTotal.addAndGet(waited);
-                    if (Log.isTraceEnabled())
-                        Log.tracev("Thread {0} waited for tx bundle for {1} ms", Thread.currentThread().getName(), waited);
-                    wait = false;
-                }
+        _pendingBundleLock.lock();
+        try {
+            boolean shouldWake = false;
+            if (_curSize > sizeLimit) {
+                shouldWake = true;
+                long started = System.currentTimeMillis();
+                while (_curSize > sizeLimit)
+                    _flushCondition.await();
+                long waited = System.currentTimeMillis() - started;
+                _waitedTotal.addAndGet(waited);
+                if (Log.isTraceEnabled())
+                    Log.tracev("Thread {0} waited for tx bundle for {1} ms", Thread.currentThread().getName(), waited);
             }
 
-            synchronized (_pendingBundles) {
-                synchronized (_flushWaitSynchronizer) {
-                    if (currentSize > sizeLimit) {
-                        if (!_pendingBundles.isEmpty() && _pendingBundles.peek()._ready) {
-                            var target = _pendingBundles.poll();
+            var oursId = _lastCommittedId.incrementAndGet();
 
-                            long diff = -target.size();
-                            while (!_pendingBundles.isEmpty() && _pendingBundles.peek()._ready) {
-                                var toCompress = _pendingBundles.poll();
-                                diff -= toCompress.size();
-                                target.compress(toCompress);
-                            }
-                            diff += target.size();
-                            currentSize += diff;
-                            _pendingBundles.addFirst(target);
-                        }
+            var curBundle = _pendingBundle;
+            int oldSize = 0;
+            if (curBundle != null) {
+                oldSize = curBundle.size();
+                curBundle.setId(oursId);
+            } else {
+                curBundle = new TxBundle(oursId);
+            }
+
+            var curPw = _pendingWrites.get();
+            var curPwMap = curPw.pendingWrites();
+
+            for (var action : writes) {
+                var key = action.key();
+                switch (action) {
+                    case TxRecord.TxObjectRecordWrite<?> write -> {
+//                            Log.tracev("Flushing object {0}", write.key());
+                        var wrapper = new JDataVersionedWrapperImpl(write.data(), oursId);
+                        curPwMap = curPwMap.plus(key, new PendingWrite(wrapper, oursId));
+                        curBundle.commit(wrapper);
                     }
-
-                    if (currentSize > sizeLimit) {
-                        wait = true;
-                        continue;
+                    case TxRecord.TxObjectRecordDeleted deleted -> {
+//                            Log.tracev("Deleting object {0}", deleted.key());
+                        curPwMap = curPwMap.plus(key, new PendingDelete(key, oursId));
+                        curBundle.delete(key);
                     }
                 }
-
-                TxBundle bundle;
-                synchronized (_notFlushedBundles) {
-                    bundle = new TxBundle(_lastCommittedId.incrementAndGet());
-                    _pendingBundles.addLast(bundle);
-                    _notFlushedBundles.put(bundle.id(), bundle);
-                }
-
-                for (var action : writes) {
-                    switch (action) {
-                        case TxRecord.TxObjectRecordWrite<?> write -> {
-                            Log.tracev("Flushing object {0}", write.key());
-                            bundle.commit(new JDataVersionedWrapperImpl(write.data(), bundle.id()));
-                        }
-                        case TxRecord.TxObjectRecordDeleted deleted -> {
-                            Log.tracev("Deleting object {0}", deleted.key());
-                            bundle.delete(deleted.key());
-                        }
-                        default -> {
-                            throw new TxCommitException("Unexpected value: " + action.key());
-                        }
-                    }
-                }
-
-                while (true) {
-                    var curPw = _pendingWrites.get();
-                    var curPwMap = curPw.pendingWrites();
-                    for (var e : ((TxBundle) bundle)._entries.values()) {
-                        switch (e) {
-                            case TxBundle.CommittedEntry c -> {
-                                curPwMap = curPwMap.plus(c.key(), new PendingWrite(c.data, bundle.id()));
-                            }
-                            case TxBundle.DeletedEntry d -> {
-                                curPwMap = curPwMap.plus(d.key(), new PendingDelete(d.key, bundle.id()));
-                            }
-                            default -> throw new IllegalStateException("Unexpected value: " + e);
-                        }
-                    }
-                    // Now, make the changes visible to new iterators
-                    var newCurPw = new PendingWriteData(
-                            curPwMap,
-                            curPw.lastFlushedId(),
-                            bundle.id()
-                    );
-
-                    if (!_pendingWrites.compareAndSet(curPw, newCurPw))
-                        continue;
-
-                    ((TxBundle) bundle).setReady();
-                    if (_pendingBundles.peek() == bundle)
-                        _pendingBundles.notify();
-                    synchronized (_flushWaitSynchronizer) {
-                        currentSize += ((TxBundle) bundle).size();
-                    }
-
-                    return bundle.id();
-                }
             }
+            // Now, make the changes visible to new iterators
+            var newCurPw = new PendingWriteData(
+                    curPwMap,
+                    curPw.lastFlushedId(),
+                    oursId
+            );
+
+            _pendingWrites.compareAndSet(curPw, newCurPw);
+
+            _pendingBundle = curBundle;
+            _newBundleCondition.signalAll();
+
+            _curSize += (curBundle.size() - oldSize);
+
+            if (shouldWake && _curSize < sizeLimit) {
+                _flushCondition.signal();
+            }
+
+            return oursId;
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        } finally {
+            _pendingBundleLock.unlock();
         }
     }
 
     public void asyncFence(long bundleId, Runnable fn) {
         verifyReady();
         if (bundleId < 0) throw new IllegalArgumentException("txId should be >0!");
-        if (_lastWrittenId.get() >= bundleId) {
+        if (_lastFlushedId.get() >= bundleId) {
             fn.run();
             return;
         }
-        synchronized (_notFlushedBundles) {
-            if (_lastWrittenId.get() >= bundleId) {
+        _pendingBundleLock.lock();
+        try {
+            if (_lastFlushedId.get() >= bundleId) {
                 fn.run();
                 return;
             }
-            _notFlushedBundles.get(bundleId).addCallback(fn);
+            var pendingBundle = _pendingBundle;
+            if (pendingBundle == null) {
+                fn.run();
+                return;
+            }
+            pendingBundle.addCallback(fn);
+        } finally {
+            _pendingBundleLock.unlock();
         }
     }
 
@@ -350,10 +321,8 @@ public class WritebackObjectPersistentStore {
                 private final long txId = finalPw.lastCommittedId();
 
                 @Override
-                public CloseableKvIterator<JObjectKey, JDataVersionedWrapper> getIterator(IteratorStart start, JObjectKey key) {
-                    return  TombstoneMergingKvIterator.<JObjectKey, JDataVersionedWrapper>of("writeback-ps", start, key,
-                            (tS, tK) -> new NavigableMapKvIterator<>(_pendingWrites, tS, tK),
-                            (tS, tK) -> (CloseableKvIterator<JObjectKey, MaybeTombstone<JDataVersionedWrapper>>) (CloseableKvIterator<JObjectKey, ?>) _cache.getIterator(tS, tK));
+                public List<CloseableKvIterator<JObjectKey, MaybeTombstone<JDataVersionedWrapper>>> getIterator(IteratorStart start, JObjectKey key) {
+                    return ListUtils.prepend(new NavigableMapKvIterator<>(_pendingWrites, start, key), _cache.getIterator(start, key));
                 }
 
                 @Nonnull
@@ -390,41 +359,40 @@ public class WritebackObjectPersistentStore {
         }
     }
 
-    public interface VerboseReadResult {
+    private record PendingWriteData(TreePMap<JObjectKey, PendingWriteEntry> pendingWrites,
+                                    long lastFlushedId,
+                                    long lastCommittedId) {
     }
 
     private static class TxBundle {
-        private final LinkedHashMap<JObjectKey, BundleEntry> _entries = new LinkedHashMap<>();
+        private final HashMap<JObjectKey, BundleEntry> _entries = new HashMap<>();
         private final ArrayList<Runnable> _callbacks = new ArrayList<>();
+        private int _size = 0;
         private long _txId;
-        private volatile boolean _ready = false;
-        private long _size = 0;
-        private boolean _wasCommitted = false;
+
+        ArrayList<Runnable> callbacks() {
+            return _callbacks;
+        }
 
         private TxBundle(long txId) {
             _txId = txId;
         }
 
-        public long id() {
-            return _txId;
+        public void setId(long id) {
+            _txId = id;
         }
 
-        public void setReady() {
-            _ready = true;
+        public long id() {
+            return _txId;
+
         }
 
         public void addCallback(Runnable callback) {
-            synchronized (_callbacks) {
-                if (_wasCommitted) throw new IllegalStateException();
-                _callbacks.add(callback);
-            }
+            _callbacks.add(callback);
         }
 
-        public List<Runnable> setCommitted() {
-            synchronized (_callbacks) {
-                _wasCommitted = true;
-                return Collections.unmodifiableList(_callbacks);
-            }
+        public int size() {
+            return _size;
         }
 
         private void putEntry(BundleEntry entry) {
@@ -443,28 +411,7 @@ public class WritebackObjectPersistentStore {
             putEntry(new DeletedEntry(obj));
         }
 
-        public long size() {
-            return _size;
-        }
-
-        public void compress(TxBundle other) {
-            if (_txId >= other._txId)
-                throw new IllegalArgumentException("Compressing an older bundle into newer");
-
-            _txId = other._txId;
-
-            for (var entry : other._entries.values()) {
-                putEntry(entry);
-            }
-
-            synchronized (_callbacks) {
-                assert !_wasCommitted;
-                assert !other._wasCommitted;
-                _callbacks.addAll(other._callbacks);
-            }
-        }
-
-        private interface BundleEntry {
+        private sealed interface BundleEntry permits CommittedEntry, DeletedEntry {
             JObjectKey key();
 
             int size();
@@ -482,10 +429,4 @@ public class WritebackObjectPersistentStore {
             }
         }
     }
-
-    public record VerboseReadResultPersisted(Optional<JDataVersionedWrapper> data) implements VerboseReadResult {
-    }
-
-    public record VerboseReadResultPending(PendingWriteEntry pending) implements VerboseReadResult {
-    }
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/CurrentTransaction.java

@@ -4,7 +4,6 @@ import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.CloseableKvIterator;
 import com.usatiuk.objects.iterators.IteratorStart;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
@@ -26,8 +25,8 @@ public class CurrentTransaction implements Transaction {
     }
 
     @Override
-    public <T extends JData> Optional<T> get(Class<T> type, JObjectKey key, LockingStrategy strategy) {
-        return transactionManager.current().get(type, key, strategy);
+    public <T extends JData> Optional<T> get(Class<T> type, JObjectKey key) {
+        return transactionManager.current().get(type, key);
     }
 
     @Override
@@ -44,4 +43,9 @@ public class CurrentTransaction implements Transaction {
     public <T extends JData> void put(JData obj) {
         transactionManager.current().put(obj);
     }
+
+    @Override
+    public <T extends JData> void putNew(JData obj) {
+        transactionManager.current().putNew(obj);
+    }
 }

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

@@ -1,280 +0,0 @@
-package com.usatiuk.objects.transaction;
-
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
-import com.usatiuk.objects.JData;
-import com.usatiuk.objects.JDataVersionedWrapper;
-import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.objects.snapshot.Snapshot;
-import com.usatiuk.objects.stores.WritebackObjectPersistentStore;
-import io.quarkus.logging.Log;
-import io.quarkus.runtime.StartupEvent;
-import jakarta.annotation.Priority;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.event.Observes;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-@ApplicationScoped
-public class JObjectManager {
-    private final List<PreCommitTxHook> _preCommitTxHooks;
-
-    private record CommitHookIterationData(PreCommitTxHook hook,
-                                           Map<JObjectKey, TxRecord.TxObjectRecord<?>> lastWrites,
-                                           Map<JObjectKey, TxRecord.TxObjectRecord<?>> pendingWrites) {
-    }
-
-    @Inject
-    WritebackObjectPersistentStore writebackObjectPersistentStore;
-    @Inject
-    TransactionFactory transactionFactory;
-    @Inject
-    LockManager lockManager;
-    private boolean _ready = false;
-
-    JObjectManager(Instance<PreCommitTxHook> preCommitTxHooks) {
-        _preCommitTxHooks = List.copyOf(preCommitTxHooks.stream().sorted(Comparator.comparingInt(PreCommitTxHook::getPriority)).toList());
-        Log.debugv("Pre-commit hooks: {0}", String.join("->", _preCommitTxHooks.stream().map(Objects::toString).toList()));
-    }
-
-    private void verifyReady() {
-        if (!_ready) throw new IllegalStateException("Wrong service order!");
-    }
-
-    void init(@Observes @Priority(200) StartupEvent event) {
-        _ready = true;
-    }
-
-    public TransactionPrivate createTransaction() {
-        verifyReady();
-        var tx = transactionFactory.createTransaction();
-        Log.tracev("Created transaction with snapshotId={0}", tx.snapshot().id());
-        return tx;
-    }
-
-    public Pair<Collection<Runnable>, TransactionHandle> commit(TransactionPrivate tx) {
-        verifyReady();
-        var writes = new HashMap<JObjectKey, TxRecord.TxObjectRecord<?>>();
-        Snapshot<JObjectKey, JDataVersionedWrapper> commitSnapshot = null;
-        Map<JObjectKey, TransactionObject<?>> readSet = null;
-        Collection<AutoCloseableNoThrow> toUnlock = null;
-
-        try {
-            try {
-                long pendingCount = 0;
-                List<CommitHookIterationData> hookIterationData;
-                {
-                    CommitHookIterationData[] hookIterationDataArray = new CommitHookIterationData[_preCommitTxHooks.size()];
-                    for (int i = 0; i < _preCommitTxHooks.size(); i++) {
-                        var hook = _preCommitTxHooks.get(i);
-                        hookIterationDataArray[i] = new CommitHookIterationData(hook, new HashMap<>(), new HashMap<>());
-                    }
-                    hookIterationData = List.of(hookIterationDataArray);
-                }
-
-                for (var n : tx.drainNewWrites()) {
-                    for (var hookPut : hookIterationData) {
-                        hookPut.pendingWrites().put(n.key(), n);
-                        pendingCount++;
-                    }
-                    writes.put(n.key(), n);
-                }
-
-                // Run hooks for all objects
-                // Every hook should see every change made to every object, yet the object's evolution
-                // should be consistent from the view point of each individual hook
-                // For example, when a hook makes changes to an object, and another hook changes the object before/after it
-                // on the next iteration, the first hook should receive the version of the object it had created
-                // as the "old" version, and the new version with all the changes after it.
-                while (pendingCount > 0) {
-                    for (var hookId : hookIterationData) {
-                        var hook = hookId.hook();
-                        var lastCurHookSeen = hookId.lastWrites();
-                        Function<JObjectKey, JData> getPrev =
-                                key -> switch (lastCurHookSeen.get(key)) {
-                                    case TxRecord.TxObjectRecordWrite<?> write -> write.data();
-                                    case TxRecord.TxObjectRecordDeleted deleted -> null;
-                                    case null -> tx.getFromSource(JData.class, key).orElse(null);
-                                    default -> {
-                                        throw new TxCommitException("Unexpected value: " + writes.get(key));
-                                    }
-                                };
-
-                        var curIteration = hookId.pendingWrites();
-
-//                        Log.trace("Commit iteration with " + curIteration.size() + " records for hook " + hook.getClass());
-
-                        for (var entry : curIteration.entrySet()) {
-//                            Log.trace("Running pre-commit hook " + hook.getClass() + " for" + entry.getKey());
-                            var oldObj = getPrev.apply(entry.getKey());
-                            lastCurHookSeen.put(entry.getKey(), entry.getValue());
-                            switch (entry.getValue()) {
-                                case TxRecord.TxObjectRecordWrite<?> write -> {
-                                    if (oldObj == null) {
-                                        hook.onCreate(write.key(), write.data());
-                                    } else {
-                                        hook.onChange(write.key(), oldObj, write.data());
-                                    }
-                                }
-                                case TxRecord.TxObjectRecordDeleted deleted -> {
-                                    hook.onDelete(deleted.key(), oldObj);
-                                }
-                                default -> throw new TxCommitException("Unexpected value: " + entry);
-                            }
-                        }
-
-                        pendingCount -= curIteration.size();
-                        curIteration.clear();
-
-                        for (var n : tx.drainNewWrites()) {
-                            for (var hookPut : hookIterationData) {
-                                if (hookPut == hookId) {
-                                    lastCurHookSeen.put(n.key(), n);
-                                    continue;
-                                }
-                                var before = hookPut.pendingWrites().put(n.key(), n);
-                                if (before == null)
-                                    pendingCount++;
-                            }
-                            writes.put(n.key(), n);
-                        }
-                    }
-                }
-            } catch (Throwable e) {
-                for (var read : tx.reads().entrySet()) {
-                    if (read.getValue() instanceof TransactionObjectLocked<?> locked) {
-                        locked.lock().close();
-                    }
-                }
-                throw e;
-            }
-
-            readSet = tx.reads();
-
-            if (!writes.isEmpty()) {
-                toUnlock = new ArrayList<>(readSet.size() + writes.size());
-                ArrayList<JObjectKey> toLock = new ArrayList<>(readSet.size() + writes.size());
-                for (var read : readSet.entrySet()) {
-                    if (read.getValue() instanceof TransactionObjectLocked<?> locked) {
-                        toUnlock.add(locked.lock());
-                    } else {
-                        toLock.add(read.getKey());
-                    }
-                }
-                for (var write : writes.entrySet()) {
-                    toLock.add(write.getKey());
-                }
-                Collections.sort(toLock);
-                for (var key : toLock) {
-                    var lock = lockManager.lockObject(key);
-                    toUnlock.add(lock);
-                }
-
-                commitSnapshot = writebackObjectPersistentStore.getSnapshot();
-            } else {
-                Log.trace("Committing transaction - no changes");
-
-                long version = 0L;
-
-                for (var read : readSet.values()) {
-                    version = Math.max(version, read.data().map(JDataVersionedWrapper::version).orElse(0L));
-                    if (read instanceof TransactionObjectLocked<?> locked) {
-                        locked.lock().close();
-                    }
-                }
-
-                long finalVersion = version;
-                Consumer<Runnable> fenceFn = r -> {
-                    writebackObjectPersistentStore.asyncFence(finalVersion, r);
-                };
-
-                return Pair.of(
-                        Stream.concat(
-                                tx.getOnCommit().stream(),
-                                Stream.<Runnable>of(() -> {
-                                    for (var f : tx.getOnFlush())
-                                        fenceFn.accept(f);
-                                })
-                        ).toList(),
-                        new TransactionHandle() {
-                            @Override
-                            public void onFlush(Runnable runnable) {
-                                fenceFn.accept(runnable);
-                            }
-                        });
-            }
-
-            Log.trace("Committing transaction start");
-            var snapshotId = tx.snapshot().id();
-
-            if (snapshotId != commitSnapshot.id()) {
-                for (var read : readSet.entrySet()) {
-                    var current = commitSnapshot.readObject(read.getKey());
-
-                    if (current.isEmpty() != read.getValue().data().isEmpty()) {
-                        Log.tracev("Checking read dependency {0} - not found", read.getKey());
-                        throw new TxCommitException("Serialization hazard: " + current.isEmpty() + " vs " + read.getValue().data().isEmpty());
-                    }
-
-                    if (current.isEmpty()) {
-                        // TODO: Every write gets a dependency due to hooks
-                        continue;
-//                    assert false;
-//                    throw new TxCommitException("Serialization hazard: " + dep.isEmpty() + " vs " + read.getValue().value().isEmpty());
-                    }
-
-                    if (current.get().version() > snapshotId) {
-                        Log.tracev("Checking dependency {0} - newer than", read.getKey());
-                        throw new TxCommitException("Serialization hazard: " + current.get().data().key() + " " + current.get().version() + " vs " + snapshotId);
-                    }
-
-                    Log.tracev("Checking dependency {0} - ok with read", read.getKey());
-                }
-            } else {
-                Log.tracev("Skipped dependency checks: no changes");
-            }
-
-            var addFlushCallback = writebackObjectPersistentStore.commitTx(writes.values());
-
-            // TODO: is it ok to possibly run it inside transaction?
-            for (var callback : tx.getOnFlush()) {
-                addFlushCallback.accept(callback);
-            }
-
-            return Pair.of(
-                    List.copyOf(tx.getOnCommit()),
-                    new TransactionHandle() {
-                        @Override
-                        public void onFlush(Runnable runnable) {
-                            addFlushCallback.accept(runnable);
-                        }
-                    });
-        } catch (Throwable t) {
-            Log.trace("Error when committing transaction", t);
-            throw new TxCommitException(t.getMessage(), t);
-        } finally {
-            if (toUnlock != null)
-                for (var unlock : toUnlock) {
-                    unlock.close();
-                }
-            if (commitSnapshot != null)
-                commitSnapshot.close();
-            tx.close();
-        }
-    }
-
-    public void rollback(TransactionPrivate tx) {
-        verifyReady();
-        tx.reads().forEach((key, value) -> {
-            if (value instanceof TransactionObjectLocked<?> locked) {
-                locked.lock().close();
-            }
-        });
-        tx.close();
-    }
-}

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java

@@ -1,24 +0,0 @@
-package com.usatiuk.objects.transaction;
-
-import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
-import com.usatiuk.dhfs.utils.DataLocker;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Singleton;
-
-@Singleton
-public class LockManager {
-    private final DataLocker _objLocker = new DataLocker();
-
-    @Nonnull
-    public AutoCloseableNoThrow lockObject(JObjectKey key) {
-        return _objLocker.lock(key);
-    }
-
-    @Nullable
-    public AutoCloseableNoThrow tryLockObject(JObjectKey key) {
-        return _objLocker.tryLock(key);
-    }
-}

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockingStrategy.java

@@ -1,6 +0,0 @@
-package com.usatiuk.objects.transaction;
-
-public enum LockingStrategy {
-    OPTIMISTIC,           // Optimistic write, no blocking other possible writers/readers
-    WRITE,                // Write lock, blocks all other writers
-}

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/Transaction.java

@@ -11,16 +11,13 @@ import java.util.Optional;
 public interface Transaction extends TransactionHandle {
     void onCommit(Runnable runnable);
 
-    <T extends JData> Optional<T> get(Class<T> type, JObjectKey key, LockingStrategy strategy);
+    <T extends JData> Optional<T> get(Class<T> type, JObjectKey key);
 
     <T extends JData> void put(JData obj);
+    <T extends JData> void putNew(JData obj);
 
     void delete(JObjectKey key);
 
-    default <T extends JData> Optional<T> get(Class<T> type, JObjectKey key) {
-        return get(type, key, LockingStrategy.OPTIMISTIC);
-    }
-
     CloseableKvIterator<JObjectKey, JData> getIterator(IteratorStart start, JObjectKey key);
 
     default CloseableKvIterator<JObjectKey, JData> getIterator(JObjectKey key) {

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactory.java

@@ -1,5 +0,0 @@
-package com.usatiuk.objects.transaction;
-
-public interface TransactionFactory {
-    TransactionPrivate createTransaction();
-}

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactoryImpl.java

@@ -1,264 +0,0 @@
-package com.usatiuk.objects.transaction;
-
-import com.usatiuk.objects.JData;
-import com.usatiuk.objects.JDataVersionedWrapper;
-import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.objects.iterators.*;
-import com.usatiuk.objects.snapshot.Snapshot;
-import com.usatiuk.objects.stores.WritebackObjectPersistentStore;
-import io.quarkus.logging.Log;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import org.apache.commons.lang3.tuple.Pair;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
-import java.util.*;
-
-@Singleton
-public class TransactionFactoryImpl implements TransactionFactory {
-    @Inject
-    WritebackObjectPersistentStore writebackObjectPersistentStore;
-    @Inject
-    LockManager lockManager;
-    @ConfigProperty(name = "dhfs.objects.transaction.never-lock")
-    boolean neverLock;
-
-    @Override
-    public TransactionPrivate createTransaction() {
-        return new TransactionImpl();
-    }
-
-    private interface ReadTrackingInternalCrap {
-        boolean fromSource();
-
-        JData obj();
-    }
-
-    // FIXME:
-    private record ReadTrackingInternalCrapSource(JDataVersionedWrapper wrapped) implements ReadTrackingInternalCrap {
-        @Override
-        public boolean fromSource() {
-            return true;
-        }
-
-        @Override
-        public JData obj() {
-            return wrapped.data();
-        }
-    }
-
-    private record ReadTrackingInternalCrapTx(JData obj) implements ReadTrackingInternalCrap {
-        @Override
-        public boolean fromSource() {
-            return false;
-        }
-    }
-
-    private class TransactionImpl implements TransactionPrivate {
-        private final Map<JObjectKey, TransactionObject<?>> _readSet = new HashMap<>();
-        private final NavigableMap<JObjectKey, TxRecord.TxObjectRecord<?>> _writes = new TreeMap<>();
-        private final List<Runnable> _onCommit = new ArrayList<>();
-        private final List<Runnable> _onFlush = new ArrayList<>();
-        private final Snapshot<JObjectKey, JDataVersionedWrapper> _snapshot;
-        private boolean _closed = false;
-        private Map<JObjectKey, TxRecord.TxObjectRecord<?>> _newWrites = new HashMap<>();
-
-        private TransactionImpl() {
-            _snapshot = writebackObjectPersistentStore.getSnapshot();
-        }
-
-        @Override
-        public void onCommit(Runnable runnable) {
-            _onCommit.add(runnable);
-        }
-
-        @Override
-        public void onFlush(Runnable runnable) {
-            _onFlush.add(runnable);
-        }
-
-        @Override
-        public Collection<Runnable> getOnCommit() {
-            return Collections.unmodifiableCollection(_onCommit);
-        }
-
-        @Override
-        public Snapshot<JObjectKey, JDataVersionedWrapper> snapshot() {
-            return _snapshot;
-        }
-
-        @Override
-        public Collection<Runnable> getOnFlush() {
-            return Collections.unmodifiableCollection(_onFlush);
-        }
-
-        @Override
-        public <T extends JData> Optional<T> getFromSource(Class<T> type, JObjectKey key) {
-            return _readSet.computeIfAbsent(key, k -> {
-                        var read = _snapshot.readObject(k);
-                        return new TransactionObjectNoLock<>(read);
-                    })
-                    .data()
-                    .map(w -> type.cast(w.data()));
-        }
-
-        public <T extends JData> Optional<T> getWriteLockedFromSource(Class<T> type, JObjectKey key) {
-            var got = _readSet.get(key);
-
-            if (got == null) {
-                var lock = lockManager.lockObject(key);
-                try {
-                    var read = _snapshot.readObject(key);
-                    _readSet.put(key, new TransactionObjectLocked<>(read, lock));
-                    return read.map(JDataVersionedWrapper::data).map(type::cast);
-                } catch (Exception e) {
-                    lock.close();
-                    throw e;
-                }
-            }
-
-            return got.data().map(JDataVersionedWrapper::data).map(type::cast);
-        }
-
-        @Override
-        public <T extends JData> Optional<T> get(Class<T> type, JObjectKey key, LockingStrategy strategy) {
-            switch (_writes.get(key)) {
-                case TxRecord.TxObjectRecordWrite<?> write -> {
-                    return Optional.of(type.cast(write.data()));
-                }
-                case TxRecord.TxObjectRecordDeleted deleted -> {
-                    return Optional.empty();
-                }
-                case null, default -> {
-                }
-            }
-
-            if (neverLock)
-                return getFromSource(type, key);
-
-            return switch (strategy) {
-                case OPTIMISTIC -> getFromSource(type, key);
-                case WRITE -> getWriteLockedFromSource(type, key);
-            };
-        }
-
-        @Override
-        public void delete(JObjectKey key) {
-            var got = _writes.get(key);
-            if (got != null) {
-                if (got instanceof TxRecord.TxObjectRecordDeleted) {
-                    return;
-                }
-            }
-
-            _writes.put(key, new TxRecord.TxObjectRecordDeleted(key));
-            _newWrites.put(key, new TxRecord.TxObjectRecordDeleted(key));
-        }
-
-        @Override
-        public CloseableKvIterator<JObjectKey, JData> getIterator(IteratorStart start, JObjectKey key) {
-            Log.tracev("Getting tx iterator with start={0}, key={1}", start, key);
-            return new ReadTrackingIterator(TombstoneMergingKvIterator.<JObjectKey, ReadTrackingInternalCrap>of("tx", start, key,
-                    (tS, tK) -> new MappingKvIterator<>(new NavigableMapKvIterator<>(_writes, tS, tK),
-                            t -> switch (t) {
-                                case TxRecord.TxObjectRecordWrite<?> write ->
-                                        new DataWrapper<>(new ReadTrackingInternalCrapTx(write.data()));
-                                case TxRecord.TxObjectRecordDeleted deleted -> new TombstoneImpl<>();
-                                case null, default -> null;
-                            }),
-                    (tS, tK) -> new MappingKvIterator<>(_snapshot.getIterator(tS, tK),
-                            d -> new DataWrapper<ReadTrackingInternalCrap>(new ReadTrackingInternalCrapSource(d)))));
-        }
-
-        @Override
-        public void put(JData obj) {
-            var read = _readSet.get(obj.key());
-            if (read != null && (read.data().map(JDataVersionedWrapper::data).orElse(null) == obj)) {
-                return;
-            }
-
-            _writes.put(obj.key(), new TxRecord.TxObjectRecordWrite<>(obj));
-            _newWrites.put(obj.key(), new TxRecord.TxObjectRecordWrite<>(obj));
-        }
-
-        @Override
-        public Collection<TxRecord.TxObjectRecord<?>> drainNewWrites() {
-            var ret = _newWrites;
-            _newWrites = new HashMap<>();
-            return ret.values();
-        }
-
-        @Override
-        public Map<JObjectKey, TransactionObject<?>> reads() {
-            return Collections.unmodifiableMap(_readSet);
-        }
-
-        @Override
-        public void close() {
-            if (_closed) return;
-            _closed = true;
-            _snapshot.close();
-        }
-
-        private class ReadTrackingIterator implements CloseableKvIterator<JObjectKey, JData> {
-            private final CloseableKvIterator<JObjectKey, ReadTrackingInternalCrap> _backing;
-
-            public ReadTrackingIterator(CloseableKvIterator<JObjectKey, ReadTrackingInternalCrap> backing) {
-                _backing = backing;
-            }
-
-            @Override
-            public JObjectKey peekNextKey() {
-                return _backing.peekNextKey();
-            }
-
-            @Override
-            public void skip() {
-                _backing.skip();
-            }
-
-            @Override
-            public JObjectKey peekPrevKey() {
-                return _backing.peekPrevKey();
-            }
-
-            @Override
-            public Pair<JObjectKey, JData> prev() {
-                var got = _backing.prev();
-                if (got.getValue() instanceof ReadTrackingInternalCrapSource(JDataVersionedWrapper wrapped)) {
-                    _readSet.putIfAbsent(got.getKey(), new TransactionObjectNoLock<>(Optional.of(wrapped)));
-                }
-                return Pair.of(got.getKey(), got.getValue().obj());
-            }
-
-            @Override
-            public boolean hasPrev() {
-                return _backing.hasPrev();
-            }
-
-            @Override
-            public void skipPrev() {
-                _backing.skipPrev();
-            }
-
-            @Override
-            public void close() {
-                _backing.close();
-            }
-
-            @Override
-            public boolean hasNext() {
-                return _backing.hasNext();
-            }
-
-            @Override
-            public Pair<JObjectKey, JData> next() {
-                var got = _backing.next();
-                if (got.getValue() instanceof ReadTrackingInternalCrapSource(JDataVersionedWrapper wrapped)) {
-                    _readSet.putIfAbsent(got.getKey(), new TransactionObjectNoLock<>(Optional.of(wrapped)));
-                }
-                return Pair.of(got.getKey(), got.getValue().obj());
-            }
-        }
-    }
-}

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionHandlePrivate.java

@@ -1,7 +0,0 @@
-package com.usatiuk.objects.transaction;
-
-import java.util.Collection;
-
-public interface TransactionHandlePrivate extends TransactionHandle {
-    Collection<Runnable> getOnFlush();
-}