Extract id components into separate module that constructed using bui…

…lder.

Remove methods from edition modules that other modules were suppose to override
since those were creating tons of confusion and interdependencies.

community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java

@@ -39,18 +39,17 @@
 import org.neo4j.graphdb.factory.module.CommunityEditionModule;
 import org.neo4j.graphdb.factory.module.EditionModule;
 import org.neo4j.graphdb.factory.module.PlatformModule;
+import org.neo4j.graphdb.factory.module.id.IdModuleBuilder;
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.internal.kernel.api.LabelSet;
 import org.neo4j.internal.kernel.api.NodeCursor;
 import org.neo4j.internal.kernel.api.PropertyCursor;
-import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.factory.DatabaseInfo;
 import org.neo4j.kernel.impl.store.UnderlyingStorageException;
 import org.neo4j.kernel.impl.store.id.IdGenerator;
-import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.store.id.IdType;
 import org.neo4j.kernel.impl.store.id.configuration.CommunityIdTypeConfigurationProvider;
 import org.neo4j.kernel.impl.store.id.configuration.IdTypeConfiguration;
@@ -751,15 +750,7 @@ protected void create(
                                     GraphDatabaseFacadeFactory.Dependencies dependencies )
                             {
                                 Function<PlatformModule,EditionModule> factory =
-                                        platformModule -> new CommunityEditionModule( platformModule )
-                                        {
-                                            @Override
-                                            protected Function<String,IdGeneratorFactory> createIdGeneratorFactory( FileSystemAbstraction fs,
-                                                    IdTypeConfigurationProvider idTypeConfigurationProvider )
-                                            {
-                                                return any -> idFactory;
-                                            }
-                                        };
+                                        platformModule -> new CommunityEditionModuleWithCustomIdModule( platformModule, idFactory );
                                 new GraphDatabaseFacadeFactory( DatabaseInfo.COMMUNITY, factory )
                                 {
 
@@ -788,4 +779,15 @@ private Node createNode( GraphDatabaseService db, Label... labels )
             return node;
         }
     }
+
+    private static class CommunityEditionModuleWithCustomIdModule extends CommunityEditionModule
+    {
+        CommunityEditionModuleWithCustomIdModule( PlatformModule platformModule, EphemeralIdGenerator.Factory idFactory )
+        {
+            super( platformModule );
+            idModule = IdModuleBuilder.of( platformModule.fileSystem, platformModule.jobScheduler )
+                    .withIdGenerationFactoryProvider( any -> idFactory )
+                    .build();
+        }
+    }
 }

community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java

@@ -20,11 +20,12 @@
 package org.neo4j.graphdb.factory.module;
 
 import java.io.File;
-import java.util.function.Function;
 import java.util.function.Predicate;
 
 import org.neo4j.function.Predicates;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
+import org.neo4j.graphdb.factory.module.id.IdModule;
+import org.neo4j.graphdb.factory.module.id.IdModuleBuilder;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.IOLimiter;
@@ -56,11 +57,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.store.id.DefaultIdGeneratorFactory;
-import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
-import org.neo4j.kernel.impl.store.id.IdReuseEligibility;
-import org.neo4j.kernel.impl.store.id.configuration.CommunityIdTypeConfigurationProvider;
-import org.neo4j.kernel.impl.store.id.configuration.IdTypeConfigurationProvider;
 import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory;
 import org.neo4j.kernel.impl.transaction.log.files.TransactionLogFiles;
 import org.neo4j.kernel.impl.transaction.state.DataSourceManager;
@@ -102,14 +98,11 @@ public CommunityEditionModule( PlatformModule platformModule )
         locksSupplier = () -> createLockManager( lockFactory, config, platformModule.clock );
         statementLocksFactoryProvider = locks -> createStatementLocksFactory( locks, config, logging );
 
-        idTypeConfigurationProvider = createIdTypeConfigurationProvider( config );
-        eligibleForIdReuse = IdReuseEligibility.ALWAYS;
         threadToTransactionBridge = dependencies.satisfyDependency(
                 new ThreadToStatementContextBridge( getGlobalAvailabilityGuard( platformModule.clock, logging, platformModule.config ) ) );
 
-        createIdComponents( platformModule, dependencies, createIdGeneratorFactory( fileSystem, idTypeConfigurationProvider ) );
-        dependencies.satisfyDependency( idGeneratorFactoryProvider );
-        dependencies.satisfyDependency( idControllerFactory );
+
+        idModule = createIdModule( platformModule, fileSystem );
 
         tokenHoldersSupplier = () -> new TokenHolders(
                 new DelegatingTokenHolder( createPropertyKeyCreator( config, dataSourceManager ), TokenHolder.TYPE_PROPERTY_KEY ),
@@ -136,6 +129,11 @@ public CommunityEditionModule( PlatformModule platformModule )
         publishEditionInfo( dependencies.resolveDependency( UsageData.class ), platformModule.databaseInfo, config );
     }
 
