Reflect mutated properties in storage engine

Author: soerenreichardt

cypher/api/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/AbstractInMemoryStorageEngine.java

@@ -92,6 +92,7 @@ public AbstractInMemoryStorageEngine(
         initializeTokenHolders();
         graphStore.initialize(tokenHolders);
         graphStore.registerPropertyRemovalCallback(txStateVisitor::removeNodeProperty);
+        graphStore.registerPropertyAddedCallback(this::addProperty);
         this.countsStore = countsStoreFn.apply(graphStore, tokenHolders);
         this.metadataProvider = metadataProvider;
     }
@@ -209,6 +210,14 @@ private void initializeTokenHolders() {
                 .addToken(new NamedToken(relType.name(), typeCounter.getAndIncrement())));
     }
 
+    private void addProperty(String propertyName) {
+        try {
+            tokenHolders.propertyKeyTokens().getOrCreateId(propertyName);
+        } catch (KernelException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private static CypherGraphStore getGraphStoreFromCatalog(String graphName) {
         return (CypherGraphStore) GraphStoreCatalog.getAllGraphStores()
             .filter(graphStoreWithUserNameAndConfig -> graphStoreWithUserNameAndConfig

cypher/cypher-core/src/main/java/org/neo4j/gds/core/cypher/CypherGraphStore.java

@@ -23,8 +23,10 @@
 import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.GraphStoreAdapter;
 import org.neo4j.gds.api.IdMap;
+import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.token.TokenHolders;
 
+import java.util.Set;
 import java.util.function.Consumer;
 
 public class CypherGraphStore extends GraphStoreAdapter implements NodeLabelUpdater {
@@ -33,6 +35,7 @@ public class CypherGraphStore extends GraphStoreAdapter implements NodeLabelUpda
 
     private RelationshipIds relationshipIds;
     private Consumer<String> propertyRemovalCallback;
+    private Consumer<String> propertyAddedCallback;
 
     public CypherGraphStore(GraphStore graphStore) {
         super(graphStore);
@@ -47,6 +50,10 @@ public void registerPropertyRemovalCallback(Consumer<String> propertyRemovalCall
         this.propertyRemovalCallback = propertyRemovalCallback;
     }
 
+    public void registerPropertyAddedCallback(Consumer<String> propertyAddedCallback) {
+        this.propertyAddedCallback = propertyAddedCallback;
+    }
+
     @Override
     public IdMap nodes() {
         return this.cypherIdMap;
@@ -65,7 +72,19 @@ public void addLabelToNode(long nodeId, NodeLabel nodeLabel) {
     @Override
     public void removeNodeProperty(String propertyKey) {
         super.removeNodeProperty(propertyKey);
-        propertyRemovalCallback.accept(propertyKey);
+        if (propertyRemovalCallback != null) {
+            propertyRemovalCallback.accept(propertyKey);
+        }
+    }
+
+    @Override
+    public void addNodeProperty(
+        Set<NodeLabel> nodeLabels, String propertyKey, NodePropertyValues propertyValues
+    ) {
+        super.addNodeProperty(nodeLabels, propertyKey, propertyValues);
+        if (propertyAddedCallback != null) {
+            propertyAddedCallback.accept(propertyKey);
+        }
     }
 
     public RelationshipIds relationshipIds() {