Remove old API

Rip out the remnants of the old API.

community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java

@@ -81,8 +81,7 @@ public void check( NodeRecord record,
     }
 
     /**
-     * Matches indexes to a node. This implementation mirrors NodeSchemaMatcher.onMatchingSchema(...), but as all
-     * accessor methods are different, a shared implementation was hard to achieve.
+     * Matches indexes to a node.
      */
     private void matchIndexesToNode(
             NodeRecord record,

community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java

@@ -43,16 +43,16 @@
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier;
-import org.neo4j.kernel.api.ReadOperations;
+import org.neo4j.kernel.api.StatementConstants;
 import org.neo4j.kernel.api.direct.DirectStoreAccess;
 import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException;
 import org.neo4j.kernel.api.labelscan.LabelScanStore;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.extension.KernelExtensions;
 import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess;
 import org.neo4j.kernel.impl.api.TransactionToApply;
-import org.neo4j.kernel.impl.api.index.IndexStoreView;
 import org.neo4j.kernel.impl.api.index.IndexProviderMap;
+import org.neo4j.kernel.impl.api.index.IndexStoreView;
 import org.neo4j.kernel.impl.api.scan.FullLabelStream;
 import org.neo4j.kernel.impl.factory.DatabaseInfo;
 import org.neo4j.kernel.impl.index.labelscan.NativeLabelScanStore;
@@ -423,7 +423,7 @@ public void delete( PropertyRecord before, PropertyRecord property )
 
         private void updateCounts( NodeRecord node, int delta )
         {
-            writer.incrementNodeCount( ReadOperations.ANY_LABEL, delta );
+            writer.incrementNodeCount( StatementConstants.ANY_LABEL, delta );
             for ( long label : NodeLabelsField.parseLabelsField( node ).get( nodes ) )
             {
                 writer.incrementNodeCount( (int)label, delta );

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java

@@ -133,8 +133,8 @@
 import static org.neo4j.graphdb.RelationshipType.withName;
 import static org.neo4j.helpers.collection.Iterables.asIterable;
 import static org.neo4j.helpers.collection.MapUtil.stringMap;
-import static org.neo4j.kernel.api.ReadOperations.ANY_LABEL;
-import static org.neo4j.kernel.api.ReadOperations.ANY_RELATIONSHIP_TYPE;
+import static org.neo4j.kernel.api.StatementConstants.ANY_LABEL;
+import static org.neo4j.kernel.api.StatementConstants.ANY_RELATIONSHIP_TYPE;
 import static org.neo4j.kernel.api.labelscan.NodeLabelUpdate.labelChanges;
 import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory.forLabel;
 import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory.uniqueForLabel;

community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContextTest.scala

@@ -43,10 +43,8 @@ import org.neo4j.kernel.api.security.AnonymousContext
 import org.neo4j.kernel.impl.api.{ClockContext, KernelStatement, KernelTransactionImplementation, StatementOperationParts}
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge
 import org.neo4j.kernel.impl.coreapi.{InternalTransaction, PropertyContainerLocker}
-import org.neo4j.kernel.impl.factory.CanWrite
 import org.neo4j.kernel.impl.locking.LockTracer
 import org.neo4j.kernel.impl.newapi.DefaultCursors
-import org.neo4j.kernel.impl.proc.Procedures
 import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo
 import org.neo4j.kernel.impl.query.{Neo4jTransactionalContext, Neo4jTransactionalContextFactory}
 import org.neo4j.storageengine.api.StorageStatement
@@ -73,8 +71,7 @@ class TransactionBoundQueryContextTest extends CypherFunSuite {
     when(kernelTransaction.securityContext()).thenReturn(AUTH_DISABLED)
     val storeStatement = mock[StorageStatement]
     val operations = mock[StatementOperationParts](RETURNS_DEEP_STUBS)
-    statement = new KernelStatement(kernelTransaction, null, storeStatement, new Procedures(), new CanWrite(),
-      LockTracer.NONE, operations, new ClockContext(), EmptyVersionContextSupplier.EMPTY)
+    statement = new KernelStatement(kernelTransaction, null, storeStatement, LockTracer.NONE, operations, new ClockContext(), EmptyVersionContextSupplier.EMPTY)
     statement.initialize(null, PageCursorTracerSupplier.NULL.get())
     statement.acquire()
   }

community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Read.java

@@ -216,6 +216,20 @@ long nodeUniqueIndexSeek( IndexReference index, IndexQuery.ExactPredicate... pre
      */
     long countsForRelationshipWithoutTxState( int startLabelId, int typeId, int endLabelId );
 
+    /**
+     * Count of the total number of nodes in the database including changes in the current transaction.
+     *
+     * @return the total number of nodes in the database
+     */
+    long nodesGetCount( );
+
+    /**
+     * Count of the total number of relationships in the database including changes in the current transaction.
+     *
+     * @return the total number of relationships in the database
+     */
+    long relationshipsGetCount( );
+
     /**
      * @param reference
      *         a reference from {@link RelationshipDataAccessor#relationshipReference()}.

community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRead.java

@@ -127,6 +127,18 @@ public long countsForRelationshipWithoutTxState( int startLabelId, int typeId, i
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public long nodesGetCount()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long relationshipsGetCount()
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void singleRelationship( long reference, RelationshipScanCursor cursor )
     {

community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java

@@ -48,21 +48,16 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.extension.dependency.AllByPrioritySelectionStrategy;
 import org.neo4j.kernel.impl.api.CommitProcessFactory;
-import org.neo4j.kernel.impl.api.ConstraintEnforcingEntityOperations;
-import org.neo4j.kernel.impl.api.DataIntegrityValidatingStatementOperations;
 import org.neo4j.kernel.impl.api.DatabaseSchemaState;
 import org.neo4j.kernel.impl.api.ExplicitIndexProviderLookup;
 import org.neo4j.kernel.impl.api.KernelImpl;
 import org.neo4j.kernel.impl.api.KernelTransactionMonitorScheduler;
 import org.neo4j.kernel.impl.api.KernelTransactionTimeoutMonitor;
 import org.neo4j.kernel.impl.api.KernelTransactions;
 import org.neo4j.kernel.impl.api.KernelTransactionsSnapshot;
-import org.neo4j.kernel.impl.api.LockingStatementOperations;
 import org.neo4j.kernel.impl.api.SchemaState;
-import org.neo4j.kernel.impl.api.SchemaStateConcern;
 import org.neo4j.kernel.impl.api.SchemaWriteGuard;
 import org.neo4j.kernel.impl.api.StackingQueryRegistrationOperations;
-import org.neo4j.kernel.impl.api.StateHandlingStatementOperations;
 import org.neo4j.kernel.impl.api.StatementOperationParts;
 import org.neo4j.kernel.impl.api.TransactionCommitProcess;
 import org.neo4j.kernel.impl.api.TransactionHooks;
@@ -680,9 +675,9 @@ private NeoStoreKernelModule buildKernel( LogFiles logFiles, TransactionAppender
                 indexConfigStore, kernelProvider, explicitIndexProviderLookup );
 
         StatementOperationParts statementOperationParts = dependencies.satisfyDependency(
-                buildStatementOperations( storeLayer, autoIndexing,
-                        constraintIndexCreator, databaseSchemaState, explicitIndexStore, cpuClockRef,
-                        heapAllocationRef, indexingService ) );
+                buildStatementOperations(
+                        cpuClockRef,
+                        heapAllocationRef ) );
 
         TransactionHooks hooks = new TransactionHooks();
 
@@ -864,44 +859,13 @@ public DependencyResolver getDependencyResolver()
         return dependencies;
     }
 
-    private StatementOperationParts buildStatementOperations( StoreReadLayer storeReadLayer, AutoIndexing autoIndexing,
-            ConstraintIndexCreator constraintIndexCreator, DatabaseSchemaState databaseSchemaState,
-            ExplicitIndexStore explicitIndexStore, AtomicReference<CpuClock> cpuClockRef,
-            AtomicReference<HeapAllocation> heapAllocationRef,
-            IndexingService indexingService )
+    private StatementOperationParts buildStatementOperations( AtomicReference<CpuClock> cpuClockRef,
+            AtomicReference<HeapAllocation> heapAllocationRef )
     {
-        // The passed in StoreReadLayer is the bottom most layer: Read-access to committed data.
-        // To it we add:
-        // + Transaction state handling
-        StateHandlingStatementOperations stateHandlingContext = new StateHandlingStatementOperations( storeReadLayer,
-                autoIndexing, constraintIndexCreator, explicitIndexStore, indexingService );
-
         QueryRegistrationOperations queryRegistrationOperations =
                 new StackingQueryRegistrationOperations( clock, cpuClockRef, heapAllocationRef );
 
-        StatementOperationParts parts = new StatementOperationParts( stateHandlingContext, stateHandlingContext,
-                stateHandlingContext, stateHandlingContext, stateHandlingContext, stateHandlingContext,
-                new SchemaStateConcern( databaseSchemaState ), null, stateHandlingContext, stateHandlingContext,
-                stateHandlingContext, queryRegistrationOperations );
-        // + Constraints
-        ConstraintEnforcingEntityOperations constraintEnforcingEntityOperations =
-                new ConstraintEnforcingEntityOperations( constraintSemantics, parts.entityWriteOperations(),
-                        parts.entityReadOperations(),
-                        parts.schemaWriteOperations(), parts.schemaReadOperations() );
-        // + Data integrity
-        DataIntegrityValidatingStatementOperations dataIntegrityContext =
-                new DataIntegrityValidatingStatementOperations(
-                        parts.keyWriteOperations(), parts.schemaReadOperations(), constraintEnforcingEntityOperations );
-        parts = parts.override( null, dataIntegrityContext, constraintEnforcingEntityOperations,
-                constraintEnforcingEntityOperations, null, dataIntegrityContext, null, null, null, null, null, null );
-        // + Locking
-        LockingStatementOperations lockingContext = new LockingStatementOperations( parts.entityReadOperations(),
-                parts.entityWriteOperations(), parts.schemaReadOperations(), parts.schemaWriteOperations(),
-                parts.schemaStateOperations() );
-        parts = parts.override( null, null, null, lockingContext, lockingContext, lockingContext, lockingContext,
-                lockingContext, null, null, null, null );
-
-        return parts;
+        return new StatementOperationParts( queryRegistrationOperations );
     }
 
     @Override