Fix indexState

neo4j · Mar 13, 2017 · bc01412 · bc01412
1 parent 23656a2
commit bc01412
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
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
@@ -743,7 +743,7 @@ public InternalIndexState indexGetState( KernelStatement state, NewIndexDescript
             }
         }
 
-        return storeLayer.indexGetState( descriptor.schema() );
+        return storeLayer.indexGetState( descriptor );
     }
 
     @Override

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
@@ -239,9 +239,9 @@ public long indexGetCommittedId( NewIndexDescriptor index )
     }
 
     @Override
-    public InternalIndexState indexGetState( LabelSchemaDescriptor descriptor ) throws IndexNotFoundKernelException
+    public InternalIndexState indexGetState( NewIndexDescriptor descriptor ) throws IndexNotFoundKernelException
     {
-        return indexService.getIndexProxy( NewIndexDescriptorFactory.forSchema( descriptor ) ).getState();
+        return indexService.getIndexProxy( descriptor ).getState();
     }
 
     @Override

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
@@ -151,7 +151,7 @@ long indexGetCommittedId( NewIndexDescriptor index )
      * @return {@link InternalIndexState} for index.
      * @throws IndexNotFoundKernelException if index not found.
      */
-    InternalIndexState indexGetState( LabelSchemaDescriptor descriptor ) throws IndexNotFoundKernelException;
+    InternalIndexState indexGetState( NewIndexDescriptor descriptor ) throws IndexNotFoundKernelException;
 
     /**
      * @param descriptor {@link LabelSchemaDescriptor} to get population progress for.

diff --git a/.../kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java b/.../kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java
@@ -86,7 +86,7 @@ public void before() throws Exception
         state = StatementOperationsTestHelper.mockedState( txState );
 
         store = mock( StoreReadLayer.class );
-        when( store.indexGetState( newIndexDescriptor.schema() ) ).thenReturn( InternalIndexState.ONLINE );
+        when( store.indexGetState( newIndexDescriptor ) ).thenReturn( InternalIndexState.ONLINE );
         when( store.indexesGetForLabel( labelId ) ).then( answerAsIteratorFrom( indexes ) );
         when( store.indexesGetAll() ).then( answerAsIteratorFrom( indexes ) );
         when( store.constraintsGetForLabel( labelId ) ).thenReturn( Collections.emptyIterator() );