Cleanup of unused fields, visibility modifiers.

Change what factory is wrapped in core edition module.
neo4j · Jul 4, 2017 · 7833deb · 7833deb
1 parent 1a6162c
commit 7833deb
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 24 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
@@ -95,8 +95,6 @@
 import org.neo4j.kernel.impl.store.format.RecordFormatSelector;
 import org.neo4j.kernel.impl.store.format.RecordFormats;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
-import org.neo4j.kernel.impl.store.id.IdReuseEligibility;
-import org.neo4j.kernel.impl.store.id.configuration.IdTypeConfigurationProvider;
 import org.neo4j.kernel.impl.storemigration.DatabaseMigrator;
 import org.neo4j.kernel.impl.storemigration.monitoring.VisibleMigrationProgressMonitor;
 import org.neo4j.kernel.impl.storemigration.participant.StoreMigrator;
@@ -247,8 +245,6 @@ boolean applicable( DiagnosticsPhase phase )
     private final SchemaWriteGuard schemaWriteGuard;
     private final TransactionEventHandlers transactionEventHandlers;
     private final IdGeneratorFactory idGeneratorFactory;
-    private final IdReuseEligibility eligibleForReuse;
-    private final IdTypeConfigurationProvider idTypeConfigurationProvider;
     private final JobScheduler scheduler;
     private final Config config;
     private final LockService lockService;
