diff --git a/dhfs-parent/dhfs-fs/pom.xml b/dhfs-parent/dhfs-fs/pom.xml index eb459502..d3118bdb 100644 --- a/dhfs-parent/dhfs-fs/pom.xml +++ b/dhfs-parent/dhfs-fs/pom.xml @@ -23,22 +23,10 @@ awaitility test - - org.bouncycastle - bcprov-jdk18on - - - org.bouncycastle - bcpkix-jdk18on - io.quarkus quarkus-security - - net.openhft - zero-allocation-hashing - io.quarkus quarkus-grpc @@ -47,22 +35,6 @@ io.quarkus quarkus-arc - - io.quarkus - quarkus-rest - - - io.quarkus - quarkus-rest-client - - - io.quarkus - quarkus-rest-client-jsonb - - - io.quarkus - quarkus-rest-jsonb - io.quarkus quarkus-scheduler @@ -85,10 +57,6 @@ slf4j-jboss-logmanager test - - commons-codec - commons-codec - org.apache.commons commons-collections4 @@ -97,11 +65,6 @@ org.pcollections pcollections - - org.apache.commons - commons-math3 - 3.6.1 - com.usatiuk.dhfs sync-base diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/Benchmarker.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/Benchmarker.java deleted file mode 100644 index 75a6c903..00000000 --- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/Benchmarker.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.usatiuk.dhfsfs.benchmarks; - -import io.quarkus.logging.Log; -import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; - -import java.util.Arrays; -import java.util.function.Supplier; - -public class Benchmarker { - static long[] runLatency(Supplier fn, int iterations) { - var out = new long[iterations]; - - int hash = 1; - - for (int i = 0; i < iterations; i++) { - long startNanos = System.nanoTime(); - var cur = fn.get(); - long stopNanos = System.nanoTime(); - out[i] = stopNanos - startNanos; - hash = hash * 31 + cur.hashCode(); - } - - System.out.println("\nHash: " + hash); - - return out; - } - - static long[] runThroughput(Supplier fn, int iterations, long iterationTime) { - var out = new long[iterations]; - - int hash = 1; - - for (int i = 0; i < iterations; i++) { - long startMillis = System.currentTimeMillis(); - long count = 0; - // FIXME: That's probably janky - while (System.currentTimeMillis() - startMillis < iterationTime) { - var res = fn.get(); - count++; - hash = hash * 31 + res.hashCode(); - } - System.out.println("Ran iteration " + i + "/" + iterations + " count=" + count); - out[i] = count; - } - - System.out.println("\nHash: " + hash); - - return out; - } - - static void printStats(double[] data, String unit) { - DescriptiveStatistics stats = new DescriptiveStatistics(); - for (var r : data) { - stats.addValue(r); - } - Log.info("\n" + stats + - "\n 50%: " + stats.getPercentile(50) + " " + unit + - "\n 90%: " + stats.getPercentile(90) + " " + unit + - "\n 95%: " + stats.getPercentile(95) + " " + unit + - "\n 99%: " + stats.getPercentile(99) + " " + unit + - "\n 99.9%: " + stats.getPercentile(99.9) + " " + unit + - "\n 99.99%: " + stats.getPercentile(99.99) + " " + unit - ); - - } - - static void runAndPrintMixSimple(String name, Supplier fn, int latencyIterations, int thrptIterations, int thrptIterationTime, int warmupIterations, int warmupIterationTime) { - System.out.println("\n=========\n" + "Running " + name + "\n=========\n"); - System.out.println("==Warmup=="); - runThroughput(fn, warmupIterations, warmupIterationTime); - System.out.println("==Warmup done=="); - System.out.println("==Throughput=="); - var thrpt = runThroughput(fn, thrptIterations, thrptIterationTime); - printStats(Arrays.stream(thrpt).mapToDouble(o -> (double) o / 1000).toArray(), "ops/s"); - System.out.println("==Throughput done=="); - System.out.println("==Latency=="); - var lat = runLatency(fn, latencyIterations); - printStats(Arrays.stream(lat).mapToDouble(o -> (double) o).toArray(), "ns/op"); - System.out.println("==Latency done=="); - System.out.println("\n=========\n" + name + " done" + "\n=========\n"); - } - -} diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/DhfsFileBenchmarkTest.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/DhfsFileBenchmarkTest.java deleted file mode 100644 index 17e979f1..00000000 --- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/DhfsFileBenchmarkTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.usatiuk.dhfsfs.benchmarks; - -import com.google.protobuf.UnsafeByteOperations; -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; -import jakarta.inject.Inject; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import java.nio.ByteBuffer; -import java.util.Map; - -class Profiles { - public static class DhfsFuseTestProfile extends TempDataProfile { - @Override - protected void getConfigOverrides(Map ret) { - ret.put("quarkus.log.category.\"com.usatiuk.dhfs\".level", "INFO"); - ret.put("dhfs.fuse.enabled", "false"); - ret.put("dhfs.objects.ref_verification", "false"); - } - } -} - -@QuarkusTest -@TestProfile(Profiles.DhfsFuseTestProfile.class) -public class DhfsFileBenchmarkTest { - @Inject - DhfsFileService dhfsFileService; - - @Test - @Disabled - void openRootTest() { - Benchmarker.runAndPrintMixSimple("dhfsFileService.open(\"\")", - () -> { - return dhfsFileService.open(""); - }, 1_000_000, 5, 1000, 5, 1000); - } - - @Test - @Disabled - void writeMbTest() { - JObjectKey file = dhfsFileService.create("/writeMbTest", 0777).get(); - var bb = ByteBuffer.allocateDirect(1024 * 1024); - Benchmarker.runAndPrintMixSimple("dhfsFileService.write(\"\")", - () -> { - var thing = UnsafeByteOperations.unsafeWrap(bb); - return dhfsFileService.write(file, dhfsFileService.size(file), thing); - }, 1_000, 10, 100, 1, 100); - } -} diff --git a/dhfs-parent/dhfs-fuse/pom.xml b/dhfs-parent/dhfs-fuse/pom.xml index 1d7d9199..4696297d 100644 --- a/dhfs-parent/dhfs-fuse/pom.xml +++ b/dhfs-parent/dhfs-fuse/pom.xml @@ -23,22 +23,10 @@ awaitility test - - org.bouncycastle - bcprov-jdk18on - - - org.bouncycastle - bcpkix-jdk18on - io.quarkus quarkus-security - - net.openhft - zero-allocation-hashing - io.quarkus quarkus-grpc @@ -47,14 +35,6 @@ io.quarkus quarkus-arc - - io.quarkus - quarkus-rest - - - io.quarkus - quarkus-rest-client - io.quarkus quarkus-rest-client-jsonb @@ -90,10 +70,6 @@ slf4j-jboss-logmanager test - - commons-codec - commons-codec - org.apache.commons commons-collections4 @@ -102,11 +78,6 @@ org.pcollections pcollections - - org.apache.commons - commons-math3 - 3.6.1 - com.usatiuk.dhfs dhfs-fs diff --git a/dhfs-parent/objects/pom.xml b/dhfs-parent/objects/pom.xml index f79b8e9b..566217bb 100644 --- a/dhfs-parent/objects/pom.xml +++ b/dhfs-parent/objects/pom.xml @@ -36,10 +36,6 @@ io.quarkus quarkus-grpc - - net.openhft - zero-allocation-hashing - org.junit.jupiter junit-jupiter-engine diff --git a/dhfs-parent/pom.xml b/dhfs-parent/pom.xml index 95e9faa8..33e0fac0 100644 --- a/dhfs-parent/pom.xml +++ b/dhfs-parent/pom.xml @@ -54,11 +54,6 @@ 1.18.34 provided - - net.openhft - zero-allocation-hashing - 0.16 - org.awaitility awaitility diff --git a/dhfs-parent/sync-base/pom.xml b/dhfs-parent/sync-base/pom.xml index a8ac57b6..84d2a485 100644 --- a/dhfs-parent/sync-base/pom.xml +++ b/dhfs-parent/sync-base/pom.xml @@ -13,10 +13,6 @@ - - io.quarkus - quarkus-smallrye-openapi - org.testcontainers testcontainers @@ -39,10 +35,6 @@ io.quarkus quarkus-security - - net.openhft - zero-allocation-hashing - io.quarkus quarkus-grpc @@ -59,14 +51,6 @@ io.quarkus quarkus-rest-client - - io.quarkus - quarkus-rest-client-jsonb - - - io.quarkus - quarkus-rest-jsonb - io.quarkus quarkus-scheduler @@ -101,11 +85,6 @@ org.pcollections pcollections - - org.apache.commons - commons-math3 - 3.6.1 - com.usatiuk kleppmanntree