KnnResult is a record

Author: jjaderberg

algo/src/main/java/org/neo4j/gds/similarity/filteredknn/FilteredKnn.java

@@ -24,7 +24,6 @@
 import org.neo4j.gds.collections.ha.HugeObjectArray;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.similarity.filtering.NodeFilter;
-import org.neo4j.gds.similarity.knn.ImmutableKnnResult;
 import org.neo4j.gds.similarity.knn.Knn;
 import org.neo4j.gds.similarity.knn.KnnContext;
 import org.neo4j.gds.similarity.knn.KnnNeighborFilterFactory;
@@ -141,7 +140,7 @@ private FilteredKnn(
     public FilteredKnnResult compute() {
         var seedingSummary = targetNodeFiltering.seedingSummary();
         KnnResult result = (seedingSummary.seededOptimally()) ?
-            ImmutableKnnResult.of(
+            new KnnResult(
                 HugeObjectArray.newArray(NeighborList.class, 0),
                 0,
                 true,

algo/src/main/java/org/neo4j/gds/similarity/knn/Knn.java

@@ -34,7 +34,6 @@
 import java.util.Optional;
 import java.util.SplittableRandom;
 import java.util.concurrent.ExecutorService;
-import java.util.stream.LongStream;
 
 public final class Knn extends Algorithm<KnnResult> {
 
@@ -195,7 +194,7 @@ public ExecutorService executorService() {
     @Override
     public KnnResult compute() {
         if (graph.nodeCount() < 2) {
-            return new EmptyResult();
+            return KnnResult.empty();
         }
         progressTracker.beginSubTask();
         progressTracker.beginSubTask();
@@ -234,7 +233,7 @@ public KnnResult compute() {
         progressTracker.endSubTask();
 
         progressTracker.endSubTask();
-        return ImmutableKnnResult.of(
+        return new KnnResult(
             neighbors.data(),
             iteration,
             didConverge,
@@ -369,41 +368,4 @@ static void reverseNeighbors(
         }
     }
 
-    private static final class EmptyResult extends KnnResult {
-
-        @Override
-        HugeObjectArray<NeighborList> neighborList() {
-            return HugeObjectArray.of();
-        }
-
-        @Override
-        public int ranIterations() {
-            return 0;
-        }
-
-        @Override
-        public boolean didConverge() {
-            return false;
-        }
-
-        @Override
-        public long nodePairsConsidered() {
-            return 0;
-        }
-
-        @Override
-        public LongStream neighborsOf(long nodeId) {
-            return LongStream.empty();
-        }
-
-        @Override
-        public long size() {
-            return 0;
-        }
-
-        @Override
-        public long nodesCompared() {
-            return 0;
-        }
-    }
 }

algo/src/main/java/org/neo4j/gds/similarity/knn/KnnResult.java

@@ -19,7 +19,6 @@
  */
 package org.neo4j.gds.similarity.knn;
 
-import org.neo4j.gds.annotation.ValueClass;
 import org.neo4j.gds.collections.cursor.HugeCursor;
 import org.neo4j.gds.collections.ha.HugeObjectArray;
 import org.neo4j.gds.similarity.SimilarityResult;
@@ -31,18 +30,13 @@
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 
-@ValueClass
-public abstract class KnnResult {
-    abstract HugeObjectArray<NeighborList> neighborList();
-
-    public abstract int ranIterations();
-
-    public abstract boolean didConverge();
-
-    public abstract long nodePairsConsidered();
-
-    public abstract long nodesCompared();
-
+public record KnnResult(
+    HugeObjectArray<NeighborList> neighborList,
+    int ranIterations,
+    boolean didConverge,
+    long nodePairsConsidered,
+    long nodesCompared
+) {
 
     public LongStream neighborsOf(long nodeId) {
         return neighborList().get(nodeId).elements().map(NeighborList::clearCheckedFlag);
@@ -104,4 +98,14 @@ public long totalSimilarityPairs() {
     public long size() {
         return neighborList().size();
     }
+
+    static KnnResult empty() {
+        return new KnnResult(
+            HugeObjectArray.of(),
+            0,
+            false,
+            0L,
+            0L
+        );
+    }
 }