Merge pull request #9631 from neo-technology/inline-compat-proxy

Inline usages of Neo4jProxy
neo4j · Sep 24, 2024 · 32bc290 · 32bc290
2 parents 161c8d3 + 808824a
commit 32bc290
Show file tree

Hide file tree

Showing 65 changed files with 473 additions and 874 deletions.
diff --git a/algo/src/main/java/org/neo4j/gds/paths/PathFactory.java b/algo/src/main/java/org/neo4j/gds/paths/PathFactory.java
@@ -21,9 +21,11 @@
 
 import org.jetbrains.annotations.TestOnly;
 import org.neo4j.gds.api.NodeLookup;
-import org.neo4j.gds.compat.Neo4jProxy;
+import org.neo4j.gds.compat.VirtualRelationshipImpl;
 import org.neo4j.graphalgo.impl.util.PathImpl;
+import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;
+import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
 
 import java.util.List;
@@ -48,12 +50,10 @@ public static Path create(
             long targetNodeId = nodeIds[i + 1];
 
 
-            var relationship = Neo4jProxy.virtualRelationship(
-                RelationshipIds.next(),
-                nodeLookup.getNodeById(sourceNodeId),
-                nodeLookup.getNodeById(targetNodeId),
-                relationshipType
-            );
+            long id = RelationshipIds.next();
+            Node startNode = nodeLookup.getNodeById(sourceNodeId);
+            Node endNode = nodeLookup.getNodeById(targetNodeId);
+            var relationship = (Relationship) new VirtualRelationshipImpl(id, startNode, endNode, relationshipType);
             var costDifference = costs[i + 1] - costs[i];
             relationship.setProperty(costPropertyName, costDifference);
             pathBuilder = pathBuilder.push(relationship);
@@ -77,13 +77,11 @@ public static Path create(
             long sourceNodeId = nodeIds.get(i);
             long targetNodeId = nodeIds.get(i + 1);
 
+            long id = RelationshipIds.next();
+            Node startNode = nodeLookup.getNodeById(sourceNodeId);
+            Node endNode = nodeLookup.getNodeById(targetNodeId);
+            var relationship = (Relationship) new VirtualRelationshipImpl(id, startNode, endNode, relationshipType);
 
-            var relationship = Neo4jProxy.virtualRelationship(
-                RelationshipIds.next(),
-                nodeLookup.getNodeById(sourceNodeId),
-                nodeLookup.getNodeById(targetNodeId),
-                relationshipType
-            );
             var costDifference = costs.get(i + 1) - costs.get(i);
             relationship.setProperty(costPropertyName, costDifference);
             pathBuilder = pathBuilder.push(relationship);
@@ -104,12 +102,10 @@ public static Path create(
             long sourceNodeId = nodeIds.get(i);
             long targetNodeId = nodeIds.get(i + 1);
 
-            var relationship = Neo4jProxy.virtualRelationship(
-                RelationshipIds.next(),
-                nodeLookup.getNodeById(sourceNodeId),
-                nodeLookup.getNodeById(targetNodeId),
-                relationshipType
-            );
+            long id = RelationshipIds.next();
+            Node startNode = nodeLookup.getNodeById(sourceNodeId);
+            Node endNode = nodeLookup.getNodeById(targetNodeId);
+            var relationship = (Relationship) new VirtualRelationshipImpl(id, startNode, endNode, relationshipType);
             pathBuilder = pathBuilder.push(relationship);
         }
 

diff --git a/.../test/java/org/neo4j/gds/applications/graphstorecatalog/UserInputWritePropertiesTest.java b/.../test/java/org/neo4j/gds/applications/graphstorecatalog/UserInputWritePropertiesTest.java
@@ -23,7 +23,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.neo4j.gds.compat.Neo4jProxy;
+import org.neo4j.gds.compat.VirtualRelationshipImpl;
 import org.neo4j.graphalgo.impl.util.PathImpl;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.kernel.impl.core.NodeEntity;
@@ -92,7 +92,7 @@ static Stream<Arguments> typesInput() {
             arguments(1, "number"),
             arguments(Boolean.TRUE, "boolean"),
             arguments(new NodeEntity(null, 1), "node"),
-            arguments(Neo4jProxy.virtualRelationship(
+            arguments(new VirtualRelationshipImpl(
                 0,
                 new NodeEntity(null, 1),
                 new NodeEntity(null, 2),

diff --git a/...y/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompatExecutionContext.java b/...y/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompatExecutionContext.java
@@ -21,15 +21,9 @@
 
 import org.neo4j.internal.kernel.api.Cursor;
 import org.neo4j.internal.kernel.api.PartitionedScan;
-import org.neo4j.internal.kernel.api.security.AccessMode;
-import org.neo4j.io.pagecache.context.CursorContext;
 
 public interface CompatExecutionContext extends AutoCloseable {
 
-     CursorContext cursorContext();
-
-     AccessMode accessMode();
-
      <C extends Cursor> boolean reservePartition(PartitionedScan<C> scan, C cursor);
 
      @Override

diff --git a/...lity/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompositeNodeCursor.java b/...lity/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompositeNodeCursor.java
@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.PriorityQueue;
 
-public abstract class CompositeNodeCursor extends DefaultCloseListenable implements Cursor {
+public class CompositeNodeCursor extends DefaultCloseListenable implements Cursor {
 
     private final PriorityQueue<NodeLabelIndexCursor> cursorQueue;
     private boolean repopulateCursorQueue;
@@ -43,7 +43,7 @@ public abstract class CompositeNodeCursor extends DefaultCloseListenable impleme
 
     private boolean closed = false;
 
-    protected CompositeNodeCursor(List<NodeLabelIndexCursor> cursors, int[] labelIds) {
+    public CompositeNodeCursor(List<NodeLabelIndexCursor> cursors, int[] labelIds) {
         this.cursors = cursors;
         this.cursorQueue = new PriorityQueue<>(
             cursors.size(),

diff --git a/...mmon/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompositeNodeCursorImpl.java b/...mmon/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompositeNodeCursorImpl.java
diff --git a/...l-adapter/src/main/java/org/neo4j/gds/compat/GdsDatabaseManagementServiceBuilderImpl.java b/...l-adapter/src/main/java/org/neo4j/gds/compat/GdsDatabaseManagementServiceBuilderImpl.java
@@ -26,11 +26,11 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-public class GdsDatabaseManagementServiceBuilderImpl implements GdsDatabaseManagementServiceBuilder {
+public final class GdsDatabaseManagementServiceBuilderImpl implements GdsDatabaseManagementServiceBuilder {
 
     private final DatabaseManagementServiceBuilderImplementation dbmsBuilder;
 
-    GdsDatabaseManagementServiceBuilderImpl(Path storeDir) {
+    public GdsDatabaseManagementServiceBuilderImpl(Path storeDir) {
         this.dbmsBuilder = new DatabaseManagementServiceBuilderImplementation(storeDir);
     }