diff --git a/dhfs-parent/objects-common/deployment/pom.xml b/dhfs-parent/objects-common/deployment/pom.xml deleted file mode 100644 index 36504616..00000000 --- a/dhfs-parent/objects-common/deployment/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - - com.usatiuk - objects-common-parent - 1.0-SNAPSHOT - - objects-common-deployment - DHFS objects common stuff - Deployment - - - - io.quarkus - quarkus-arc-deployment - - - com.usatiuk - objects-common - ${project.version} - - - io.quarkus - quarkus-junit5-internal - test - - - - - - - maven-compiler-plugin - - - default-compile - - - - io.quarkus - quarkus-extension-processor - ${quarkus.platform.version} - - - - - - - - - diff --git a/dhfs-parent/objects-common/deployment/src/main/java/com/usatiuk/objects/common/deployment/ObjectsCommonProcessor.java b/dhfs-parent/objects-common/deployment/src/main/java/com/usatiuk/objects/common/deployment/ObjectsCommonProcessor.java deleted file mode 100644 index e4316e72..00000000 --- a/dhfs-parent/objects-common/deployment/src/main/java/com/usatiuk/objects/common/deployment/ObjectsCommonProcessor.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.usatiuk.objects.common.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -class ObjectsCommonProcessor { - - private static final String FEATURE = "objects-common"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } -} diff --git a/dhfs-parent/objects-common/deployment/src/test/java/com/usatiuk/objects/common/test/ObjectsCommonDevModeTest.java b/dhfs-parent/objects-common/deployment/src/test/java/com/usatiuk/objects/common/test/ObjectsCommonDevModeTest.java deleted file mode 100644 index 78fbe4f7..00000000 --- a/dhfs-parent/objects-common/deployment/src/test/java/com/usatiuk/objects/common/test/ObjectsCommonDevModeTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.usatiuk.objects.common.test; - -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -import io.quarkus.test.QuarkusDevModeTest; - -public class ObjectsCommonDevModeTest { - - // Start hot reload (DevMode) test with your extension loaded - @RegisterExtension - static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); - - @Test - public void writeYourOwnDevModeTest() { - // Write your dev mode tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information - Assertions.assertTrue(true, "Add dev mode assertions to " + getClass().getName()); - } -} diff --git a/dhfs-parent/objects-common/deployment/src/test/java/com/usatiuk/objects/common/test/ObjectsCommonTest.java b/dhfs-parent/objects-common/deployment/src/test/java/com/usatiuk/objects/common/test/ObjectsCommonTest.java deleted file mode 100644 index c74a2c67..00000000 --- a/dhfs-parent/objects-common/deployment/src/test/java/com/usatiuk/objects/common/test/ObjectsCommonTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.usatiuk.objects.common.test; - -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -import io.quarkus.test.QuarkusUnitTest; - -public class ObjectsCommonTest { - - // Start unit test with your extension loaded - @RegisterExtension - static final QuarkusUnitTest unitTest = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); - - @Test - public void writeYourOwnUnitTest() { - // Write your unit tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information - Assertions.assertTrue(true, "Add some assertions to " + getClass().getName()); - } -} diff --git a/dhfs-parent/objects-common/integration-tests/pom.xml b/dhfs-parent/objects-common/integration-tests/pom.xml deleted file mode 100644 index 80313213..00000000 --- a/dhfs-parent/objects-common/integration-tests/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - 4.0.0 - - - com.usatiuk - objects-common-parent - 1.0-SNAPSHOT - - objects-common-integration-tests - DHFS objects common stuff - Integration Tests - - - true - - - - - com.usatiuk - objects-common - ${project.version} - - - com.usatiuk - objects-common-deployment - ${project.version} - - - io.quarkus - quarkus-junit5 - test - - - - - - - io.quarkus - quarkus-maven-plugin - - - - build - - - - - - maven-failsafe-plugin - - - - integration-test - verify - - - - - - ${project.build.directory}/${project.build.finalName}-runner - org.jboss.logmanager.LogManager - ${maven.home} - - - - - - - - - native-image - - - native - - - - - - maven-surefire-plugin - - ${native.surefire.skip} - - - - - - false - true - - - - diff --git a/dhfs-parent/objects-common/integration-tests/src/main/resources/application.properties b/dhfs-parent/objects-common/integration-tests/src/main/resources/application.properties deleted file mode 100644 index b1645fe9..00000000 --- a/dhfs-parent/objects-common/integration-tests/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -quarkus.package.jar.decompiler.enabled=true \ No newline at end of file diff --git a/dhfs-parent/objects-common/pom.xml b/dhfs-parent/objects-common/pom.xml deleted file mode 100644 index 2d462191..00000000 --- a/dhfs-parent/objects-common/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - - com.usatiuk.dhfs - parent - 1.0-SNAPSHOT - - - com.usatiuk - objects-common-parent - 1.0-SNAPSHOT - pom - DHFS objects common stuff - Parent - - - deployment - runtime - integration-tests - - - diff --git a/dhfs-parent/objects-common/runtime/pom.xml b/dhfs-parent/objects-common/runtime/pom.xml deleted file mode 100644 index d02d31aa..00000000 --- a/dhfs-parent/objects-common/runtime/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - - - com.usatiuk - objects-common-parent - 1.0-SNAPSHOT - - objects-common - DHFS objects common stuff - Runtime - - - - io.quarkus - quarkus-arc - - - - - - - io.quarkus - quarkus-extension-maven-plugin - ${quarkus.platform.version} - - - compile - - extension-descriptor - - - ${project.groupId}:${project.artifactId}-deployment:${project.version} - - - - - - - maven-compiler-plugin - - - default-compile - - - - io.quarkus - quarkus-extension-processor - ${quarkus.platform.version} - - - - - - - - - diff --git a/dhfs-parent/objects-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/dhfs-parent/objects-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index b05649d2..00000000 --- a/dhfs-parent/objects-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,9 +0,0 @@ -name: DHFS objects common stuff -#description: Do something useful. -metadata: -# keywords: -# - objects-common -# guide: ... # To create and publish this guide, see https://github.com/quarkiverse/quarkiverse/wiki#documenting-your-extension -# categories: -# - "miscellaneous" -# status: "preview" diff --git a/dhfs-parent/objects/pom.xml b/dhfs-parent/objects/pom.xml index 07629904..b1b35c5d 100644 --- a/dhfs-parent/objects/pom.xml +++ b/dhfs-parent/objects/pom.xml @@ -64,11 +64,6 @@ supportlib 1.0-SNAPSHOT - - com.usatiuk - objects-common - 1.0-SNAPSHOT - io.quarkus quarkus-junit5-mockito diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CurrentTransaction.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CurrentTransaction.java index 552b45e8..52b97a5a 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CurrentTransaction.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CurrentTransaction.java @@ -2,8 +2,6 @@ package com.usatiuk.dhfs.objects; import com.usatiuk.dhfs.objects.transaction.LockingStrategy; import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/objects-common/runtime/src/main/java/com/usatiuk/objects/common/runtime/JData.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JData.java similarity index 92% rename from dhfs-parent/objects-common/runtime/src/main/java/com/usatiuk/objects/common/runtime/JData.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JData.java index b15418fe..501e3c35 100644 --- a/dhfs-parent/objects-common/runtime/src/main/java/com/usatiuk/objects/common/runtime/JData.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JData.java @@ -1,4 +1,4 @@ -package com.usatiuk.objects.common.runtime; +package com.usatiuk.dhfs.objects; import java.io.Serializable; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapper.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapper.java index 5194b873..c20c3e46 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapper.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapper.java @@ -1,6 +1,5 @@ package com.usatiuk.dhfs.objects; -import com.usatiuk.objects.common.runtime.JData; import jakarta.annotation.Nonnull; import lombok.Builder; diff --git a/dhfs-parent/objects-common/runtime/src/main/java/com/usatiuk/objects/common/runtime/JObjectKey.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectKey.java similarity index 80% rename from dhfs-parent/objects-common/runtime/src/main/java/com/usatiuk/objects/common/runtime/JObjectKey.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectKey.java index 1d66c9d6..9cf22d1c 100644 --- a/dhfs-parent/objects-common/runtime/src/main/java/com/usatiuk/objects/common/runtime/JObjectKey.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectKey.java @@ -1,4 +1,4 @@ -package com.usatiuk.objects.common.runtime; +package com.usatiuk.dhfs.objects; import java.io.Serializable; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectManager.java index 0e66c621..aaf9e57e 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectManager.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectManager.java @@ -4,8 +4,6 @@ import com.usatiuk.dhfs.objects.persistence.ObjectPersistentStore; import com.usatiuk.dhfs.objects.transaction.*; import com.usatiuk.dhfs.utils.AutoCloseableNoThrow; import com.usatiuk.dhfs.utils.DataLocker; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Instance; @@ -19,7 +17,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; import java.util.function.Function; -// Manages all access to com.usatiuk.objects.common.runtime.JData objects. +// Manages all access to com.usatiuk.dhfs.objects.JData objects. // In particular, it serves as a source of truth for what is committed to the backing storage. // All data goes through it, it is responsible for transaction atomicity // TODO: persistent tx id diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PreCommitTxHook.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PreCommitTxHook.java index afc190dc..3b1b50e4 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PreCommitTxHook.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PreCommitTxHook.java @@ -1,8 +1,5 @@ package com.usatiuk.dhfs.objects; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; - public interface PreCommitTxHook { default void onChange(JObjectKey key, JData old, JData cur) { } diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxBundle.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxBundle.java index 8c35a36b..a31dc61d 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxBundle.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxBundle.java @@ -1,8 +1,5 @@ package com.usatiuk.dhfs.objects; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; - public interface TxBundle { long getId(); diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxWritebackImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxWritebackImpl.java index ab85f53e..d9d8d977 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxWritebackImpl.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxWritebackImpl.java @@ -3,7 +3,6 @@ package com.usatiuk.dhfs.objects; import com.usatiuk.dhfs.objects.persistence.ObjectPersistentStore; import com.usatiuk.dhfs.objects.persistence.TxManifest; import com.usatiuk.dhfs.utils.VoidFn; -import com.usatiuk.objects.common.runtime.JObjectKey; import io.quarkus.logging.Log; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/FileObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/FileObjectPersistentStore.java index e4956ef9..1549c4e2 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/FileObjectPersistentStore.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/FileObjectPersistentStore.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.objects.persistence; import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer; import com.usatiuk.dhfs.utils.ByteUtils; import com.usatiuk.dhfs.utils.SerializationHelper; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/MemoryObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/MemoryObjectPersistentStore.java index d5c686b6..dd73ce6a 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/MemoryObjectPersistentStore.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/MemoryObjectPersistentStore.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.persistence; import com.google.protobuf.ByteString; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import io.quarkus.arc.properties.IfBuildProperty; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/ObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/ObjectPersistentStore.java index afcab147..f1db0be4 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/ObjectPersistentStore.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/ObjectPersistentStore.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.persistence; import com.google.protobuf.ByteString; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import javax.annotation.Nonnull; import java.util.Collection; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifest.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifest.java index 5a88d772..bd855980 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifest.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifest.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.objects.persistence; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import java.io.Serializable; import java.util.Collection; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/ReadTrackingObjectSource.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/ReadTrackingObjectSource.java index 540360dd..8035eac6 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/ReadTrackingObjectSource.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/ReadTrackingObjectSource.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; import java.util.Collections; import java.util.HashMap; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java index dc6325ec..198c8f30 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; import java.util.Optional; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java index 9109d93d..ed9bce57 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java @@ -1,8 +1,8 @@ package com.usatiuk.dhfs.objects.transaction; import com.usatiuk.dhfs.objects.JDataVersionedWrapper; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; import jakarta.enterprise.context.ApplicationScoped; import lombok.AccessLevel; import lombok.Getter; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObject.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObject.java index 1c9fe912..fdf01178 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObject.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObject.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.transaction; import com.usatiuk.dhfs.objects.JDataVersionedWrapper; -import com.usatiuk.objects.common.runtime.JData; +import com.usatiuk.dhfs.objects.JData; import java.util.Optional; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectSource.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectSource.java index acfae1ca..7fa8b516 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectSource.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectSource.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; public interface TransactionObjectSource { TransactionObject get(Class type, JObjectKey key); diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionPrivate.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionPrivate.java index c2e147ed..4229e939 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionPrivate.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionPrivate.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import java.util.Collection; import java.util.Map; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxRecord.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxRecord.java index 60a698cf..f5510e6f 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxRecord.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxRecord.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; public class TxRecord { public interface TxObjectRecord { diff --git a/dhfs-parent/objects/src/main/resources/application.properties b/dhfs-parent/objects/src/main/resources/application.properties index a9c2019e..6b41a553 100644 --- a/dhfs-parent/objects/src/main/resources/application.properties +++ b/dhfs-parent/objects/src/main/resources/application.properties @@ -1,2 +1,8 @@ dhfs.objects.persistence=files +dhfs.objects.writeback.limit=134217728 +dhfs.objects.lru.limit=134217728 +dhfs.objects.lru.print-stats=false +dhfs.objects.lock_timeout_secs=15 +dhfs.objects.persistence.files.root=${HOME}/dhfs_default/data/objs +dhfs.objects.root=${HOME}/dhfs_default/data/stuff quarkus.package.jar.decompiler.enabled=true diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTest.java index 2298d491..392cec00 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTest.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTest.java @@ -3,7 +3,6 @@ package com.usatiuk.dhfs.objects; import com.usatiuk.dhfs.objects.data.Parent; import com.usatiuk.dhfs.objects.transaction.LockingStrategy; import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.objects.common.runtime.JObjectKey; import io.quarkus.logging.Log; import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java index 73de1ca4..4fe54c05 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java @@ -2,8 +2,6 @@ package com.usatiuk.dhfs.objects; import com.usatiuk.dhfs.objects.data.Parent; import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectSpy; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Kid.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Kid.java index 99ab5fc3..0e597f4d 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Kid.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Kid.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.data; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; import lombok.Builder; @Builder(toBuilder = true) diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Parent.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Parent.java index 8955e3d7..3527b6f4 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Parent.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Parent.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.data; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; import lombok.Builder; @Builder(toBuilder = true) diff --git a/dhfs-parent/pom.xml b/dhfs-parent/pom.xml index 447727d4..3140d94e 100644 --- a/dhfs-parent/pom.xml +++ b/dhfs-parent/pom.xml @@ -17,7 +17,6 @@ autoprotomap objects utils - objects-common diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java index 6a2c4665..e4810e19 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.files.objects; import com.google.protobuf.ByteString; import com.usatiuk.dhfs.objects.JDataRefcounted; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import lombok.Builder; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java index 15f9f292..f24227f8 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.files.objects; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import lombok.Builder; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java index 04797d08..e5cb03e3 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java @@ -3,7 +3,7 @@ package com.usatiuk.dhfs.files.service; import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; import com.usatiuk.dhfs.files.objects.File; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import org.apache.commons.lang3.tuple.Pair; import java.util.Optional; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java index a169453e..d7ddefa7 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java @@ -13,8 +13,8 @@ import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaFil import com.usatiuk.dhfs.objects.transaction.LockingStrategy; import com.usatiuk.dhfs.objects.transaction.Transaction; import com.usatiuk.dhfs.utils.StatusRuntimeExceptionNoStacktrace; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; import io.grpc.Status; import io.grpc.StatusRuntimeException; import io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java index 16f50422..d91911be 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java @@ -1,8 +1,6 @@ package com.usatiuk.dhfs.objects; import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRefcounted.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRefcounted.java index 5e120d93..a23f8a60 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRefcounted.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRefcounted.java @@ -1,8 +1,5 @@ package com.usatiuk.dhfs.objects; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; - import java.util.Collection; import java.util.List; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java index 2791e2d8..ba2e7b9f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java @@ -1,8 +1,6 @@ package com.usatiuk.dhfs.objects; import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.objects.common.runtime.JData; -import com.usatiuk.objects.common.runtime.JObjectKey; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java index 35a74978..bbbbdb6a 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java @@ -8,7 +8,7 @@ import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentD import com.usatiuk.dhfs.objects.transaction.LockingStrategy; import com.usatiuk.dhfs.objects.transaction.Transaction; import com.usatiuk.kleppmanntree.*; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeOpWrapper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeOpWrapper.java index 52749fb1..a0a6d7a4 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeOpWrapper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeOpWrapper.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.objects.jkleppmanntree; import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMeta; import com.usatiuk.kleppmanntree.OpMove; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import lombok.Getter; import java.util.UUID; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNode.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNode.java index e4509a0e..096a32e5 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNode.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNode.java @@ -3,7 +3,7 @@ package com.usatiuk.dhfs.objects.jkleppmanntree.structs; import com.usatiuk.dhfs.objects.JDataRefcounted; import com.usatiuk.kleppmanntree.OpMove; import com.usatiuk.kleppmanntree.TreeNode; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import lombok.Builder; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java index 4e0e77ee..ae01c3ef 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.objects.jkleppmanntree.structs; import com.usatiuk.autoprotomap.runtime.ProtoMirror; import com.usatiuk.dhfs.objects.persistence.JKleppmannTreeNodeMetaFileP; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import lombok.Getter; import java.util.Objects; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreePersistentData.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreePersistentData.java index 6f773a7d..30367594 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreePersistentData.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreePersistentData.java @@ -1,11 +1,10 @@ package com.usatiuk.dhfs.objects.jkleppmanntree.structs; import com.usatiuk.dhfs.objects.JDataRefcounted; -import com.usatiuk.kleppmanntree.AtomicClock; import com.usatiuk.kleppmanntree.CombinedTimestamp; import com.usatiuk.kleppmanntree.LogRecord; import com.usatiuk.kleppmanntree.OpMove; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import lombok.Builder; import java.util.*; diff --git a/dhfs-parent/server/src/main/resources/application.properties b/dhfs-parent/server/src/main/resources/application.properties index 1fb7caa0..aacd8c29 100644 --- a/dhfs-parent/server/src/main/resources/application.properties +++ b/dhfs-parent/server/src/main/resources/application.properties @@ -1,6 +1,4 @@ quarkus.grpc.server.use-separate-server=false -dhfs.objects.persistence.files.root=${HOME}/dhfs_default/data/objs -dhfs.objects.root=${HOME}/dhfs_default/data/stuff dhfs.objects.peerdiscovery.port=42069 dhfs.objects.peerdiscovery.interval=5000 dhfs.objects.sync.timeout=30 @@ -22,13 +20,6 @@ dhfs.files.write_merge_limit=1.2 # Don't take blocks of this size and above when merging dhfs.files.write_merge_max_chunk_to_take=1 dhfs.files.write_last_chunk_limit=1.5 -dhfs.objects.writeback.delay=100 -dhfs.objects.writeback.limit=134217728 -dhfs.objects.lru.limit=134217728 -dhfs.objects.lru.print-stats=false -dhfs.objects.writeback.watermark-high=0.6 -dhfs.objects.writeback.watermark-low=0.4 -dhfs.objects.writeback.threads=4 dhfs.objects.deletion.delay=1000 dhfs.objects.deletion.can-delete-retry-delay=10000 dhfs.objects.ref_verification=true diff --git a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java b/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java index d7cade2c..504c1cc6 100644 --- a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java +++ b/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java @@ -3,7 +3,7 @@ package com.usatiuk.dhfs.benchmarks; import com.google.protobuf.UnsafeByteOperations; import com.usatiuk.dhfs.TempDataProfile; import com.usatiuk.dhfs.files.service.DhfsFileService; -import com.usatiuk.objects.common.runtime.JObjectKey; +import com.usatiuk.dhfs.objects.JObjectKey; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import jakarta.inject.Inject;