Remove unused nodeCursorGetFromUniqueIndexSeek

neo4j · Jan 4, 2017 · ceef06d · ceef06d
1 parent 20f3ed9
commit ceef06d
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 76 deletions.
diff --git a/...y/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java b/...y/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java
@@ -455,14 +455,6 @@ public Cursor<NodeItem> nodeCursorGetForLabel( KernelStatement statement, int la
         return entityReadOperations.nodeCursorGetForLabel( statement, labelId );
     }
 
-    @Override
-    public Cursor<NodeItem> nodeCursorGetFromUniqueIndexSeek( KernelStatement statement,
-            IndexDescriptor index,
-            Object value ) throws IndexNotFoundKernelException, IndexBrokenKernelException
-    {
-        return entityReadOperations.nodeCursorGetFromUniqueIndexSeek( statement, index, value );
-    }
-
     @Override
     public IndexDescriptor indexCreate( KernelStatement state, int labelId, int propertyKeyId )
             throws AlreadyIndexedException, AlreadyConstrainedException

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/GuardingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/GuardingStatementOperations.java
@@ -337,15 +337,6 @@ public Cursor<NodeItem> nodeCursorGetForLabel( KernelStatement statement, int la
         return entityReadDelegate.nodeCursorGetForLabel( statement, labelId );
     }
 
-    @Override
-    public Cursor<NodeItem> nodeCursorGetFromUniqueIndexSeek( KernelStatement statement,
-            IndexDescriptor index,
-            Object value ) throws IndexNotFoundKernelException, IndexBrokenKernelException
-    {
-        guard.check( statement );
-        return entityReadDelegate.nodeCursorGetFromUniqueIndexSeek( statement, index, value );
-    }
-
     @Override
     public long nodesGetCount( KernelStatement 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
@@ -78,7 +78,6 @@
 import org.neo4j.kernel.impl.api.store.RelationshipIterator;
 import org.neo4j.kernel.impl.index.IndexEntityType;
 import org.neo4j.kernel.impl.index.LegacyIndexStore;
-import org.neo4j.kernel.impl.util.Cursors;
 import org.neo4j.kernel.impl.util.Validators;
 import org.neo4j.register.Register.DoubleLongRegister;
 import org.neo4j.storageengine.api.EntityType;
@@ -199,18 +198,6 @@ public Cursor<NodeItem> nodeCursorGetForLabel( KernelStatement statement, int la
                 storeLayer.nodesGetForLabel( storeStatement, labelId ) );
     }
 
-    @Override
-    public Cursor<NodeItem> nodeCursorGetFromUniqueIndexSeek( KernelStatement statement,
-            IndexDescriptor index,
-            Object value ) throws IndexBrokenKernelException, IndexNotFoundKernelException
-    {
-        // TODO Filter this properly
-        StorageStatement storeStatement = statement.getStoreStatement();
-        IndexReader reader = storeStatement.getFreshIndexReader( index );
-        PrimitiveLongIterator seekResult = PrimitiveLongCollections.resourceIterator( reader.seek( value ), reader );
-        return storeStatement.acquireIteratorNodeCursor( seekResult );
-    }
-
     // </Cursors>
 
     @Override

diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java b/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java
@@ -148,10 +148,6 @@ Cursor<RelationshipItem> relationshipCursorById( KernelStatement statement, long
 
     Cursor<NodeItem> nodeCursorGetForLabel( KernelStatement statement, int labelId );
 
-    Cursor<NodeItem> nodeCursorGetFromUniqueIndexSeek( KernelStatement statement,
-            IndexDescriptor index,
-            Object value ) throws IndexBrokenKernelException, IndexNotFoundKernelException;
-
     long nodesGetCount( KernelStatement statement );
 
     long relationshipsGetCount( KernelStatement statement );

diff --git a/...l/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java b/...l/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java
@@ -54,7 +54,6 @@
 import org.neo4j.storageengine.api.schema.LabelScanReader;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyLong;
@@ -399,29 +398,6 @@ public void nodeGetFromUniqueIndexSeekClosesIndexReader() throws Exception
         verify( indexReader ).close();
     }
 
-    @Test
-    public void nodeCursorGetFromUniqueIndexSeekClosesIndexReader() throws Exception
-    {
-        KernelStatement kernelStatement = mock( KernelStatement.class );
-        IndexReader indexReader = mock( IndexReader.class );
-        StoreStatement storeStatement = new StoreStatementWithSingleFreshIndexReader( indexReader );
-
-        when( indexReader.seek( any() ) ).thenReturn( PrimitiveLongCollections.emptyIterator() );
-        when( kernelStatement.getStoreStatement() ).thenReturn( storeStatement );
-
-        StateHandlingStatementOperations operations = newTxStateOps( mock( StoreReadLayer.class ) );
-
-        try ( Cursor<NodeItem> cursor = operations.nodeCursorGetFromUniqueIndexSeek( kernelStatement,
-                new IndexDescriptor( 1, 1 ), "foo" ) )
-        {
-            while ( cursor.next() )
-            {
-                fail( "Cursor should be empty" );
-            }
-        }
-        verify( indexReader ).close();
-    }
-
     private StateHandlingStatementOperations newTxStateOps( StoreReadLayer delegate )
     {
         return new StateHandlingStatementOperations( delegate,
@@ -443,22 +419,4 @@ private IndexReader addMockedIndexReader( StorageStatement storeStatement )
         when( storeStatement.getIndexReader( any( IndexDescriptor.class ) ) ).thenReturn( indexReader );
         return indexReader;
     }
-
-    private static class StoreStatementWithSingleFreshIndexReader extends StoreStatement
-    {
-        final IndexReader reader;
-
-        StoreStatementWithSingleFreshIndexReader( IndexReader reader )
-        {
-            super( basicMockedNeoStores(), () -> mock( IndexReaderFactory.class ),
-                    () -> mock( LabelScanReader.class ),  new ReentrantLockService() );
-            this.reader = reader;
-        }
-
-        @Override
-        public IndexReader getFreshIndexReader( IndexDescriptor descriptor ) throws IndexNotFoundKernelException
-        {
-            return reader;
-        }
-    }
 }