+    protected IdModule createIdModule( PlatformModule platformModule, FileSystemAbstraction fileSystem )
+    {
+        return IdModuleBuilder.of( fileSystem, platformModule.jobScheduler ).build();
+    }
+
     protected Predicate<String> fileWatcherFileNameFilter()
     {
         return communityFileWatcherFileNameFilter();
@@ -149,11 +147,6 @@ static Predicate<String> communityFileWatcherFileNameFilter()
         );
     }
 
-    protected IdTypeConfigurationProvider createIdTypeConfigurationProvider( Config config )
-    {
-        return new CommunityIdTypeConfigurationProvider();
-    }
-
     protected ConstraintSemantics createSchemaRuleVerifier()
     {
         return new StandardConstraintSemantics();
@@ -211,12 +204,6 @@ private KernelData createKernelData( FileSystemAbstraction fileSystem, PageCache
         return life.add( new KernelData( fileSystem, pageCache, storeDir, config, dataSourceManager ) );
     }
 
-    protected Function<String,IdGeneratorFactory> createIdGeneratorFactory( FileSystemAbstraction fs,
-            IdTypeConfigurationProvider idTypeConfigurationProvider )
-    {
-        return databaseName -> new DefaultIdGeneratorFactory( fs, idTypeConfigurationProvider );
-    }
-
     protected TransactionHeaderInformationFactory createHeaderInformationFactory()
     {
         return TransactionHeaderInformationFactory.DEFAULT;

community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/EditionModule.java

@@ -21,8 +21,6 @@
 
 import java.io.File;
 import java.time.Clock;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -31,6 +29,7 @@
 import org.neo4j.dmbs.database.DefaultDatabaseManager;
 import org.neo4j.graphdb.facade.GraphDatabaseFacadeFactory;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
+import org.neo4j.graphdb.factory.module.id.IdModule;
 import org.neo4j.helpers.Service;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.io.fs.FileSystemAbstraction;
@@ -56,17 +55,9 @@
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.proc.ProcedureConfig;
 import org.neo4j.kernel.impl.proc.Procedures;
-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;
-import org.neo4j.kernel.impl.store.id.BufferingIdGeneratorFactory;
-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.transaction.TransactionHeaderInformationFactory;
 import org.neo4j.kernel.impl.transaction.stats.DatabaseTransactionStats;
 import org.neo4j.kernel.impl.transaction.stats.TransactionCounters;
-import org.neo4j.kernel.impl.util.Dependencies;
 import org.neo4j.kernel.impl.util.DependencySatisfier;
 import org.neo4j.kernel.impl.util.watcher.DefaultFileDeletionEventListener;
 import org.neo4j.kernel.impl.util.watcher.DefaultFileSystemWatcherService;
@@ -76,7 +67,6 @@
 import org.neo4j.scheduler.JobScheduler;
 import org.neo4j.udc.UsageData;
 import org.neo4j.udc.UsageDataKeys;
-import org.neo4j.util.FeatureToggles;
 
 import static org.neo4j.kernel.impl.proc.temporal.TemporalFunction.registerTemporalFunctions;
 
@@ -86,17 +76,7 @@
  */
 public abstract class EditionModule
 {
-    // This resided in RecordStorageEngine prior to 3.3
-    private static final boolean safeIdBuffering = FeatureToggles.flag(
-            EditionModule.class, "safeIdBuffering", true );
-
-    public Function<String, ? extends IdGeneratorFactory> idGeneratorFactoryProvider;
-
-    public IdTypeConfigurationProvider idTypeConfigurationProvider;
-
-    public Function<String, IdController> idControllerFactory;
-
-    public IdReuseEligibility eligibleForIdReuse;
+    public IdModule idModule;
 
     public Supplier<TokenHolders> tokenHoldersSupplier;
 
@@ -255,49 +235,6 @@ protected NetworkConnectionTracker createConnectionTracker()
         return NetworkConnectionTracker.NO_OP;
     }
 
-    protected void createIdComponents( PlatformModule platformModule, Dependencies dependencies,
-            Function<String,? extends IdGeneratorFactory> idGeneratorFactoryProvider )
-    {
-        Function<String,? extends IdGeneratorFactory> factoryProvider = idGeneratorFactoryProvider;
-        if ( safeIdBuffering )
-        {
-            Function<String,BufferingIdGeneratorFactory> bufferingIdGeneratorFactory = new Function<String,BufferingIdGeneratorFactory>()
-            {
-                private final Map<String,BufferingIdGeneratorFactory> idGenerators = new HashMap<>();
-
-                @Override
-                public BufferingIdGeneratorFactory apply( String databaseName )
-                {
-                    return idGenerators.computeIfAbsent( databaseName,
-                            s -> new BufferingIdGeneratorFactory( idGeneratorFactoryProvider.apply( databaseName ), eligibleForIdReuse,
-                                    idTypeConfigurationProvider ) );
-                }
-            };
-            idControllerFactory = databaseName -> createBufferedIdController( bufferingIdGeneratorFactory.apply( databaseName ), platformModule.jobScheduler );
-            factoryProvider = bufferingIdGeneratorFactory;
-        }
-        else
-        {
-            idControllerFactory = any -> createDefaultIdController();
-        }
-        this.idGeneratorFactoryProvider = factoryProvider;
-    }
-
-    private BufferedIdController createBufferedIdController( BufferingIdGeneratorFactory idGeneratorFactory, JobScheduler scheduler )
-    {
-        return new BufferedIdController( idGeneratorFactory, scheduler );
-    }
-
-    protected DefaultIdController createDefaultIdController()
-    {
-        return new DefaultIdController();
-    }
-
-    public void createDatabases( DatabaseManager databaseManager, Config config )
-    {
-        databaseManager.createDatabase( config.get( GraphDatabaseSettings.active_database ) );
-    }
-
     public DatabaseTransactionStats createTransactionMonitor()
     {
         return databaseStatistics;
@@ -322,4 +259,9 @@ public DatabaseAvailabilityGuard createDatabaseAvailabilityGuard( String databas
     {
         return (DatabaseAvailabilityGuard) getGlobalAvailabilityGuard( clock, logService, config );
     }
+
+    public void createDatabases( DatabaseManager databaseManager, Config config )
+    {
+        databaseManager.createDatabase( config.get( GraphDatabaseSettings.active_database ) );
+    }
 }

community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/ModularDatabaseCreationContext.java

@@ -24,6 +24,7 @@
 
 import org.neo4j.graphdb.DependencyResolver;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
+import org.neo4j.graphdb.factory.module.id.DatabaseIdContext;
 import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector;
 import org.neo4j.internal.kernel.api.TokenNameLookup;
 import org.neo4j.io.fs.FileSystemAbstraction;
@@ -124,7 +125,9 @@ public class ModularDatabaseCreationContext implements DatabaseCreationContext
     {
         this.databaseName = databaseName;
         this.config = platformModule.config;
-        this.idGeneratorFactory = editionModule.idGeneratorFactoryProvider.apply( databaseName );
+        DatabaseIdContext idContext = editionModule.idModule.createIdContext( databaseName );
+        this.idGeneratorFactory = idContext.getIdGeneratorFactory();
+        this.idController = idContext.getIdController();
         this.databaseLayout = platformModule.storeLayout.databaseLayout( databaseName );
         this.logService = platformModule.logging;
         this.scheduler = platformModule.jobScheduler;
@@ -159,7 +162,6 @@ public class ModularDatabaseCreationContext implements DatabaseCreationContext
         this.accessCapability = editionModule.accessCapability;
         this.storeCopyCheckPointMutex = new StoreCopyCheckPointMutex();
         this.recoveryCleanupWorkCollector = platformModule.recoveryCleanupWorkCollector;
-        this.idController = editionModule.idControllerFactory.apply( databaseName );
         this.databaseInfo = platformModule.databaseInfo;
         this.versionContextSupplier = platformModule.versionContextSupplier;
         this.collectionsFactorySupplier = platformModule.collectionsFactorySupplier;

community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/id/DatabaseIdContext.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.graphdb.factory.module.id;
+
+import org.neo4j.kernel.impl.storageengine.impl.recordstorage.id.IdController;
+import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
+
+public class DatabaseIdContext
+{
+    private final IdGeneratorFactory idGeneratorFactory;
+    private final IdController idController;
+
+    DatabaseIdContext( IdGeneratorFactory idGeneratorFactory, IdController idController )
+    {
+        this.idGeneratorFactory = idGeneratorFactory;
+        this.idController = idController;
+    }
+
+    public IdGeneratorFactory getIdGeneratorFactory()
+    {
+        return idGeneratorFactory;
+    }
+
+    public IdController getIdController()
+    {
+        return idController;
+    }
+}