Cache factories per name to allow id controller factory to reference the

same factory instance.
neo4j · Aug 30, 2018 · a682d0f · a682d0f
1 parent 740d35c
commit a682d0f
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/EditionModule.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/EditionModule.java
@@ -21,6 +21,8 @@
 
 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;
@@ -259,9 +261,18 @@ protected void createIdComponents( PlatformModule platformModule, Dependencies d
         Function<String,? extends IdGeneratorFactory> factoryProvider = idGeneratorFactoryProvider;
         if ( safeIdBuffering )
         {
-            Function<String, BufferingIdGeneratorFactory> bufferingIdGeneratorFactory =
-                    databaseName -> new BufferingIdGeneratorFactory( idGeneratorFactoryProvider.apply( databaseName ), eligibleForIdReuse,
-                            idTypeConfigurationProvider );
+            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;
         }