Merge pull request #8593 from soerenreichardt/fix-tokenholder-dev-issue

Fix tokens not being registered
neo4j · Jan 16, 2024 · e277f21 · e277f21
2 parents cafdb61 + 3cf25d4
commit e277f21
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/...rage-engine-adapter/src/main/java/org/neo4j/gds/compat/_44/InMemoryStorageEngineImpl.java b/...rage-engine-adapter/src/main/java/org/neo4j/gds/compat/_44/InMemoryStorageEngineImpl.java
@@ -83,7 +83,7 @@ public final class InMemoryStorageEngineImpl implements StorageEngine {
     ) {
         this.databaseLayout = databaseLayout;
         this.graphStore = getGraphStoreFromCatalog(databaseLayout.getDatabaseName());
-        this.txStateVisitor = new InMemoryTransactionStateVisitor(graphStore, tokenHolders);
+        this.txStateVisitor = new InMemoryTransactionStateVisitor(graphStore, tokenHolders, false);
         this.commandCreationContext = new InMemoryCommandCreationContextImpl();
         this.tokenManager = new TokenManager(
             tokenHolders,

diff --git a/...ne-adapter/src/main/java/org/neo4j/gds/storageengine/InMemoryTransactionStateVisitor.java b/...ne-adapter/src/main/java/org/neo4j/gds/storageengine/InMemoryTransactionStateVisitor.java
@@ -36,6 +36,7 @@
 import org.neo4j.storageengine.api.StorageProperty;
 import org.neo4j.storageengine.api.txstate.TxStateVisitor;
 import org.neo4j.token.TokenHolders;
+import org.neo4j.token.api.NamedToken;
 import org.neo4j.token.api.TokenNotFoundException;
 import org.neo4j.values.storable.Value;
 
@@ -47,14 +48,24 @@ public class InMemoryTransactionStateVisitor extends TxStateVisitor.Adapter {
 
     private final CypherGraphStore graphStore;
     private final TokenHolders tokenHolders;
+    private final boolean doRegisterNewTokens;
     private final IntObjectMap<UpdatableNodeProperty> nodePropertiesCache;
 
     public InMemoryTransactionStateVisitor(
         CypherGraphStore graphStore,
         TokenHolders tokenHolders
+    ) {
+        this(graphStore, tokenHolders, true);
+    }
+
+    public InMemoryTransactionStateVisitor(
+        CypherGraphStore graphStore,
+        TokenHolders tokenHolders,
+        boolean doRegisterNewTokens
     ) {
         this.graphStore = graphStore;
         this.tokenHolders = tokenHolders;
+        this.doRegisterNewTokens = doRegisterNewTokens;
         this.nodePropertiesCache = new IntObjectHashMap<>();
     }
 
@@ -111,7 +122,24 @@ public void visitNodeLabelChanges(
 
     @Override
     public void visitCreatedLabelToken(long id, String name, boolean internal) {
-        graphStore.addNodeLabel(NodeLabel.of(name));
+        if (doRegisterNewTokens) {
+            tokenHolders.labelTokens().addToken(new NamedToken(name, (int) id, internal));
+            graphStore.addNodeLabel(NodeLabel.of(name));
+        }
+    }
+
+    @Override
+    public void visitCreatedPropertyKeyToken(long id, String name, boolean internal) {
+        if (doRegisterNewTokens) {
+            tokenHolders.propertyKeyTokens().addToken(new NamedToken(name, (int) id, internal));
+        }
+    }
+
+    @Override
+    public void visitCreatedRelationshipTypeToken(long id, String name, boolean internal) {
+        if (doRegisterNewTokens) {
+            tokenHolders.relationshipTypeTokens().addToken(new NamedToken(name, (int) id, internal));
+        }
     }
 
     private void visitAddedOrChangedNodeProperties(long nodeId, Iterator<StorageProperty> added, Iterator<StorageProperty> changed) {