Move progression to storageengine/api package

neo4j · May 8, 2017 · dc7454c · dc7454c
1 parent 4360684
commit dc7454c
Show file tree

Hide file tree

Showing 25 changed files with 54 additions and 48 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
@@ -158,7 +158,7 @@
 import org.neo4j.logging.Log;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.logging.Logger;
-import org.neo4j.storageengine.api.ProgressionFactory;
+import org.neo4j.storageengine.api.BatchingProgressionFactory;
 import org.neo4j.storageengine.api.StorageEngine;
 import org.neo4j.storageengine.api.StoreFileMetadata;
 import org.neo4j.storageengine.api.StoreReadLayer;
@@ -270,7 +270,7 @@ boolean applicable( DiagnosticsPhase phase )
     private final AvailabilityGuard availabilityGuard;
     private final SystemNanoClock clock;
     private final StoreCopyCheckPointMutex storeCopyCheckPointMutex;
-    private final ProgressionFactory progressionFactory;
+    private final BatchingProgressionFactory progressionFactory;
 
     private Dependencies dependencies;
     private LifeSupport life;
@@ -327,7 +327,7 @@ public NeoStoreDataSource(
             SystemNanoClock clock,
             AccessCapability accessCapability,
             StoreCopyCheckPointMutex storeCopyCheckPointMutex,
-            ProgressionFactory progressionFactory )
+            BatchingProgressionFactory progressionFactory )
     {
         this.storeDir = storeDir;
         this.config = config;
@@ -573,7 +573,7 @@ private StorageEngine buildStorageEngine( PropertyKeyTokenHolder propertyKeyToke
             LabelTokenHolder labelTokens, RelationshipTypeTokenHolder relationshipTypeTokens,
             LegacyIndexProviderLookup legacyIndexProviderLookup, IndexConfigStore indexConfigStore,
             Runnable schemaStateChangeCallback, SynchronizedArrayIdOrderingQueue legacyIndexTransactionOrdering,
-            ProgressionFactory progressionFactory )
+            BatchingProgressionFactory progressionFactory )
     {
         // TODO we should break this dependency on the kernelModule (which has not yet been created at this point in
         // TODO the code) and instead let information about generations of transactions flow through the StorageEngine

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
@@ -92,7 +92,6 @@
 import org.neo4j.storageengine.api.Direction;
 import org.neo4j.storageengine.api.EntityType;
 import org.neo4j.storageengine.api.NodeItem;
-import org.neo4j.storageengine.api.ProgressionFactory;
 import org.neo4j.storageengine.api.PropertyItem;
 import org.neo4j.storageengine.api.RelationshipItem;
 import org.neo4j.storageengine.api.StorageProperty;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/AllNodeScan.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/AllNodeScan.java
@@ -20,6 +20,7 @@
 package org.neo4j.kernel.impl.api.store;
 
 import org.neo4j.kernel.impl.store.NodeStore;
+import org.neo4j.storageengine.api.BatchingLongProgression;
 
 public class AllNodeScan implements BatchingLongProgression
 {

diff --git a/...pi/store/CommunityProgressionFactory.java → .../CommunityBatchingProgressionFactory.java b/...pi/store/CommunityProgressionFactory.java → .../CommunityBatchingProgressionFactory.java
@@ -20,9 +20,10 @@
 package org.neo4j.kernel.impl.api.store;
 
 import org.neo4j.kernel.impl.store.NodeStore;
-import org.neo4j.storageengine.api.ProgressionFactory;
+import org.neo4j.storageengine.api.BatchingLongProgression;
+import org.neo4j.storageengine.api.BatchingProgressionFactory;
 
-public class CommunityProgressionFactory implements ProgressionFactory
+public class CommunityBatchingProgressionFactory implements BatchingProgressionFactory
 {
     @Override
     public BatchingLongProgression singleNodeFetch( long nodeId )

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeCursor.java
@@ -33,6 +33,7 @@
 import org.neo4j.kernel.impl.store.record.NodeRecord;
 import org.neo4j.kernel.impl.store.record.Record;
 import org.neo4j.kernel.impl.util.IoPrimitiveUtils;
+import org.neo4j.storageengine.api.BatchingLongProgression;
 import org.neo4j.storageengine.api.NodeItem;
 import org.neo4j.storageengine.api.txstate.NodeState;
 import org.neo4j.storageengine.api.txstate.NodeTransactionStateView;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SingleNodeFetch.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SingleNodeFetch.java
@@ -19,6 +19,8 @@
  */
 package org.neo4j.kernel.impl.api.store;
 
+import org.neo4j.storageengine.api.BatchingLongProgression;
+
 import static org.neo4j.kernel.api.StatementConstants.NO_SUCH_NODE;
 
 public class SingleNodeFetch implements BatchingLongProgression

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
@@ -63,7 +63,7 @@
 import org.neo4j.register.Register.DoubleLongRegister;
 import org.neo4j.storageengine.api.Direction;
 import org.neo4j.storageengine.api.NodeItem;
-import org.neo4j.storageengine.api.ProgressionFactory;
+import org.neo4j.storageengine.api.BatchingProgressionFactory;
 import org.neo4j.storageengine.api.PropertyItem;
 import org.neo4j.storageengine.api.RelationshipItem;
 import org.neo4j.storageengine.api.StorageProperty;
@@ -102,12 +102,12 @@ public class StorageLayer implements StoreReadLayer
     private final PropertyLoader propertyLoader;
     private final Supplier<StorageStatement> statementProvider;
     private final SchemaCache schemaCache;
-    private final ProgressionFactory progressionFactory;
+    private final BatchingProgressionFactory progressionFactory;
 
     public StorageLayer( PropertyKeyTokenHolder propertyKeyTokenHolder, LabelTokenHolder labelTokenHolder,
             RelationshipTypeTokenHolder relationshipTokenHolder, SchemaStorage schemaStorage, NeoStores neoStores,
             IndexingService indexService, Supplier<StorageStatement> storeStatementSupplier, SchemaCache schemaCache,
-            ProgressionFactory progressionFactory )
+            BatchingProgressionFactory progressionFactory )
     {
         this.relationshipTokenHolder = relationshipTokenHolder;
         this.schemaStorage = schemaStorage;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StoreStatement.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StoreStatement.java
@@ -29,6 +29,7 @@
 import org.neo4j.kernel.impl.locking.LockService;
 import org.neo4j.kernel.impl.store.NeoStores;
 import org.neo4j.kernel.impl.util.InstanceCache;
+import org.neo4j.storageengine.api.BatchingLongProgression;
 import org.neo4j.storageengine.api.Direction;
 import org.neo4j.storageengine.api.NodeItem;
 import org.neo4j.storageengine.api.PropertyItem;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/CommunityEditionModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/CommunityEditionModule.java
@@ -38,7 +38,7 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.SchemaWriteGuard;
 import org.neo4j.kernel.impl.api.index.RemoveOrphanConstraintIndexesOnStartup;
-import org.neo4j.kernel.impl.api.store.CommunityProgressionFactory;
+import org.neo4j.kernel.impl.api.store.CommunityBatchingProgressionFactory;
 import org.neo4j.kernel.impl.api.store.StoreStatement;
 import org.neo4j.kernel.impl.constraints.ConstraintSemantics;
 import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics;
@@ -72,7 +72,7 @@
 import org.neo4j.kernel.internal.KernelData;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.kernel.lifecycle.LifecycleStatus;
-import org.neo4j.storageengine.api.ProgressionFactory;
+import org.neo4j.storageengine.api.BatchingProgressionFactory;
 import org.neo4j.udc.UsageData;
 
 /**
@@ -147,9 +147,9 @@ public CommunityEditionModule( PlatformModule platformModule )
         dependencies.satisfyDependency( createSessionTracker() );
     }
 
-    protected ProgressionFactory createProgressionFactory()
+    protected BatchingProgressionFactory createProgressionFactory()
     {
-        return new CommunityProgressionFactory();
+        return new CommunityBatchingProgressionFactory();
     }
 
     static Predicate<String> fileWatcherFileNameFilter()

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/EditionModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/EditionModule.java
@@ -58,7 +58,7 @@
 import org.neo4j.kernel.internal.KernelDiagnostics;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.logging.Log;
-import org.neo4j.storageengine.api.ProgressionFactory;
+import org.neo4j.storageengine.api.BatchingProgressionFactory;
 import org.neo4j.udc.UsageData;
 import org.neo4j.udc.UsageDataKeys;
 
@@ -106,7 +106,7 @@ public abstract class EditionModule
 
     public FileSystemWatcherService watcherService;
 
-    public ProgressionFactory progressionFactory;
+    public BatchingProgressionFactory progressionFactory;
 
     protected FileSystemWatcherService createFileSystemWatcherService( FileSystemAbstraction fileSystem, File storeDir,
             LogService logging, JobScheduler jobScheduler, Predicate<String> fileNameFilter )

diff --git a/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java b/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java
@@ -111,7 +111,7 @@
 import org.neo4j.logging.LogProvider;
 import org.neo4j.storageengine.api.CommandReaderFactory;
 import org.neo4j.storageengine.api.CommandsToApply;
-import org.neo4j.storageengine.api.ProgressionFactory;
+import org.neo4j.storageengine.api.BatchingProgressionFactory;
 import org.neo4j.storageengine.api.StorageCommand;
 import org.neo4j.storageengine.api.StorageEngine;
 import org.neo4j.storageengine.api.StorageStatement;
@@ -196,7 +196,7 @@ public RecordStorageEngine(
             IndexConfigStore indexConfigStore,
             IdOrderingQueue legacyIndexTransactionOrdering,
             Supplier<KernelTransactionsSnapshot> transactionsSnapshotSupplier,
-            ProgressionFactory progressionFactory )
+            BatchingProgressionFactory progressionFactory )
     {
         this.propertyKeyTokenHolder = propertyKeyTokenHolder;
         this.relationshipTypeTokenHolder = relationshipTypeTokens;

diff --git a/...pl/api/store/BatchingLongProgression.java → ...geengine/api/BatchingLongProgression.java b/...pl/api/store/BatchingLongProgression.java → ...geengine/api/BatchingLongProgression.java
@@ -17,7 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.impl.api.store;
+package org.neo4j.storageengine.api;
+
+import org.neo4j.kernel.impl.api.store.Batch;
 
 public interface BatchingLongProgression
 {

diff --git a/...storageengine/api/ProgressionFactory.java → ...ngine/api/BatchingProgressionFactory.java b/...storageengine/api/ProgressionFactory.java → ...ngine/api/BatchingProgressionFactory.java
@@ -19,10 +19,9 @@
  */
 package org.neo4j.storageengine.api;
 
-import org.neo4j.kernel.impl.api.store.BatchingLongProgression;
 import org.neo4j.kernel.impl.store.NodeStore;
 
-public interface ProgressionFactory
+public interface BatchingProgressionFactory
 {
     BatchingLongProgression singleNodeFetch( long nodeId );
 

diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageStatement.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageStatement.java
@@ -22,7 +22,6 @@
 import org.neo4j.cursor.Cursor;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
-import org.neo4j.kernel.impl.api.store.BatchingLongProgression;
 import org.neo4j.kernel.impl.api.store.NodeDegreeCounter;
 import org.neo4j.kernel.impl.locking.Lock;
 import org.neo4j.storageengine.api.schema.IndexReader;

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeCursorTest.java
@@ -41,6 +41,7 @@
 import org.neo4j.kernel.impl.store.NodeStore;
 import org.neo4j.kernel.impl.store.record.NodeRecord;
 import org.neo4j.kernel.impl.util.IoPrimitiveUtils;
+import org.neo4j.storageengine.api.BatchingLongProgression;
 import org.neo4j.storageengine.api.NodeItem;
 import org.neo4j.storageengine.api.txstate.NodeTransactionStateView;
 import org.neo4j.storageengine.api.txstate.ReadableTransactionState;

diff --git a/...ty/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataViewTest.java b/...ty/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataViewTest.java
@@ -40,11 +40,11 @@
 import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.kernel.impl.api.state.TxState;
-import org.neo4j.kernel.impl.api.store.BatchingLongProgression;
 import org.neo4j.kernel.impl.api.store.StoreStatement;
 import org.neo4j.kernel.impl.core.NodeProxy;
 import org.neo4j.kernel.impl.core.RelationshipProxy;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
+import org.neo4j.storageengine.api.BatchingLongProgression;
 import org.neo4j.storageengine.api.NodeItem;
 import org.neo4j.storageengine.api.RelationshipItem;
 import org.neo4j.storageengine.api.StoreReadLayer;
@@ -58,7 +58,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.neo4j.helpers.collection.Iterables.single;

diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoreDataSourceRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoreDataSourceRule.java
@@ -37,7 +37,7 @@
 import org.neo4j.kernel.impl.api.legacyindex.InternalAutoIndexing;
 import org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider;
 import org.neo4j.kernel.impl.api.scan.NativeLabelScanStoreExtension;
-import org.neo4j.kernel.impl.api.store.CommunityProgressionFactory;
+import org.neo4j.kernel.impl.api.store.CommunityBatchingProgressionFactory;
 import org.neo4j.kernel.impl.api.store.StoreStatement;
 import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics;
 import org.neo4j.kernel.impl.core.DatabasePanicEventGenerator;
@@ -141,7 +141,7 @@ TransactionHeaderInformationFactory.DEFAULT, new StartupStatisticsProvider(), nu
                 new StandardConstraintSemantics(), StoreStatement::new, monitors,
                 new Tracers( "null", NullLog.getInstance(), monitors, jobScheduler ), mock( Procedures.class ),
                 IOLimiter.unlimited(), new AvailabilityGuard( clock, NullLog.getInstance() ), clock, new CanWrite(),
-                new StoreCopyCheckPointMutex(), new CommunityProgressionFactory() );
+                new StoreCopyCheckPointMutex(), new CommunityBatchingProgressionFactory() );
 
         return dataSource;
     }

diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java
@@ -35,7 +35,7 @@
 import org.neo4j.kernel.impl.api.LegacyIndexProviderLookup;
 import org.neo4j.kernel.impl.api.index.IndexingService;
 import org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider;
-import org.neo4j.kernel.impl.api.store.CommunityProgressionFactory;
+import org.neo4j.kernel.impl.api.store.CommunityBatchingProgressionFactory;
 import org.neo4j.kernel.impl.api.store.StoreStatement;
 import org.neo4j.kernel.impl.constraints.ConstraintSemantics;
 import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics;
@@ -216,7 +216,7 @@ private class ExtendedRecordStorageEngine extends RecordStorageEngine
                     constraintSemantics, storageStatementFactory, scheduler, tokenNameLookup, lockService,
                     indexProvider, indexingServiceMonitor, databaseHealth, labelScanStoreProvider,
                     legacyIndexProviderLookup, indexConfigStore, legacyIndexTransactionOrdering,
-                    transactionsSnapshotSupplier, new CommunityProgressionFactory() );
+                    transactionsSnapshotSupplier, new CommunityBatchingProgressionFactory() );
             this.transactionApplierTransformer = transactionApplierTransformer;
         }
 

