Revert Token extends NamedToken

Having Token extend the public NamedToken introduced a massive change for a tiny bit of performance that is most probably not needed there.
neo4j · Mar 2, 2018 · 128918f · 128918f
1 parent 789b7e3
commit 128918f
Show file tree

Hide file tree

Showing 33 changed files with 135 additions and 86 deletions.
diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/NamedToken.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/NamedToken.java
@@ -22,17 +22,59 @@
 /**
  * A token with its associated name.
  */
-public interface NamedToken
+public final class NamedToken
 {
+    private final int id;
+    private final String name;
+
+    public NamedToken( int id, String name )
+    {
+        this.id = id;
+        this.name = name;
+    }
+
     /**
      * Id of token
+     *
      * @return the id of the token
      */
-    int id();
+    public int id()
+    {
+        return id;
+    }
 
     /**
      * The name associated with the token
+     *
      * @return The name corresponding to the token
      */
-    String name();
+    public String name()
+    {
+        return name;
+    }
+
+    @Override
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
+
+        NamedToken that = (NamedToken) o;
+
+        return id == that.id && name.equals( that.name );
+    }
+
+    @Override
+    public int hashCode()
+    {
+        int result = id;
+        result = 31 * result + name.hashCode();
+        return result;
+    }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java
@@ -32,7 +32,6 @@
 import org.neo4j.graphdb.Direction;
 import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.internal.kernel.api.InternalIndexState;
-import org.neo4j.internal.kernel.api.NamedToken;
 import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException;
 import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException;
 import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
@@ -58,6 +57,7 @@
 import org.neo4j.storageengine.api.NodeItem;
 import org.neo4j.storageengine.api.PropertyItem;
 import org.neo4j.storageengine.api.RelationshipItem;
+import org.neo4j.storageengine.api.Token;
 import org.neo4j.storageengine.api.lock.ResourceType;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 import org.neo4j.values.storable.Value;
@@ -82,7 +82,7 @@ public interface ReadOperations
     String labelGetName( int labelId ) throws LabelNotFoundKernelException;
 
     /** Returns the labels currently stored in the database * */
-    Iterator<NamedToken> labelsGetAllTokens();
+    Iterator<Token> labelsGetAllTokens();
     /**
      * Returns a property key id for the given property key. If the property key doesn't exist,
      * {@link StatementConstants#NO_SUCH_PROPERTY_KEY} will be returned.
@@ -93,14 +93,14 @@ public interface ReadOperations
     String propertyKeyGetName( int propertyKeyId ) throws PropertyKeyIdNotFoundKernelException;
 
     /** Returns the property keys currently stored in the database */
-    Iterator<NamedToken> propertyKeyGetAllTokens();
+    Iterator<Token> propertyKeyGetAllTokens();
 
     int relationshipTypeGetForName( String relationshipTypeName );
 
     String relationshipTypeGetName( int relationshipTypeId ) throws RelationshipTypeIdNotFoundKernelException;
 
     /** Returns the relationship types currently stored in the database */
-    Iterator<NamedToken> relationshipTypesGetAllTokens();
+    Iterator<Token> relationshipTypesGetAllTokens();
 
     int labelCount();
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java
@@ -87,7 +87,7 @@ public Stream<LabelResult> listLabels()
         {
             // Ownership of the reference to the acquired statement is transfered to the returned iterator stream,
             // but we still want to eagerly consume the labels, so we can catch any exceptions,
-            List<LabelResult> labelResults = asList( TokenAccess.LABELS.inUse( statement ).map( LabelResult::new ) );
+            List<LabelResult> labelResults = asList( TokenAccess.LABELS.inUse( tx ).map( LabelResult::new ) );
             return labelResults.stream();
         }
         catch ( Throwable t )
@@ -107,7 +107,7 @@ public Stream<PropertyKeyResult> listPropertyKeys()
             // Ownership of the reference to the acquired statement is transfered to the returned iterator stream,
             // but we still want to eagerly consume the labels, so we can catch any exceptions,
             List<PropertyKeyResult> propertyKeys =
-                    asList( TokenAccess.PROPERTY_KEYS.inUse( statement ).map( PropertyKeyResult::new ) );
+                    asList( TokenAccess.PROPERTY_KEYS.inUse( tx ).map( PropertyKeyResult::new ) );
             return propertyKeys.stream();
         }
         catch ( Throwable t )
@@ -127,7 +127,7 @@ public Stream<RelationshipTypeResult> listRelationshipTypes()
             // Ownership of the reference to the acquired statement is transfered to the returned iterator stream,
             // but we still want to eagerly consume the labels, so we can catch any exceptions,
             List<RelationshipTypeResult> relationshipTypes =
-                    asList( TokenAccess.RELATIONSHIP_TYPES.inUse( statement ).map( RelationshipTypeResult::new ) );
+                    asList( TokenAccess.RELATIONSHIP_TYPES.inUse( tx ).map( RelationshipTypeResult::new ) );
             return relationshipTypes.stream();
         }
         catch ( Throwable t )

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java
@@ -36,7 +36,6 @@
 import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.internal.kernel.api.InternalIndexState;
