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

Objects: a bunch of moving around

Browse Source
This commit is contained in:
Stepan Usatiuk
2025-03-14 22:39:54 +01:00
parent 0aca2c5dbb
commit 667f8b3b42
66 changed files with 118 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CloseableKvIterator.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/CloseableKvIterator.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
import org.apache.commons.lang3.tuple.Pair;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/Data.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Data.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import java.util.Optional;

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/IterProdFn.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IterProdFn.java
View File

@@ -1,6 +1,5 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
@FunctionalInterface

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/IteratorStart.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IteratorStart.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects.persistence;
package com.usatiuk.dhfs.objects.iterators;
public enum IteratorStart {
LT,

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/KeyPredicateKvIterator.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIterator.java
View File

@@ -1,6 +1,5 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import org.apache.commons.lang3.tuple.Pair;
import java.util.NoSuchElementException;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MappingKvIterator.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MappingKvIterator.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import org.apache.commons.lang3.tuple.Pair;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MaybeTombstone.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MaybeTombstone.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import java.util.Optional;

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MergingKvIterator.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MergingKvIterator.java
View File

@@ -1,6 +1,5 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import io.quarkus.logging.Log;
import org.apache.commons.lang3.tuple.Pair;

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/NavigableMapKvIterator.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIterator.java
View File

@@ -1,6 +1,5 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import org.apache.commons.lang3.tuple.Pair;
import java.util.*;

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PredicateKvIterator.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIterator.java
View File

@@ -1,6 +1,5 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import io.quarkus.logging.Log;
import org.apache.commons.lang3.tuple.Pair;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ReversedKvIterator.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversedKvIterator.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import org.apache.commons.lang3.tuple.Pair;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ReversibleKvIterator.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversibleKvIterator.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import org.apache.commons.lang3.tuple.Pair;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/Tombstone.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Tombstone.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import java.util.Optional;

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TombstoneMergingKvIterator.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/TombstoneMergingKvIterator.java
View File

@@ -1,6 +1,5 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import io.quarkus.logging.Log;
import org.apache.commons.lang3.tuple.Pair;

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

@@ -1,9 +1,9 @@
package com.usatiuk.dhfs.objects.snapshot;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
import io.quarkus.logging.Log;
import javax.annotation.Nonnull;
import java.util.Optional;

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIterator.java
View File

@@ -1,7 +1,8 @@
package com.usatiuk.dhfs.objects.snapshot;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.*;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import io.quarkus.logging.Log;
import org.apache.commons.lang3.tuple.Pair;

10
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotManager.java
View File

@@ -1,21 +1,13 @@
package com.usatiuk.dhfs.objects.snapshot;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.stores.WritebackObjectPersistentStore;
import com.usatiuk.dhfs.objects.transaction.TxRecord;
import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.commons.lang3.tuple.Pair;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.pcollections.TreePMap;
import javax.annotation.Nonnull;
import java.lang.ref.Cleaner;
import java.util.*;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Consumer;
@ApplicationScoped

4
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/CachingObjectPersistentStore.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/CachingObjectPersistentStore.java
View File

@@ -1,7 +1,9 @@
package com.usatiuk.dhfs.objects.persistence;
package com.usatiuk.dhfs.objects.stores;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.iterators.*;
import com.usatiuk.dhfs.objects.snapshot.Snapshot;
import com.usatiuk.dhfs.objects.transaction.LockManager;
import io.quarkus.logging.Log;
import io.quarkus.runtime.Startup;
import jakarta.enterprise.context.ApplicationScoped;

9
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/LmdbObjectPersistentStore.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/LmdbObjectPersistentStore.java
View File

@@ -1,10 +1,11 @@
package com.usatiuk.dhfs.objects.persistence;
package com.usatiuk.dhfs.objects.stores;
import com.google.protobuf.ByteString;
import com.usatiuk.dhfs.objects.CloseableKvIterator;
import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.KeyPredicateKvIterator;
import com.usatiuk.dhfs.objects.ReversibleKvIterator;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.KeyPredicateKvIterator;
import com.usatiuk.dhfs.objects.iterators.ReversibleKvIterator;
import com.usatiuk.dhfs.objects.snapshot.Snapshot;
import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer;
import com.usatiuk.dhfs.utils.RefcountedCloseable;

10
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/MemoryObjectPersistentStore.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/MemoryObjectPersistentStore.java
View File

@@ -1,19 +1,17 @@
package com.usatiuk.dhfs.objects.persistence;
package com.usatiuk.dhfs.objects.stores;
import com.google.protobuf.ByteString;
import com.usatiuk.dhfs.objects.CloseableKvIterator;
import com.usatiuk.dhfs.objects.IterProdFn;
import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.NavigableMapKvIterator;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.NavigableMapKvIterator;
import com.usatiuk.dhfs.objects.snapshot.Snapshot;
import io.quarkus.arc.properties.IfBuildProperty;
import jakarta.enterprise.context.ApplicationScoped;
import org.pcollections.TreePMap;
import javax.annotation.Nonnull;
import java.util.Collection;
import java.util.Optional;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Consumer;

7
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/ObjectPersistentStore.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/ObjectPersistentStore.java
View File

@@ -1,13 +1,12 @@
package com.usatiuk.dhfs.objects.persistence;
package com.usatiuk.dhfs.objects.stores;
import com.google.protobuf.ByteString;
import com.usatiuk.dhfs.objects.CloseableKvIterator;
import com.usatiuk.dhfs.objects.IterProdFn;
import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.snapshot.Snapshot;
import javax.annotation.Nonnull;
import java.util.Collection;
import java.util.Optional;
import java.util.function.Consumer;

4
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingDelete.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingDelete.java
View File

@@ -1,4 +1,6 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.stores;
import com.usatiuk.dhfs.objects.JObjectKey;
public record PendingDelete(JObjectKey key, long bundleId) implements PendingWriteEntry {
}

4
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingWrite.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWrite.java
View File

@@ -1,4 +1,6 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.stores;
import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
public record PendingWrite(JDataVersionedWrapper data, long bundleId) implements PendingWriteEntry {
}

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingWriteEntry.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWriteEntry.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.stores;
public interface PendingWriteEntry {
long bundleId();

11
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/SerializingObjectPersistentStore.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/SerializingObjectPersistentStore.java
View File

@@ -1,19 +1,16 @@
package com.usatiuk.dhfs.objects.persistence;
package com.usatiuk.dhfs.objects.stores;
import com.google.protobuf.ByteString;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.MappingKvIterator;
import com.usatiuk.dhfs.objects.snapshot.Snapshot;
import com.usatiuk.dhfs.utils.RefcountedCloseable;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.commons.lang3.tuple.Pair;
import org.lmdbjava.Txn;
import javax.annotation.Nonnull;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.Optional;
import java.util.function.Consumer;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifestObj.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestObj.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects.persistence;
package com.usatiuk.dhfs.objects.stores;
import com.usatiuk.dhfs.objects.JObjectKey;
import org.apache.commons.lang3.tuple.Pair;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifestRaw.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestRaw.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects.persistence;
package com.usatiuk.dhfs.objects.stores;
import com.google.protobuf.ByteString;
import com.usatiuk.dhfs.objects.JObjectKey;

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

@@ -1,9 +1,9 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.stores;
import com.usatiuk.dhfs.objects.persistence.CachingObjectPersistentStore;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.persistence.TxManifestObj;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.iterators.*;
import com.usatiuk.dhfs.objects.snapshot.Snapshot;
import com.usatiuk.dhfs.objects.transaction.TxCommitException;
import com.usatiuk.dhfs.objects.transaction.TxRecord;
import io.quarkus.logging.Log;
import io.quarkus.runtime.ShutdownEvent;

13
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CurrentTransaction.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/CurrentTransaction.java
View File

@@ -1,15 +1,12 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import java.util.Collection;
import java.util.Iterator;
import java.util.Optional;
@ApplicationScoped

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

@@ -1,7 +1,9 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.snapshot.SnapshotManager;
import com.usatiuk.dhfs.objects.transaction.*;
import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
import io.quarkus.logging.Log;
import io.quarkus.runtime.StartupEvent;

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/LockManager.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockManager.java
View File

@@ -1,5 +1,6 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
import com.usatiuk.dhfs.utils.DataLocker;
import jakarta.annotation.Nonnull;

5
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PreCommitTxHook.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/PreCommitTxHook.java
View File

@@ -1,4 +1,7 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
public interface PreCommitTxHook {
default void onChange(JObjectKey key, JData old, JData cur) {

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

@@ -1,9 +1,9 @@
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.CloseableKvIterator;
import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import java.util.Optional;

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

@@ -1,7 +1,8 @@
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.*;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.snapshot.Snapshot;
import com.usatiuk.dhfs.objects.snapshot.SnapshotManager;
import io.quarkus.logging.Log;
@@ -9,7 +10,6 @@ import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import java.util.*;
@ApplicationScoped

4
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionManager.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManager.java
View File

@@ -1,7 +1,5 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionHandle;
import com.usatiuk.dhfs.utils.VoidFn;
import io.quarkus.logging.Log;

5
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionManagerImpl.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManagerImpl.java
View File

@@ -1,8 +1,5 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionHandle;
import com.usatiuk.dhfs.objects.transaction.TransactionPrivate;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

5
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionObjectLocked.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectLocked.java
View File

@@ -1,6 +1,7 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionObject;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
import java.util.Optional;

5
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionObjectNoLock.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectNoLock.java
View File

@@ -1,6 +1,7 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionObject;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
import java.util.Optional;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxCommitException.java → dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxCommitException.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.transaction;
public class TxCommitException extends RuntimeException {
public TxCommitException(String message) {

4
dhfs-parent/objects/src/main/resources/application.properties
View File

@@ -5,4 +5,6 @@ dhfs.objects.lru.print-stats=true
dhfs.objects.lock_timeout_secs=15
dhfs.objects.persistence.files.root=${HOME}/dhfs_default/data/objs
quarkus.package.jar.decompiler.enabled=true
dhfs.objects.persistence.snapshot-extra-checks=false
dhfs.objects.persistence.snapshot-extra-checks=false
quarkus.log.category."com.usatiuk.dhfs.objects.iterators".level=INFO
quarkus.log.category."com.usatiuk.dhfs.objects.iterators".min-level=INFO

3
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestImpl.java
View File

@@ -1,9 +1,10 @@
package com.usatiuk.dhfs.objects;
import com.usatiuk.dhfs.objects.data.Parent;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import io.quarkus.logging.Log;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Assertions;

2
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java
View File

@@ -1,7 +1,9 @@
package com.usatiuk.dhfs.objects;
import com.usatiuk.dhfs.objects.data.Parent;
import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
import io.quarkus.test.junit.mockito.InjectSpy;

4
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/KeyPredicateKvIteratorTest.java → dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIteratorTest.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.Just;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

4
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/MergingKvIteratorTest.java → dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/MergingKvIteratorTest.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.Just;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

4
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/NavigableMapKvIteratorTest.java → dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIteratorTest.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.Just;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

4
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PredicateKvIteratorTest.java → dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIteratorTest.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.dhfs.objects.iterators;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.Just;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

3
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/persistence/LmdbKvIteratorTest.java → dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/stores/LmdbKvIteratorTest.java
View File

@@ -1,10 +1,11 @@
package com.usatiuk.dhfs.objects.persistence;
package com.usatiuk.dhfs.objects.stores;
import com.google.protobuf.ByteString;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.Just;
import com.usatiuk.dhfs.objects.TempDataProfile;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
import jakarta.inject.Inject;

3
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java
View File

@@ -13,9 +13,10 @@ import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaFil
import com.usatiuk.dhfs.objects.jmap.JMapEntry;
import com.usatiuk.dhfs.objects.jmap.JMapHelper;
import com.usatiuk.dhfs.objects.jmap.JMapLongKey;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import com.usatiuk.dhfs.utils.StatusRuntimeExceptionNoStacktrace;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;

1
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java
View File

@@ -1,5 +1,6 @@
package com.usatiuk.dhfs.objects;
import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;

1
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java
View File

@@ -1,5 +1,6 @@
package com.usatiuk.dhfs.objects;
import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;

1
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjPusherTxHook.java
View File

@@ -2,6 +2,7 @@ package com.usatiuk.dhfs.objects;
import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData;
import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService;
import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

1
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDeleter.java
View File

@@ -4,6 +4,7 @@ import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient;
import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo;
import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import com.usatiuk.dhfs.utils.HashSetDelayedBlockingQueue;
import io.quarkus.logging.Log;
import io.quarkus.runtime.ShutdownEvent;

2
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java
View File

@@ -2,7 +2,7 @@ package com.usatiuk.dhfs.objects.jkleppmanntree;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.PeerId;
import com.usatiuk.dhfs.objects.TransactionManager;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode;
import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaDirectory;

4
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHelper.java
View File

@@ -1,8 +1,8 @@
package com.usatiuk.dhfs.objects.jmap;
import com.usatiuk.dhfs.objects.CloseableKvIterator;
import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

3
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolderRefcounterTxHook.java
View File

@@ -1,7 +1,8 @@
package com.usatiuk.dhfs.objects.jmap;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;

2
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapIterator.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects.jmap;
import com.usatiuk.dhfs.objects.CloseableKvIterator;
import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import org.apache.commons.lang3.NotImplementedException;

1
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRefcounterTxHook.java
View File

@@ -1,6 +1,7 @@
package com.usatiuk.dhfs.objects.jmap;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;

2
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerManager.java
View File

@@ -1,7 +1,7 @@
package com.usatiuk.dhfs.objects.repository;
import com.usatiuk.dhfs.objects.PeerId;
import com.usatiuk.dhfs.objects.TransactionManager;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddress;
import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryDirectory;
import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo;

2
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java
View File

@@ -2,7 +2,7 @@ package com.usatiuk.dhfs.objects.repository;
import com.usatiuk.dhfs.ShutdownChecker;
import com.usatiuk.dhfs.objects.PeerId;
import com.usatiuk.dhfs.objects.TransactionManager;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
import com.usatiuk.dhfs.objects.repository.peertrust.PeerTrustManager;
import com.usatiuk.dhfs.objects.transaction.Transaction;

1
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceClient.java
View File

@@ -6,6 +6,7 @@ import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService;
import com.usatiuk.dhfs.objects.repository.invalidation.Op;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.quarkus.logging.Log;

1
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServer.java
View File

@@ -7,6 +7,7 @@ import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService
import com.usatiuk.dhfs.objects.repository.invalidation.Op;
import com.usatiuk.dhfs.objects.repository.invalidation.OpHandler;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.quarkus.grpc.GrpcService;

3
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java
View File

@@ -1,9 +1,10 @@
package com.usatiuk.dhfs.objects.repository;
import com.usatiuk.dhfs.objects.*;
import com.usatiuk.dhfs.objects.persistence.IteratorStart;
import com.usatiuk.dhfs.objects.iterators.IteratorStart;
import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

1
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/TemporaryReceivedObjectSerializer.java
View File

@@ -7,7 +7,6 @@ import com.usatiuk.dhfs.objects.ReceivedObject;
import com.usatiuk.dhfs.objects.persistence.JDataRemoteP;
import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
import com.usatiuk.dhfs.objects.persistence.PeerIdP;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.pcollections.HashTreePMap;

2
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpPusher.java
View File

@@ -3,7 +3,7 @@ package com.usatiuk.dhfs.objects.repository.invalidation;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.RemoteObjectMeta;
import com.usatiuk.dhfs.objects.RemoteTransaction;
import com.usatiuk.dhfs.objects.TransactionManager;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager;
import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData;
import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient;

2
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoService.java
View File

@@ -3,7 +3,7 @@ package com.usatiuk.dhfs.objects.repository.peersync;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.PeerId;
import com.usatiuk.dhfs.objects.RemoteTransaction;
import com.usatiuk.dhfs.objects.TransactionManager;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager;
import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode;
import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;

2
dhfs-parent/server/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java
View File

@@ -4,7 +4,7 @@ import com.usatiuk.dhfs.TempDataProfile;
import com.usatiuk.dhfs.files.objects.File;
import com.usatiuk.dhfs.files.service.DhfsFileService;
import com.usatiuk.dhfs.objects.RemoteTransaction;
import com.usatiuk.dhfs.objects.TransactionManager;
import com.usatiuk.dhfs.objects.transaction.TransactionManager;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.kleppmanntree.AlreadyExistsException;
import jakarta.inject.Inject;