diff --git a/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java b/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
@@ -73,7 +73,7 @@
 import org.neo4j.kernel.impl.api.SchemaWriteGuard;
 import org.neo4j.kernel.impl.api.TransactionHeaderInformation;
 import org.neo4j.kernel.impl.api.index.RemoveOrphanConstraintIndexesOnStartup;
-import org.neo4j.kernel.impl.api.store.EnterpriseProgressionFactory;
+import org.neo4j.kernel.impl.api.store.EnterpriseBatchingProgressionFactory;
 import org.neo4j.kernel.impl.api.store.StoreStatement;
 import org.neo4j.kernel.impl.coreapi.CoreAPIAvailabilityGuard;
 import org.neo4j.kernel.impl.enterprise.EnterpriseConstraintSemantics;
@@ -287,7 +287,7 @@ private void editionInvariants( PlatformModule platformModule, Dependencies depe
 
         storageStatementFactory = StoreStatement::new;
 
-        progressionFactory = dependencies.satisfyDependency( new EnterpriseProgressionFactory() );
+        progressionFactory = dependencies.satisfyDependency( new EnterpriseBatchingProgressionFactory() );
 
         coreAPIAvailabilityGuard =
                 new CoreAPIAvailabilityGuard( platformModule.availabilityGuard, transactionStartTimeout );

diff --git a/.../main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java b/.../main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java
@@ -63,7 +63,7 @@
 import org.neo4j.kernel.impl.api.ReadOnlyTransactionCommitProcess;
 import org.neo4j.kernel.impl.api.TransactionCommitProcess;
 import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess;
-import org.neo4j.kernel.impl.api.store.EnterpriseProgressionFactory;
+import org.neo4j.kernel.impl.api.store.EnterpriseBatchingProgressionFactory;
 import org.neo4j.kernel.impl.api.store.StoreStatement;
 import org.neo4j.kernel.impl.core.DelegatingLabelTokenHolder;
 import org.neo4j.kernel.impl.core.DelegatingPropertyKeyTokenHolder;
@@ -168,7 +168,7 @@ public class EnterpriseReadReplicaEditionModule extends EditionModule
 
         storageStatementFactory = StoreStatement::new;
 
-        progressionFactory = dependencies.satisfyDependency( new EnterpriseProgressionFactory() );
+        progressionFactory = dependencies.satisfyDependency( new EnterpriseBatchingProgressionFactory() );
 
         coreAPIAvailabilityGuard =
                 new CoreAPIAvailabilityGuard( platformModule.availabilityGuard, transactionStartTimeout );

diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java
@@ -129,7 +129,7 @@
 import org.neo4j.kernel.impl.api.TransactionCommitProcess;
 import org.neo4j.kernel.impl.api.TransactionHeaderInformation;
 import org.neo4j.kernel.impl.api.index.RemoveOrphanConstraintIndexesOnStartup;
-import org.neo4j.kernel.impl.api.store.EnterpriseProgressionFactory;
+import org.neo4j.kernel.impl.api.store.EnterpriseBatchingProgressionFactory;
 import org.neo4j.kernel.impl.api.store.StoreStatement;
 import org.neo4j.kernel.impl.core.DelegatingLabelTokenHolder;
 import org.neo4j.kernel.impl.core.DelegatingPropertyKeyTokenHolder;
@@ -528,7 +528,7 @@ public void elected( String role, InstanceId instanceId, URI electedMember )
 
         storageStatementFactory = StoreStatement::new;
 
-        progressionFactory = dependencies.satisfyDependency( new EnterpriseProgressionFactory() );
+        progressionFactory = dependencies.satisfyDependency( new EnterpriseBatchingProgressionFactory() );
 
         coreAPIAvailabilityGuard = new CoreAPIAvailabilityGuard( platformModule.availabilityGuard, transactionStartTimeout );
 

diff --git a/...i/store/EnterpriseProgressionFactory.java → ...EnterpriseBatchingProgressionFactory.java b/...i/store/EnterpriseProgressionFactory.java → ...EnterpriseBatchingProgressionFactory.java
@@ -20,8 +20,9 @@
 package org.neo4j.kernel.impl.api.store;
 
 import org.neo4j.kernel.impl.store.NodeStore;
+import org.neo4j.storageengine.api.BatchingLongProgression;
 
-public class EnterpriseProgressionFactory extends CommunityProgressionFactory
+public class EnterpriseBatchingProgressionFactory extends CommunityBatchingProgressionFactory
 {
     @Override
     public BatchingLongProgression parallelAllNodeScan( NodeStore nodeStore )

diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/api/store/ParallelAllNodeScan.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/api/store/ParallelAllNodeScan.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.neo4j.kernel.impl.store.NodeStore;
+import org.neo4j.storageengine.api.BatchingLongProgression;
 
 class ParallelAllNodeScan implements BatchingLongProgression
 {

diff --git a/...rprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java b/...rprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java
@@ -26,8 +26,7 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.enterprise.api.security.EnterpriseAuthManager;
 import org.neo4j.kernel.enterprise.builtinprocs.EnterpriseBuiltInDbmsProcedures;
-import org.neo4j.kernel.impl.api.store.CommunityProgressionFactory;
-import org.neo4j.kernel.impl.api.store.EnterpriseProgressionFactory;
+import org.neo4j.kernel.impl.api.store.EnterpriseBatchingProgressionFactory;
 import org.neo4j.kernel.impl.constraints.ConstraintSemantics;
 import org.neo4j.kernel.impl.enterprise.configuration.EnterpriseEditionSettings;
 import org.neo4j.kernel.impl.enterprise.id.EnterpriseIdTypeConfigurationProvider;
@@ -40,10 +39,9 @@
 import org.neo4j.kernel.impl.locking.StatementLocksFactory;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.proc.Procedures;
-import org.neo4j.kernel.impl.storageengine.impl.recordstorage.StorageStatementFactory;
 import org.neo4j.kernel.impl.store.id.configuration.IdTypeConfigurationProvider;
 import org.neo4j.kernel.impl.store.stats.IdBasedStoreEntityCounters;
-import org.neo4j.storageengine.api.ProgressionFactory;
+import org.neo4j.storageengine.api.BatchingProgressionFactory;
 
 /**
  * This implementation of {@link EditionModule} creates the implementations of services
@@ -78,9 +76,9 @@ protected ConstraintSemantics createSchemaRuleVerifier()
     }
 
     @Override
-    protected ProgressionFactory createProgressionFactory()
+    protected BatchingProgressionFactory createProgressionFactory()
     {
-        return new EnterpriseProgressionFactory();
+        return new EnterpriseBatchingProgressionFactory();
     }
 
     @Override