WIP

Co-authored-by: Martin Junghanns <martin.junghanns@neo4j.com>

Author: IoannisPanagiotas

applications/graph-store-catalog-results/src/main/java/org/neo4j/gds/applications/graphstorecatalog/GraphMemoryUsage.java

@@ -23,8 +23,8 @@
 import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.core.loading.CSRGraphStore;
 import org.neo4j.gds.core.loading.GraphStoreCatalogEntry;
-import org.neo4j.gds.mem.MemoryUsage;
 import org.neo4j.gds.mem.Estimate;
+import org.neo4j.gds.mem.MemoryUsage;
 import org.openjdk.jol.info.GraphWalker;
 
 import java.util.Collections;
@@ -40,7 +40,7 @@ public final class GraphMemoryUsage {
     public final long nodeCount;
     public final long relationshipCount;
 
-    static GraphMemoryUsage of(GraphStoreCatalogEntry graphStoreCatalogEntry) {
+    public static GraphMemoryUsage of(GraphStoreCatalogEntry graphStoreCatalogEntry) {
         var totalSize = new MutableLong();
         var graphStore = graphStoreCatalogEntry.graphStore();
         var detailMemory = internalSizeOfGraph(graphStore, totalSize);

core/build.gradle

@@ -14,6 +14,8 @@ dependencies {
     compileOnly         openGds.immutables.builder
     compileOnly         openGds.immutables.value.annotations
     compileOnly         openGds.jetbrains.annotations
+    implementation openGds.jol.core
+
     compileOnly project(':progress-tracking')
 
     compileOnly group: 'org.neo4j', name: 'annotations', version: ver.'neo4j'

core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalog.java

@@ -30,8 +30,8 @@
 import org.neo4j.gds.api.graph.store.catalog.GraphStoreRemovedEvent;
 import org.neo4j.gds.api.graph.store.catalog.GraphStoreRemovedEventListener;
 import org.neo4j.gds.config.GraphProjectConfig;
+import org.neo4j.gds.core.GraphMemoryUsage;
 import org.neo4j.gds.logging.Log;
-import org.neo4j.gds.mem.MemoryUsage;
 import org.neo4j.gds.utils.ExceptionUtil;
 import org.neo4j.gds.utils.StringJoining;
 
@@ -63,6 +63,7 @@ private GraphStoreCatalog() {
 
     public static void registerGraphStoreAddedListener(GraphStoreAddedEventListener listener) {
         graphStoreAddedEventListeners.add(listener);
+
     }
 
     public static void unregisterGraphStoreAddedListener(GraphStoreAddedEventListener listener) {
@@ -210,7 +211,7 @@ public static void set(GraphProjectConfig config, GraphStore graphStore) {
                         config.username(),
                         graphStore.databaseInfo().databaseId().databaseName(),
                         config.graphName(),
-                        MemoryUsage.sizeOf(graphStore)
+                        GraphMemoryUsage.of(new GraphStoreCatalogEntry(graphStore,config,null)).sizeInBytes
                     )
                 ),
                 log.orElseGet(Log::noOpLog)::warn
@@ -427,7 +428,7 @@ private boolean remove(
                                     config.username(),
                                     graphStore.databaseInfo().databaseId().databaseName(),
                                     config.graphName(),
-                                    MemoryUsage.sizeOf(graphStore)
+                                    GraphMemoryUsage.of(new GraphStoreCatalogEntry(graphStore,config,null)).sizeInBytes
                                 )
                             ),
                             log.orElseGet(Log::noOpLog)::warn