Merge pull request #10292 from DarthMax/more_pathfinding_algos

Mats-SX · web-flow · commit dfef1812ddff · 2025-03-10T13:38:40.000+01:00
Implement simple path finding write procs
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogConfigurationService.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogConfigurationService.java
@@ -70,7 +70,7 @@ public GraphProjectFromStoreConfig parseNativeProjectConfiguration(
 
         var configuration = GraphProjectFromStoreConfig.of(
             user.getUsername(),
-            graphName.getValue(),
+            graphName.value(),
             nodeProjection,
             relationshipProjection,
             wrappedRawConfiguration
@@ -92,7 +92,7 @@ public GraphProjectFromCypherConfig parseCypherProjectConfiguration(
 
         var configuration = GraphProjectFromCypherConfig.of(
             user.getUsername(),
-            graphName.getValue(),
+            graphName.value(),
             nodeQuery,
             relationshipQuery,
             wrappedRawConfiguration
@@ -162,8 +162,8 @@ GraphProjectFromGraphConfig parseSubGraphProjectConfiguration(
 
         var configuration = GraphProjectFromGraphConfig.of(
             user.getUsername(),
-            graphName.getValue(),
-            originGraphName.getValue(),
+            graphName.value(),
+            originGraphName.value(),
             nodeFilter,
             relationshipFilter,
             originGraphConfiguration.config(),
@@ -183,7 +183,7 @@ GraphDropNodePropertiesConfig parseGraphDropNodePropertiesConfiguration(
         var cypherConfig = CypherMapWrapper.create(rawConfiguration);
 
         var configuration = GraphDropNodePropertiesConfig.of(
-            graphName.getValue(),
+            graphName.value(),
             nodeProperties,
             cypherConfig
         );
@@ -201,7 +201,7 @@ void validateDropGraphPropertiesConfiguration(
         var cypherConfig = CypherMapWrapper.create(rawConfiguration);
 
         var configuration = GraphRemoveGraphPropertiesConfig.of(
-            graphName.getValue(),
+            graphName.value(),
             graphProperty,
             cypherConfig
         );
@@ -217,7 +217,7 @@ void validateGraphStreamGraphPropertiesConfig(
         var cypherConfig = CypherMapWrapper.create(rawConfiguration);
 
         var configuration = GraphStreamGraphPropertiesConfig.of(
-            graphName.getValue(),
+            graphName.value(),
             graphProperty,
             cypherConfig
         );
@@ -234,7 +234,7 @@ GraphStreamNodePropertiesConfig parseGraphStreamNodePropertiesConfiguration(
         var cypherConfig = CypherMapWrapper.create(rawConfiguration);
 
         var configuration = GraphStreamNodePropertiesConfig.of(
-            graphName.getValue(),
+            graphName.value(),
             nodeProperties,
             nodeLabels,
             cypherConfig
@@ -254,7 +254,7 @@ GraphStreamRelationshipPropertiesConfig parseGraphStreamRelationshipPropertiesCo
         var cypherConfig = CypherMapWrapper.create(rawConfiguration);
 
         var configuration = GraphStreamRelationshipPropertiesConfig.of(
-            graphName.getValue(),
+            graphName.value(),
             relationshipProperties,
             relationshipTypes,
             cypherConfig
@@ -273,7 +273,7 @@ GraphStreamRelationshipsConfig parseGraphStreamRelationshipsConfiguration(
         var cypherConfig = CypherMapWrapper.create(rawConfiguration);
 
         var configuration = GraphStreamRelationshipsConfig.of(
-            graphName.getValue(),
+            graphName.value(),
             relationshipTypes,
             cypherConfig
         );
@@ -292,7 +292,7 @@ GraphWriteNodePropertiesConfig parseGraphWriteNodePropertiesConfiguration(
         var cypherConfig = CypherMapWrapper.create(rawConfiguration);
 
         var configuration = GraphWriteNodePropertiesConfig.of(
-            graphName.getValue(),
+            graphName.value(),
             nodeProperties,
             nodeLabels,
             cypherConfig
@@ -345,7 +345,7 @@ RandomGraphGeneratorConfig parseRandomGraphGeneratorConfig(
 
         var configuration = RandomGraphGeneratorConfig.of(
             user.getUsername(),
-            graphName.getValue(),
+            graphName.value(),
             nodeCount,
             averageDegree,
             cypherConfig
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/DefaultGraphCatalogApplications.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/DefaultGraphCatalogApplications.java
@@ -563,7 +563,7 @@ public GraphDropNodePropertiesResult dropNodeProperties(
         );
 
         return new GraphDropNodePropertiesResult(
-            graphName.getValue(),
+            graphName.value(),
             droppedProperties,
             numberOfPropertiesRemoved
         );
@@ -604,7 +604,7 @@ public GraphDropRelationshipResult dropRelationships(
             relationshipType
         );
 
-        return new GraphDropRelationshipResult(graphName.getValue(), relationshipType, result);
+        return new GraphDropRelationshipResult(graphName.value(), relationshipType, result);
     }
 
     @Override
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/ExportToCsvApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/ExportToCsvApplication.java
@@ -86,7 +86,7 @@ FileExportResult run(GraphName graphName, GraphStoreToFileExporterConfig configu
         );
 
         return new FileExportResult(
-            graphName.getValue(),
+            graphName.value(),
             configuration.exportName(),
             graphStore.nodeCount(),
             graphStore.relationshipCount(),
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/ExportToDatabaseApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/ExportToDatabaseApplication.java
@@ -101,7 +101,7 @@ DatabaseExportResult run(
         var end = System.nanoTime();
 
         return new DatabaseExportResult(
-            graphName.getValue(),
+            graphName.value(),
             configuration.databaseName(),
             graphStore.nodeCount(),
             graphStore.relationshipCount(),
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/GraphSamplingApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/GraphSamplingApplication.java
@@ -82,8 +82,8 @@ RandomWalkSamplingResult sample(
 
             var rwrProcConfig = RandomWalkWithRestartsConfiguration.of(
                 user.getUsername(),
-                graphName.getValue(),
-                originGraphName.getValue(),
+                graphName.value(),
+                originGraphName.value(),
                 graphProjectConfig,
                 cypherMap
             );
@@ -93,8 +93,8 @@ RandomWalkSamplingResult sample(
             var projectMillis = progressTimer.stop().getDuration();
 
             return new RandomWalkSamplingResult(
-                graphName.getValue(),
-                originGraphName.getValue(),
+                graphName.value(),
+                originGraphName.value(),
                 sampledGraphStore.nodeCount(),
                 sampledGraphStore.relationshipCount(),
                 samplerAlgorithm.startNodesCount(),
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/ListGraphApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/ListGraphApplication.java
@@ -56,7 +56,7 @@ public List<Pair<GraphStoreCatalogEntry, Map<String, Object>>> list(
         TerminationFlag terminationFlag
     ) {
         Predicate<String> graphNameFilter = graphName
-            .map(GraphName::getValue)
+            .map(graphName1 -> graphName1.value())
             .map(name -> (Predicate<String>) name::equals)
             .orElseGet(() -> __ -> true);
         var graphEntries = graphListingService.listGraphs(user)
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/NodeLabelMutatorApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/NodeLabelMutatorApplication.java
@@ -39,7 +39,7 @@ public MutateLabelResult compute(
         MutateLabelConfig configuration,
         Expression nodeFilter
     ) {
-        var resultBuilder = MutateLabelResult.builder(graphName.getValue(), nodeLabelAsString)
+        var resultBuilder = MutateLabelResult.builder(graphName.value(), nodeLabelAsString)
             .withConfig(configuration.toMap());
 
         try (ProgressTimer ignored = ProgressTimer.start(resultBuilder::withMutateMillis)) {
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/WriteNodeLabelApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/WriteNodeLabelApplication.java
@@ -51,7 +51,7 @@ WriteLabelResult compute(
         Expression nodeFilter
     ) {
         var resultBuilder = WriteLabelResult
-            .builder(graphName.getValue(), nodeLabel)
+            .builder(graphName.value(), nodeLabel)
             .withConfig(configuration.toMap());
 
         try (ProgressTimer ignored = ProgressTimer.start(resultBuilder::withWriteMillis)) {
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/WriteNodePropertiesApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/WriteNodePropertiesApplication.java
@@ -90,7 +90,7 @@ NodePropertiesWriteResult write(
 
         // writing
         NodePropertiesWriteResult.Builder builder = new NodePropertiesWriteResult.Builder(
-            graphName.getValue(),
+            graphName.value(),
             allNodeProperties
         );
         try (ProgressTimer ignored = ProgressTimer.start(builder::withWriteMillis)) {
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/WriteRelationshipPropertiesApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/WriteRelationshipPropertiesApplication.java
@@ -62,7 +62,7 @@ WriteRelationshipPropertiesResult compute(
             .build();
 
         var resultBuilder = new WriteRelationshipPropertiesResult.Builder(
-            graphName.getValue(),
+            graphName.value(),
             relationshipType,
             relationshipProperties
         );
diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/WriteRelationshipsApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/WriteRelationshipsApplication.java
@@ -69,7 +69,7 @@ WriteRelationshipResult compute(
 
         // writing
         var builder = new WriteRelationshipResult.Builder(
-            graphName.getValue(),
+            graphName.value(),
             configuration.relationshipType(),
             configuration.relationshipProperty()
         );
diff --git a/core-api/src/main/java/org/neo4j/gds/api/GraphName.java b/core-api/src/main/java/org/neo4j/gds/api/GraphName.java
@@ -27,10 +27,6 @@ public static GraphName parse(String graphNameAsString) {
         return new GraphName(graphNameAsString.trim());
     }
 
-    public String getValue() {
-        return value;
-    }
-
     @Override
     public String toString() {
         return value;
diff --git a/core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalogService.java b/core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalogService.java
@@ -48,7 +48,7 @@
  */
 public class GraphStoreCatalogService {
     public boolean graphExists(User user, DatabaseId databaseId, GraphName graphName) {
-        return GraphStoreCatalog.exists(user.getUsername(), databaseId, graphName.getValue());
+        return GraphStoreCatalog.exists(user.getUsername(), databaseId, graphName.value());
     }
 
     public GraphStoreCatalogEntry removeGraph(
@@ -59,15 +59,15 @@ public GraphStoreCatalogEntry removeGraph(
         var result = new AtomicReference<GraphStoreCatalogEntry>();
         GraphStoreCatalog.remove(
             request,
-            graphName.getValue(),
+            graphName.value(),
             result::set,
             shouldFailIfMissing
         );
         return result.get();
     }
 
     public GraphStoreCatalogEntry get(CatalogRequest catalogRequest, GraphName graphName) {
-        return GraphStoreCatalog.get(catalogRequest, graphName.getValue());
+        return GraphStoreCatalog.get(catalogRequest, graphName.value());
     }
 
     /**
@@ -191,7 +191,7 @@ public Optional<Map<String, Object>> getDegreeDistribution(
         DatabaseId databaseId,
         GraphName graphName
     ) {
-        return GraphStoreCatalog.getDegreeDistribution(user.getUsername(), databaseId, graphName.getValue());
+        return GraphStoreCatalog.getDegreeDistribution(user.getUsername(), databaseId, graphName.value());
     }
 
     public void setDegreeDistribution(
@@ -203,7 +203,7 @@ public void setDegreeDistribution(
         GraphStoreCatalog.setDegreeDistribution(
             user.getUsername(),
             databaseId,
-            graphName.getValue(),
+            graphName.value(),
             degreeDistribution
         );
     }
