Remove fastutil dependency

Author: cheb0

ulyp-agent-core/build.gradle

@@ -21,7 +21,6 @@ dependencies {
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.24'
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
-    testImplementation group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.12'
     testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.11'
     testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'

ulyp-agent-tests/build.gradle

@@ -23,7 +23,6 @@ dependencies {
     implementation project(':ulyp-agent-core')
     implementation project(':ulyp-storage')
 
-    implementation group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.12'
     implementation group: 'org.jetbrains', name: 'annotations', version: '18.0.0'
     implementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.2'

ulyp-benchmarks/build.gradle

@@ -27,7 +27,6 @@ dependencies {
     jmhImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
     jmhImplementation group: 'org.jetbrains', name: 'annotations', version: '18.0.0'
     jmhImplementation group: 'org.rocksdb', name: 'rocksdbjni', version: '9.7.3'
-    jmhImplementation group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.12'
 
     jmhImplementation group: 'com.hazelcast', name: 'hazelcast', version: '5.5.0'
     jmhImplementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.2'

ulyp-common/build.gradle

@@ -20,12 +20,10 @@ sourceCompatibility = 1.8
 dependencies {
     compileOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
-    compileOnly group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.12'
     compileOnly group: 'org.agrona', name: 'agrona', version: '1.4.0'
     compileOnly group: 'org.jetbrains', name: 'annotations', version: '18.0.0'
     compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.2'
 
-    testImplementation group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.12'
     testImplementation group: 'org.agrona', name: 'agrona', version: '1.4.0'
     testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.2'
 

ulyp-common/src/main/java/com/ulyp/core/util/BitUtil.java

@@ -1,7 +1,6 @@
 package com.ulyp.core.util;
 
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-import it.unimi.dsi.fastutil.longs.LongList;
+import org.agrona.collections.LongArrayList;
 
 public class BitUtil {
 
@@ -26,7 +25,7 @@ public static void longToBytes(long value, byte[] dst, int offset) {
         }
     }
 
-    public static byte[] longsToBytes(LongList list) {
+    public static byte[] longsToBytes(LongArrayList list) {
         byte[] result = new byte[Long.BYTES * list.size()];
         for (int i = 0; i < list.size(); i++) {
             longToBytes(list.getLong(i), result, i * Long.BYTES);
@@ -53,9 +52,9 @@ public static int bytesToInt(final byte[] bytes, int offset) {
     }
 
 
-    public static LongList bytesToLongs(final byte[] bytes) {
+    public static LongArrayList bytesToLongs(final byte[] bytes) {
         int size = bytes.length / Long.BYTES;
-        LongList result = new LongArrayList(size);
+        LongArrayList result = new LongArrayList(size, Long.MIN_VALUE);
         for (int i = 0; i < size; i++) {
             result.add(BitUtil.bytesToLong(bytes, i * Long.BYTES));
         }

ulyp-storage/build.gradle

@@ -21,15 +21,13 @@ dependencies {
     implementation project(':ulyp-common')
 
     compileOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
-    compileOnly group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.12'
 
     implementation group: 'org.agrona', name: 'agrona', version: '1.4.0'
     implementation group: 'org.jetbrains', name: 'annotations', version: '18.0.0'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.2'
 
     compileOnly group: 'org.rocksdb', name: 'rocksdbjni', version: '9.7.3'
     testImplementation group: 'org.rocksdb', name: 'rocksdbjni', version: '9.7.3'
-    testImplementation group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.12'
 
     implementation group: 'org.jetbrains', name: 'annotations', version: '18.0.0'
     testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.1.1'

ulyp-storage/src/main/java/com/ulyp/storage/tree/BinaryRecordedCallStateSerializer.java

@@ -3,8 +3,7 @@
 import com.ulyp.core.bytes.BytesIn;
 import com.ulyp.core.bytes.BytesOut;
 import com.ulyp.core.serializers.Serializer;
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-import it.unimi.dsi.fastutil.longs.LongList;
+import org.agrona.collections.LongArrayList;
 
 public class BinaryRecordedCallStateSerializer implements Serializer<CallRecordIndexState> {
 
@@ -17,7 +16,7 @@ public CallRecordIndexState deserialize(BytesIn input) {
         int subtreeSize = input.readInt();
         long exitCallRecordAddress = input.readLong();
         int childrenCallCount = input.readInt();
-        LongList childrenCallIds = new LongArrayList(childrenCallCount);
+        LongArrayList childrenCallIds = new LongArrayList(childrenCallCount, Long.MIN_VALUE);
         for (int i = 0; i < childrenCallCount; i++) {
             childrenCallIds.add(input.readLong());
         }
@@ -36,7 +35,7 @@ public void serialize(BytesOut out, CallRecordIndexState value) {
         out.write(value.getEnterMethodCallAddress());
         out.write(value.getSubtreeSize());
         out.write(value.getExitMethodCallAddr());
-        LongList childrenCallIds = value.getChildrenCallIds();
+        LongArrayList childrenCallIds = value.getChildrenCallIds();
         int childrenCallIdCount = childrenCallIds.size();
         out.write(childrenCallIdCount);
         for (int i = 0; i < childrenCallIdCount; i++) {

ulyp-storage/src/main/java/com/ulyp/storage/tree/CallRecord.java

@@ -4,9 +4,9 @@
 import com.ulyp.core.recorders.NotRecordedObjectRecord;
 import com.ulyp.core.recorders.ObjectRecord;
 import com.ulyp.storage.StorageException;
-import it.unimi.dsi.fastutil.longs.LongList;
 import lombok.Builder;
 import lombok.Getter;
+import org.agrona.collections.LongArrayList;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -42,9 +42,12 @@ public class CallRecord {
     private final int subtreeSize;
     @Getter
     private final long nanosDuration;
+    @Getter
     private final Method method;
+    @Getter
     private final List<ObjectRecord> args;
-    private final LongList childrenCallIds;
+    @Getter
+    private final LongArrayList childrenCallIds;
     private final RecordingState recordingState;
     @Builder.Default
     private final ObjectRecord callee = NotRecordedObjectRecord.getInstance();
@@ -68,14 +71,6 @@ public long getId() {
         return callId;
     }
 
-    public LongList getChildrenCallIds() {
-        return childrenCallIds;
-    }
-
-    public List<ObjectRecord> getArgs() {
-        return args;
-    }
-
     @NotNull
     public ObjectRecord getReturnValue() {
         return returnValue;
@@ -85,10 +80,6 @@ public boolean hasThrown() {
         return thrown;
     }
 
-    public Method getMethod() {
-        return method;
-    }
-
     public List<CallRecord> getChildren() throws StorageException {
         if (children != null) {
             return children;

ulyp-storage/src/main/java/com/ulyp/storage/tree/CallRecordIndexState.java

@@ -1,8 +1,7 @@
 package com.ulyp.storage.tree;
 
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-import it.unimi.dsi.fastutil.longs.LongList;
 import lombok.*;
+import org.agrona.collections.LongArrayList;
 
 @Getter
 @Builder
@@ -15,10 +14,11 @@ public class CallRecordIndexState {
     private final long id;
     private final long enterMethodCallAddress;
     @Builder.Default
-    private final LongList childrenCallIds = new LongArrayList();
+    private final LongArrayList childrenCallIds = new LongArrayList();
     @Builder.Default
     private int subtreeSize = 1;
     @Builder.Default
+    @Setter
     private long exitMethodCallAddr = -1;
 
     public void incrementSubtreeSize() {
@@ -28,8 +28,4 @@ public void incrementSubtreeSize() {
     public void addChildrenCallId(long callId) {
         childrenCallIds.add(callId);
     }
-
-    public void setExitMethodCallAddr(long value) {
-        this.exitMethodCallAddr = value;
-    }
 }

ulyp-storage/src/main/java/com/ulyp/storage/tree/MemCallStack.java

@@ -1,11 +1,11 @@
 package com.ulyp.storage.tree;
 
-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Maintains a call stack for each recording being processed. Having in-memory stack
@@ -16,7 +16,9 @@
 public class MemCallStack {
 
     private final Deque<CallRecordIndexState> deque = new ArrayDeque<>();
-    private final Long2ObjectMap<CallRecordIndexState> lookupIndex = new Long2ObjectOpenHashMap<>();
+
+    // We don't optimize boxing, it's used in UI app
+    private final Map<Long, CallRecordIndexState> lookupIndex = new HashMap<>();
 
     public CallRecordIndexState get(long callId) {
         return lookupIndex.get(callId);