Register relationship ids as state visitor

soerenreichardt · soerenreichardt · commit 9c89e3988639 · 2022-05-06T14:47:32.000+02:00
diff --git a/cypher/api/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/AbstractInMemoryStorageEngine.java b/cypher/api/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/AbstractInMemoryStorageEngine.java
@@ -91,6 +91,8 @@ public AbstractInMemoryStorageEngine(
             graphStore,
             newCommandCreationContext(EmptyMemoryTracker.INSTANCE)
         );
+        graphStore.initialize(tokenHolders);
+
         this.countsStore = countsStoreFn.apply(graphStore, tokenHolders);
         this.metadataProvider = metadataProvider;
     }
diff --git a/cypher/api/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/TokenManager.java b/cypher/api/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/TokenManager.java
@@ -51,7 +51,6 @@ class TokenManager implements CypherGraphStore.StateVisitor {
 
     public void init() {
         initializeTokensFromGraphStore();
-        graphStore.initialize(tokenHolders);
         graphStore.registerStateVisitor(this);
     }
 
diff --git a/cypher/cypher-core/src/main/java/org/neo4j/gds/core/cypher/CypherGraphStore.java b/cypher/cypher-core/src/main/java/org/neo4j/gds/core/cypher/CypherGraphStore.java
@@ -49,6 +49,7 @@ public CypherGraphStore(GraphStore graphStore) {
 
     public void initialize(TokenHolders tokenHolders) {
         this.relationshipIds = RelationshipIds.fromGraphStore(innerGraphStore(), tokenHolders);
+        registerStateVisitor(relationshipIds);
     }
 
     public void registerStateVisitor(StateVisitor stateVisitor) {

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,8 @@ public AbstractInMemoryStorageEngine(`
`91`	`91`	`graphStore,`
`92`	`92`	`newCommandCreationContext(EmptyMemoryTracker.INSTANCE)`
`93`	`93`	`);`
	`94`	`+ graphStore.initialize(tokenHolders);`
	`95`	`+`
`94`	`96`	`this.countsStore = countsStoreFn.apply(graphStore, tokenHolders);`
`95`	`97`	`this.metadataProvider = metadataProvider;`
`96`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ class TokenManager implements CypherGraphStore.StateVisitor {`
`51`	`51`
`52`	`52`	`public void init() {`
`53`	`53`	`initializeTokensFromGraphStore();`
`54`		`- graphStore.initialize(tokenHolders);`
`55`	`54`	`graphStore.registerStateVisitor(this);`
`56`	`55`	`}`
`57`	`56`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public CypherGraphStore(GraphStore graphStore) {`
`49`	`49`
`50`	`50`	`public void initialize(TokenHolders tokenHolders) {`
`51`	`51`	`this.relationshipIds = RelationshipIds.fromGraphStore(innerGraphStore(), tokenHolders);`
	`52`	`+ registerStateVisitor(relationshipIds);`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`public void registerStateVisitor(StateVisitor stateVisitor) {`