@@ -295,8 +291,6 @@ public NeoStoreDataSource(
             File storeDir,
             Config config,
             IdGeneratorFactory idGeneratorFactory,
-            IdReuseEligibility eligibleForReuse,
-            IdTypeConfigurationProvider idTypeConfigurationProvider,
             LogService logService,
             JobScheduler scheduler,
             TokenNameLookup tokenNameLookup,
@@ -333,8 +327,6 @@ public NeoStoreDataSource(
         this.storeDir = storeDir;
         this.config = config;
         this.idGeneratorFactory = idGeneratorFactory;
-        this.eligibleForReuse = eligibleForReuse;
-        this.idTypeConfigurationProvider = idTypeConfigurationProvider;
         this.tokenNameLookup = tokenNameLookup;
         this.dependencyResolver = dependencyResolver;
         this.scheduler = scheduler;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java
@@ -189,8 +189,6 @@ public DataSourceModule( final PlatformModule platformModule, EditionModule edit
                 storeDir,
                 config,
                 editionModule.idGeneratorFactory,
-                editionModule.eligibleForIdReuse,
-                editionModule.idTypeConfigurationProvider,
                 logging,
                 platformModule.jobScheduler,
                 tokenNameLookup,

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
@@ -44,7 +44,6 @@
 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.RecordStorageEngine;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.id.BufferedIdController;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.id.DefaultIdController;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.id.IdController;
@@ -75,7 +74,7 @@
 public abstract class EditionModule
 {
     protected static final boolean safeIdBuffering = FeatureToggles.flag(
-            RecordStorageEngine.class, "safeIdBuffering", true ); // TODO: fix this!
+            EditionModule.class, "safeIdBuffering", true );
 
     void registerProcedures( Procedures procedures ) throws KernelException
     {

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
@@ -84,7 +84,6 @@
 import static org.mockito.Mockito.RETURNS_MOCKS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-
 import static org.neo4j.helpers.Exceptions.launderedException;
 
 public class NeoStoreDataSourceRule extends ExternalResource
@@ -131,8 +130,8 @@ public NeoStoreDataSource getDataSource( File storeDir, FileSystemAbstraction fs
 
         LabelScanStoreProvider labelScanStoreProvider =
                 nativeLabelScanStoreProvider( storeDir, fs, pageCache, config, logService, monitors );
-        dataSource = new NeoStoreDataSource( storeDir, config, idGeneratorFactory, IdReuseEligibility.ALWAYS,
-                idConfigurationProvider,
+
+        dataSource = new NeoStoreDataSource( storeDir, config, idGeneratorFactory,
                 logService, mock( JobScheduler.class, RETURNS_MOCKS ), mock( TokenNameLookup.class ),
                 dependencyResolverForNoIndexProvider( labelScanStoreProvider ), mock( PropertyKeyTokenHolder.class ),
                 mock( LabelTokenHolder.class ), mock( RelationshipTypeTokenHolder.class ), locksFactory,

diff --git a/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java b/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
@@ -100,8 +100,8 @@
 import org.neo4j.kernel.lifecycle.LifecycleStatus;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.logging.LogProvider;
-import org.neo4j.ssl.SslPolicy;
 import org.neo4j.scheduler.JobScheduler;
+import org.neo4j.ssl.SslPolicy;
 import org.neo4j.udc.UsageData;
 
 import static org.neo4j.causalclustering.core.CausalClusteringSettings.raft_messages_log_path;
@@ -232,12 +232,8 @@ public void registerEditionSpecificProcedures( Procedures procedures ) throws Ke
                 consensusModule.raftMachine(), dependencies, localDatabase );
 
         this.idTypeConfigurationProvider = coreStateMachinesModule.idTypeConfigurationProvider;
-        this.idGeneratorFactory =
-                safeIdBuffering ? new BufferingIdGeneratorFactory( coreStateMachinesModule.idGeneratorFactory, eligibleForIdReuse,
-                        idTypeConfigurationProvider ) : coreStateMachinesModule.idGeneratorFactory;
-        this.idController = createIdController( platformModule );
-        this.idGeneratorFactory = new FreeIdFilteredIdGeneratorFactory( coreStateMachinesModule.idGeneratorFactory,
-                coreStateMachinesModule.freeIdCondition );
+
+        createIdComponents( platformModule, coreStateMachinesModule );
 
         this.labelTokenHolder = coreStateMachinesModule.labelTokenHolder;
         this.propertyKeyTokenHolder = coreStateMachinesModule.propertyKeyTokenHolder;
@@ -258,6 +254,25 @@ public void registerEditionSpecificProcedures( Procedures procedures ) throws Ke
         life.add( coreServerModule.membershipWaiterLifecycle );
     }
 
+    private void createIdComponents( PlatformModule platformModule, CoreStateMachinesModule coreStateMachinesModule )
+    {
+        IdGeneratorFactory factory;
+        if ( safeIdBuffering )
+        {
+            factory = new BufferingIdGeneratorFactory( coreStateMachinesModule.idGeneratorFactory, eligibleForIdReuse,
+                    idTypeConfigurationProvider );
+            this.idController = createBufferedIdController( factory, platformModule.jobScheduler, eligibleForIdReuse,
+                    idTypeConfigurationProvider );
+        }
+        else
+        {
+            factory = coreStateMachinesModule.idGeneratorFactory;
+            this.idController = createDefaultIdController();
+        }
+        this.idGeneratorFactory =
+                new FreeIdFilteredIdGeneratorFactory( factory, coreStateMachinesModule.freeIdCondition );
+    }
+
     @Override
     protected BufferedIdController createBufferedIdController( IdGeneratorFactory idGeneratorFactory,
             JobScheduler scheduler, IdReuseEligibility eligibleForIdReuse,

diff --git a/...ain/java/org/neo4j/causalclustering/core/state/machines/id/FreeIdFilteredIdGenerator.java b/...ain/java/org/neo4j/causalclustering/core/state/machines/id/FreeIdFilteredIdGenerator.java
@@ -27,7 +27,7 @@ public class FreeIdFilteredIdGenerator extends IdGenerator.Delegate
 {
     private final BooleanSupplier freeIdCondition;
 
-    public FreeIdFilteredIdGenerator( IdGenerator delegate, BooleanSupplier freeIdCondition )
+    FreeIdFilteredIdGenerator( IdGenerator delegate, BooleanSupplier freeIdCondition )
     {
         super( delegate );
         this.freeIdCondition = freeIdCondition;

diff --git a/...a/org/neo4j/causalclustering/core/state/machines/id/FreeIdFilteredIdGeneratorFactory.java b/...a/org/neo4j/causalclustering/core/state/machines/id/FreeIdFilteredIdGeneratorFactory.java
@@ -31,7 +31,7 @@
 
 public class FreeIdFilteredIdGeneratorFactory implements IdGeneratorFactory
 {
-    Map<IdType, IdGenerator> delegatedGenerator = new HashMap<>();
+    private Map<IdType, IdGenerator> delegatedGenerator = new HashMap<>();
     private final IdGeneratorFactory delegate;
     private final BooleanSupplier freeIdCondition;