First iteration of review comment fixes.

neo4j · Jul 19, 2018 · e8f4148 · e8f4148
1 parent 340909f
commit e8f4148
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/IndexReference.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/IndexReference.java
@@ -35,6 +35,8 @@
  */
 public interface IndexReference extends IndexCapability
 {
+    String UNNAMED_INDEX = "Unnamed index";
+
     /**
      * Returns true if this index only allows one value per key.
      */
@@ -60,6 +62,9 @@ public interface IndexReference extends IndexCapability
      */
     String providerVersion();
 
+    /**
+     * The unique name for this index - either automatically generated or user supplied - or the {@link #UNNAMED_INDEX} constant.
+     */
     String name();
 
     /**
@@ -135,7 +140,7 @@ public String providerVersion()
         @Override
         public String name()
         {
-            return null;
+            return UNNAMED_INDEX;
         }
     };
 }
diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/SchemaRead.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/SchemaRead.java
@@ -64,11 +64,11 @@ public interface SchemaRead
     IndexReference indexReferenceUnchecked( int label, int... properties );
 
     /**
-     * Acquire an index reference of the given {@code label} and {@code properties}. This method does not assert
+     * Acquire an index reference of the given {@link SchemaDescriptor}. This method does not assert
      * that the created reference points to a valid online index.
      *
-     * @param schema {@link SchemaDescriptor} for the index
+     * @param schema {@link SchemaDescriptor} for the index.
-     * @return a IndexReference for the given label and properties
+     * @return a IndexReference for the given schema.
      */
     IndexReference indexReferenceUnchecked( SchemaDescriptor schema );
 

diff --git a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java
@@ -26,5 +26,5 @@ public interface WaitStrategy<EXCEPTION extends Exception>
      * Throws Exception to force users of this interface to handle any possible failure, since this is used in
      * potentially very sensitive code.
      */
-    void apply( long iteration, boolean exclusive ) throws EXCEPTION;
+    void apply( long iteration ) throws EXCEPTION;
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java
@@ -408,7 +408,7 @@ public IndexReference indexReferenceUnchecked( SchemaDescriptor schema )
     @Override
     public Iterator<IndexReference> indexesGetForLabel( int labelId )
     {
-        sharedOptimisticLock( ResourceTypes.LABEL, labelId );
+        acquireSharedLock( ResourceTypes.LABEL, labelId );
         ktx.assertOpen();
 
         Iterator<? extends IndexDescriptor> iterator = storageReader.indexesGetForLabel( labelId );
@@ -691,7 +691,7 @@ public boolean constraintExists( ConstraintDescriptor descriptor )
     @Override
     public Iterator<ConstraintDescriptor> constraintsGetForLabel( int labelId )
     {
-        sharedOptimisticLock( ResourceTypes.LABEL, labelId );
+        acquireSharedLock( ResourceTypes.LABEL, labelId );
         ktx.assertOpen();
         Iterator<ConstraintDescriptor> constraints = storageReader.constraintsGetForLabel( labelId );
         if ( ktx.hasTxStateWithChanges() )
@@ -721,7 +721,7 @@ public Iterator<ConstraintDescriptor> constraintsGetAll()
     @Override
     public Iterator<ConstraintDescriptor> constraintsGetForRelationshipType( int typeId )
     {
-        sharedOptimisticLock( ResourceTypes.RELATIONSHIP_TYPE, typeId );
+        acquireSharedLock( ResourceTypes.RELATIONSHIP_TYPE, typeId );
         ktx.assertOpen();
         Iterator<ConstraintDescriptor> constraints = storageReader.constraintsGetForRelationshipType( typeId );
         if ( ktx.hasTxStateWithChanges() )

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
@@ -641,7 +641,7 @@ void acquireSharedSchemaLock( SchemaDescriptor schema )
         ktx.statementLocks().optimistic().acquireShared( ktx.lockTracer(), schema.keyType(), lockingIds );
     }
 
-    void sharedOptimisticLock( ResourceType resource, long resourceId )
+    void acquireSharedLock( ResourceType resource, long resourceId )
     {
         ktx.statementLocks().optimistic().acquireShared( ktx.lockTracer(), resource, resourceId );
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/concurrent/LockWaitStrategies.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/concurrent/LockWaitStrategies.java
@@ -30,7 +30,7 @@ public enum LockWaitStrategies implements WaitStrategy<AcquireLockTimeoutExcepti
     SPIN
     {
         @Override
-        public void apply( long iteration, boolean exclusive ) throws AcquireLockTimeoutException
+        public void apply( long iteration ) throws AcquireLockTimeoutException
         {
             // TODO We can experiment with introducing branch mispredictions here, to create
             // TODO bubbles in the pipeline that'll allow hyper-threaded threads on the
@@ -43,7 +43,7 @@ public void apply( long iteration, boolean exclusive ) throws AcquireLockTimeout
     YIELD
     {
         @Override
-        public void apply( long iteration, boolean exclusive ) throws AcquireLockTimeoutException
+        public void apply( long iteration ) throws AcquireLockTimeoutException
         {
             Thread.yield();
         }
@@ -54,11 +54,11 @@ public void apply( long iteration, boolean exclusive ) throws AcquireLockTimeout
         private static final long multiplyUntilIteration = spinIterations + 2;
 
         @Override
-        public void apply( long iteration, boolean exclusive ) throws AcquireLockTimeoutException
+        public void apply( long iteration ) throws AcquireLockTimeoutException
         {
             if ( iteration < spinIterations )
             {
-                SPIN.apply( iteration, exclusive );
+                SPIN.apply( iteration );
                 return;
             }
 
@@ -83,7 +83,7 @@ public void apply( long iteration, boolean exclusive ) throws AcquireLockTimeout
     NO_WAIT
     {
         @Override
-        public void apply( long iteration, boolean exclusive )
+        public void apply( long iteration )
                 throws AcquireLockTimeoutException
         {
             // The NO_WAIT bail-out is a mix of deadlock and lock acquire timeout.

diff --git a/...unity/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndex.java b/...unity/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndex.java
@@ -144,11 +144,6 @@ public boolean exists() throws IOException
         return true;
     }
 
-    public File getIndexFolder()
-    {
-        return indexStorage.getIndexFolder();
-    }
-
     /**
      * Verify state of the index.
      * If index is already open and in use method assume that index is valid since lucene already operating with it,

diff --git a/...ise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiClient.java b/...ise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiClient.java
@@ -968,7 +968,7 @@ private void waitFor( ForsetiLockManager.Lock lock, ResourceType type, long reso
     {
         waitingForLock = lock;
         clearAndCopyWaitList( lock );
-        waitStrategies[type.typeId()].apply( tries, exclusive );
+        waitStrategies[type.typeId()].apply( tries );
 
         int b = lock.detectDeadlock( id() );
         if ( b != -1 && deadlockResolutionStrategy.shouldAbort( this, clientById.apply( b ) ) )