-import org.neo4j.internal.kernel.api.NamedToken;
 import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException;
 import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
@@ -110,6 +109,7 @@
 import org.neo4j.storageengine.api.NodeItem;
 import org.neo4j.storageengine.api.PropertyItem;
 import org.neo4j.storageengine.api.RelationshipItem;
+import org.neo4j.storageengine.api.Token;
 import org.neo4j.storageengine.api.lock.ResourceType;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 import org.neo4j.storageengine.api.schema.SchemaRule;
@@ -687,7 +687,7 @@ public String propertyKeyGetName( int propertyKeyId ) throws PropertyKeyIdNotFou
     }
 
     @Override
-    public Iterator<NamedToken> propertyKeyGetAllTokens()
+    public Iterator<Token> propertyKeyGetAllTokens()
     {
         statement.assertOpen();
         AccessMode mode = tx.securityContext().mode();
@@ -696,14 +696,14 @@ public Iterator<NamedToken> propertyKeyGetAllTokens()
     }
 
     @Override
-    public Iterator<NamedToken> labelsGetAllTokens()
+    public Iterator<Token> labelsGetAllTokens()
     {
         statement.assertOpen();
         return tokenRead().labelsGetAllTokens( statement );
     }
 
     @Override
-    public Iterator<NamedToken> relationshipTypesGetAllTokens()
+    public Iterator<Token> relationshipTypesGetAllTokens()
     {
         statement.assertOpen();
         return tokenRead().relationshipTypesGetAllTokens( statement );

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java
@@ -32,7 +32,6 @@
 import org.neo4j.graphdb.NotFoundException;
 import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.internal.kernel.api.InternalIndexState;
-import org.neo4j.internal.kernel.api.NamedToken;
 import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException;
 import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException;
 import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException;
@@ -93,6 +92,7 @@
 import org.neo4j.storageengine.api.StorageProperty;
 import org.neo4j.storageengine.api.StorageStatement;
 import org.neo4j.storageengine.api.StoreReadLayer;
+import org.neo4j.storageengine.api.Token;
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 import org.neo4j.storageengine.api.txstate.NodeState;
@@ -1373,19 +1373,19 @@ public String propertyKeyGetName( Statement state, int propertyKeyId ) throws Pr
     }
 
     @Override
-    public Iterator<NamedToken> propertyKeyGetAllTokens( Statement state )
+    public Iterator<Token> propertyKeyGetAllTokens( Statement state )
     {
         return storeLayer.propertyKeyGetAllTokens();
     }
 
     @Override
-    public Iterator<NamedToken> labelsGetAllTokens( Statement state )
+    public Iterator<Token> labelsGetAllTokens( Statement state )
     {
         return storeLayer.labelsGetAllTokens();
     }
 
     @Override
-    public Iterator<NamedToken> relationshipTypesGetAllTokens( Statement state )
+    public Iterator<Token> relationshipTypesGetAllTokens( Statement state )
     {
         return storeLayer.relationshipTypeGetAllTokens();
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java
@@ -21,13 +21,13 @@
 
 import java.util.Iterator;
 
-import org.neo4j.internal.kernel.api.NamedToken;
 import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException;
 import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
 import org.neo4j.kernel.api.Statement;
 import org.neo4j.kernel.api.StatementConstants;
 import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException;
 import org.neo4j.kernel.impl.api.KernelStatement;
+import org.neo4j.storageengine.api.Token;
 
 public interface KeyReadOperations
 {
@@ -51,13 +51,13 @@ public interface KeyReadOperations
     String propertyKeyGetName( Statement state, int propertyKeyId ) throws PropertyKeyIdNotFoundKernelException;
 
     /** Returns the property keys currently stored in the database */
-    Iterator<NamedToken> propertyKeyGetAllTokens( Statement state );
+    Iterator<Token> propertyKeyGetAllTokens( Statement state );
 
     /** Returns the labels currently stored in the database **/
-    Iterator<NamedToken> labelsGetAllTokens( Statement state );
+    Iterator<Token> labelsGetAllTokens( Statement state );
 
     /** Returns the relationship types currently stored in the database */
-    Iterator<NamedToken> relationshipTypesGetAllTokens( Statement state );
+    Iterator<Token> relationshipTypesGetAllTokens( Statement state );
 
     int relationshipTypeGetForName( Statement state, String relationshipTypeName );
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java
@@ -33,7 +33,6 @@
 import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.internal.kernel.api.InternalIndexState;
-import org.neo4j.internal.kernel.api.NamedToken;
 import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException;
 import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException;
 import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
@@ -81,6 +80,7 @@
 import org.neo4j.storageengine.api.StorageProperty;
 import org.neo4j.storageengine.api.StorageStatement;
 import org.neo4j.storageengine.api.StoreReadLayer;
+import org.neo4j.storageengine.api.Token;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 import org.neo4j.storageengine.api.schema.SchemaRule;
 
@@ -348,20 +348,20 @@ public Iterator<StorageProperty> graphGetAllProperties()
     }
 
     @Override
-    public Iterator<NamedToken> propertyKeyGetAllTokens()
+    public Iterator<Token> propertyKeyGetAllTokens()
     {
         return propertyKeyTokenHolder.getAllTokens().iterator();
     }
 
     @Override
-    public Iterator<NamedToken> labelsGetAllTokens()
+    public Iterator<Token> labelsGetAllTokens()
     {
         return labelTokenHolder.getAllTokens().iterator();
     }
 
     @SuppressWarnings( "unchecked" )
     @Override
-    public Iterator<NamedToken> relationshipTypeGetAllTokens()
+    public Iterator<Token> relationshipTypeGetAllTokens()
     {
         return (Iterator) relationshipTokenHolder.getAllTokens().iterator();
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/InMemoryTokenCache.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/InMemoryTokenCache.java
@@ -54,7 +54,7 @@ public void clear()
         idToToken.clear();
     }
 
-    private void putAndEnsureUnique( Map<String,Integer> nameToId, Token token, String tokenType )
+    private void putAndEnsureUnique( Map<String,Integer> nameToId, TOKEN token, String tokenType )
     {
         Integer previous = nameToId.putIfAbsent( token.name(), token.id() );
         if ( previous != null && previous != token.id() )

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/LabelTokenHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/LabelTokenHolder.java
@@ -19,8 +19,8 @@
  */
 package org.neo4j.kernel.impl.core;
 
-import org.neo4j.internal.kernel.api.NamedToken;
+import org.neo4j.storageengine.api.Token;
 
-public interface LabelTokenHolder extends TokenHolder<NamedToken>
+public interface LabelTokenHolder extends TokenHolder<Token>
 {
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyKeyTokenHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyKeyTokenHolder.java
@@ -19,8 +19,8 @@
  */
 package org.neo4j.kernel.impl.core;
 
-import org.neo4j.internal.kernel.api.NamedToken;
+import org.neo4j.storageengine.api.Token;
 
-public interface PropertyKeyTokenHolder extends TokenHolder<NamedToken>
+public interface PropertyKeyTokenHolder extends TokenHolder<Token>
 {
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenHolder.java
@@ -21,9 +21,9 @@
 
 import java.util.List;
 
-import org.neo4j.internal.kernel.api.NamedToken;
+import org.neo4j.storageengine.api.Token;
 
-public interface TokenHolder<TOKEN extends NamedToken>
+public interface TokenHolder<TOKEN extends Token>
 {
     int NO_ID = -1;
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java
@@ -110,23 +110,25 @@ public String propertyKeyName( int propertyKeyId ) throws PropertyKeyIdNotFoundK
     public Iterator<NamedToken> labelsGetAllTokens()
     {
         ktx.assertOpen();
-        return store.labelsGetAllTokens();
+        return Iterators.map( token -> new NamedToken( token.id(), token.name() ), store.labelsGetAllTokens());
     }
 
     @Override
     public Iterator<NamedToken> propertyKeyGetAllTokens()
     {
         ktx.assertOpen();
         AccessMode mode = ktx.securityContext().mode();
-        return Iterators.stream( store.propertyKeyGetAllTokens() ).
+        return Iterators.stream( store.propertyKeyGetAllTokens() )
-                filter( propKey -> mode.allowsPropertyReads( propKey.id() ) ).iterator();
+                .filter( propKey -> mode.allowsPropertyReads( propKey.id() ) )
+                .map( token -> new NamedToken( token.id(), token.name()  ) )
+                .iterator();
     }
 
     @Override
     public Iterator<NamedToken> relationshipTypesGetAllTokens()
     {
         ktx.assertOpen();
-        return store.relationshipTypeGetAllTokens();
+        return Iterators.map( token -> new NamedToken( token.id(), token.name() ), store.relationshipTypeGetAllTokens());
     }
 
     private String checkValidTokenName( String name ) throws IllegalTokenNameException

diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java
@@ -30,7 +30,6 @@
 import org.neo4j.cursor.Cursor;
 import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.internal.kernel.api.InternalIndexState;
-import org.neo4j.internal.kernel.api.NamedToken;
 import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException;
 import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException;
 import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
@@ -230,17 +229,17 @@ long indexGetCommittedId( IndexDescriptor index )
     /**
      * @return all stored property key tokens.
      */
-    Iterator<NamedToken> propertyKeyGetAllTokens();
+    Iterator<Token> propertyKeyGetAllTokens();
 
     /**
      * @return all stored label tokens.
      */
-    Iterator<NamedToken> labelsGetAllTokens();
+    Iterator<Token> labelsGetAllTokens();
 
     /**
      * @return all stored relationship type tokens.
      */
-    Iterator<NamedToken> relationshipTypeGetAllTokens();
+    Iterator<Token> relationshipTypeGetAllTokens();
 
     /**
      * @param relationshipTypeName name of relationship type.

diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/Token.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/Token.java
@@ -19,9 +19,8 @@
  */
 package org.neo4j.storageengine.api;
 
-import org.neo4j.internal.kernel.api.NamedToken;
 
-public class Token implements NamedToken
+public class Token
 {
     private final String name;
     private final int id;