Skip to content

Commit

Permalink
Update database factories
Browse files Browse the repository at this point in the history
  • Loading branch information
@MishaDemianenko
MishaDemianenko committed Aug 21, 2018
1 parent f9ea269 commit 4e2761f
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 11 deletions.
11 changes: 7 additions & 4 deletions ...y/community-it/it-test-support/src/main/java/org/neo4j/test/TestGraphDatabaseFactory.java
View file
Expand Up @@ -25,7 +25,6 @@
import java.util.function.Function; import java.util.function.Function;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;


import org.neo4j.dbms.database.DatabaseManager;
import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.config.Setting; import org.neo4j.graphdb.config.Setting;
import org.neo4j.graphdb.facade.GraphDatabaseDependencies; import org.neo4j.graphdb.facade.GraphDatabaseDependencies;
Expand All @@ -42,6 +41,7 @@
import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction;
import org.neo4j.kernel.configuration.BoltConnector; import org.neo4j.kernel.configuration.BoltConnector;
import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.configuration.Settings;
import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.extension.KernelExtensionFactory;
import org.neo4j.kernel.impl.factory.DatabaseInfo; import org.neo4j.kernel.impl.factory.DatabaseInfo;
import org.neo4j.kernel.impl.logging.LogService; import org.neo4j.kernel.impl.logging.LogService;
Expand Down Expand Up @@ -265,15 +265,18 @@ protected TestGraphDatabaseFacadeFactory( TestGraphDatabaseFactoryState state, b
@Override @Override
protected PlatformModule createPlatform( File storeDir, Config config, Dependencies dependencies ) protected PlatformModule createPlatform( File storeDir, Config config, Dependencies dependencies )
{ {
config.augment( GraphDatabaseSettings.database_path, new File( storeDir, DatabaseManager.DEFAULT_DATABASE_NAME ).getAbsolutePath() ); File databasesRoot = storeDir.getParentFile();
config.augment( GraphDatabaseSettings.ephemeral, Settings.FALSE );
config.augment( GraphDatabaseSettings.active_database, storeDir.getName() );
config.augment( GraphDatabaseSettings.databases_root_path, databasesRoot.getAbsolutePath() );
if ( impermanent ) if ( impermanent )
{ {
config.augment( ephemeral, TRUE ); config.augment( ephemeral, TRUE );
return new ImpermanentTestDatabasePlatformModule( storeDir, config, dependencies, this.databaseInfo ); return new ImpermanentTestDatabasePlatformModule( databasesRoot, config, dependencies, this.databaseInfo );
} }
else else
{ {
return new TestDatabasePlatformModule( storeDir, config, dependencies, this.databaseInfo ); return new TestDatabasePlatformModule( databasesRoot, config, dependencies, this.databaseInfo );
} }
} }


Expand Down
8 changes: 6 additions & 2 deletions community/neo4j/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactory.java
View file
Expand Up @@ -28,6 +28,7 @@
import org.neo4j.graphdb.factory.module.CommunityEditionModule; import org.neo4j.graphdb.factory.module.CommunityEditionModule;
import org.neo4j.graphdb.security.URLAccessRule; import org.neo4j.graphdb.security.URLAccessRule;
import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.configuration.Settings;
import org.neo4j.kernel.impl.factory.DatabaseInfo; import org.neo4j.kernel.impl.factory.DatabaseInfo;
import org.neo4j.kernel.impl.factory.Edition; import org.neo4j.kernel.impl.factory.Edition;
import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.kernel.monitoring.Monitors;
Expand Down Expand Up @@ -109,7 +110,6 @@ protected GraphDatabaseBuilder.DatabaseCreator createDatabaseCreator(
@Override @Override
public GraphDatabaseService newDatabase( @Nonnull Config config ) public GraphDatabaseService newDatabase( @Nonnull Config config )
{ {
config.augment( GraphDatabaseSettings.ephemeral, "false" );
return GraphDatabaseFactory.this.newEmbeddedDatabase( storeDir, config, state.databaseDependencies() ); return GraphDatabaseFactory.this.newEmbeddedDatabase( storeDir, config, state.databaseDependencies() );
} }
}; };
Expand Down Expand Up @@ -139,8 +139,12 @@ protected GraphDatabaseService newEmbeddedDatabase( File storeDir, Config config
protected GraphDatabaseService newDatabase( File storeDir, Config config, protected GraphDatabaseService newDatabase( File storeDir, Config config,
GraphDatabaseFacadeFactory.Dependencies dependencies ) GraphDatabaseFacadeFactory.Dependencies dependencies )
{ {
File databasesRoot = storeDir.getParentFile();
config.augment( GraphDatabaseSettings.ephemeral, Settings.FALSE );
config.augment( GraphDatabaseSettings.active_database, storeDir.getName() );
config.augment( GraphDatabaseSettings.databases_root_path, databasesRoot.getAbsolutePath() );
return new GraphDatabaseFacadeFactory( DatabaseInfo.COMMUNITY, CommunityEditionModule::new ) return new GraphDatabaseFacadeFactory( DatabaseInfo.COMMUNITY, CommunityEditionModule::new )
.newFacade( storeDir, config, dependencies ); .newFacade( databasesRoot, config, dependencies );
} }


public GraphDatabaseFactory addURLAccessRule( String protocol, URLAccessRule rule ) public GraphDatabaseFactory addURLAccessRule( String protocol, URLAccessRule rule )
Expand Down
8 changes: 7 additions & 1 deletion enterprise/com/src/main/java/org/neo4j/com/storecopy/ExternallyManagedPageCache.java
View file
Expand Up @@ -31,13 +31,15 @@
import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.facade.GraphDatabaseFacadeFactory; import org.neo4j.graphdb.facade.GraphDatabaseFacadeFactory;
import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.graphdb.factory.GraphDatabaseFactory;
import org.neo4j.graphdb.factory.GraphDatabaseSettings;
import org.neo4j.graphdb.factory.module.PlatformModule; import org.neo4j.graphdb.factory.module.PlatformModule;
import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction;
import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.io.pagecache.IOLimiter;
import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.PageCache;
import org.neo4j.io.pagecache.PagedFile; import org.neo4j.io.pagecache.PagedFile;
import org.neo4j.io.pagecache.tracing.cursor.context.VersionContextSupplier; import org.neo4j.io.pagecache.tracing.cursor.context.VersionContextSupplier;
import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.configuration.Settings;
import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.extension.KernelExtensionFactory;
import org.neo4j.kernel.impl.enterprise.EnterpriseEditionModule; import org.neo4j.kernel.impl.enterprise.EnterpriseEditionModule;
import org.neo4j.kernel.impl.factory.DatabaseInfo; import org.neo4j.kernel.impl.factory.DatabaseInfo;
Expand Down Expand Up @@ -135,6 +137,10 @@ public static class GraphDatabaseFactoryWithPageCacheFactory extends GraphDataba
protected GraphDatabaseService newDatabase( File storeDir, Config config, protected GraphDatabaseService newDatabase( File storeDir, Config config,
GraphDatabaseFacadeFactory.Dependencies dependencies ) GraphDatabaseFacadeFactory.Dependencies dependencies )
{ {
File databasesRoot = storeDir.getParentFile();
config.augment( GraphDatabaseSettings.ephemeral, Settings.FALSE );
config.augment( GraphDatabaseSettings.active_database, storeDir.getName() );
config.augment( GraphDatabaseSettings.databases_root_path, databasesRoot.getAbsolutePath() );
return new GraphDatabaseFacadeFactory( DatabaseInfo.ENTERPRISE, EnterpriseEditionModule::new ) return new GraphDatabaseFacadeFactory( DatabaseInfo.ENTERPRISE, EnterpriseEditionModule::new )
{ {
@Override @Override
Expand All @@ -150,7 +156,7 @@ protected PageCache createPageCache( FileSystemAbstraction fileSystem, Config co
} }
}; };
} }
}.newFacade( storeDir, config, dependencies ); }.newFacade( databasesRoot, config, dependencies );
} }


public GraphDatabaseFactoryWithPageCacheFactory setKernelExtensions( Iterable<KernelExtensionFactory<?>> newKernelExtensions ) public GraphDatabaseFactoryWithPageCacheFactory setKernelExtensions( Iterable<KernelExtensionFactory<?>> newKernelExtensions )
Expand Down
6 changes: 5 additions & 1 deletion ...prise/ha/src/main/java/org/neo4j/graphdb/factory/HighlyAvailableGraphDatabaseFactory.java
View file
Expand Up @@ -27,6 +27,7 @@
import org.neo4j.cluster.ClusterSettings; import org.neo4j.cluster.ClusterSettings;
import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.configuration.Settings;
import org.neo4j.kernel.ha.HaSettings; import org.neo4j.kernel.ha.HaSettings;
import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase;
import org.neo4j.kernel.impl.factory.Edition; import org.neo4j.kernel.impl.factory.Edition;
Expand Down Expand Up @@ -61,7 +62,10 @@ protected GraphDatabaseBuilder.DatabaseCreator createDatabaseCreator(
@Override @Override
public GraphDatabaseService newDatabase( Config config ) public GraphDatabaseService newDatabase( Config config )
{ {
config.augment( GraphDatabaseSettings.ephemeral, "false" ); File databasesRoot = storeDir.getParentFile();
config.augment( GraphDatabaseSettings.ephemeral, Settings.FALSE );
config.augment( GraphDatabaseSettings.active_database, storeDir.getName() );
config.augment( GraphDatabaseSettings.databases_root_path, databasesRoot.getAbsolutePath() );
return new HighlyAvailableGraphDatabase( storeDir, config, state.databaseDependencies() ); return new HighlyAvailableGraphDatabase( storeDir, config, state.databaseDependencies() );
} }
}; };
Expand Down
8 changes: 5 additions & 3 deletions ...rprise/kernel/src/main/java/org/neo4j/graphdb/factory/EnterpriseGraphDatabaseFactory.java
View file
Expand Up @@ -26,11 +26,10 @@


import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.configuration.Settings;
import org.neo4j.kernel.enterprise.EnterpriseGraphDatabase; import org.neo4j.kernel.enterprise.EnterpriseGraphDatabase;
import org.neo4j.kernel.impl.factory.Edition; import org.neo4j.kernel.impl.factory.Edition;


import static org.neo4j.kernel.configuration.Settings.FALSE;

/** /**
* Factory for Neo4j database instances with Enterprise Edition features. * Factory for Neo4j database instances with Enterprise Edition features.
* *
Expand All @@ -47,7 +46,10 @@ protected GraphDatabaseBuilder.DatabaseCreator createDatabaseCreator( final File
@Override @Override
public GraphDatabaseService newDatabase( Config config ) public GraphDatabaseService newDatabase( Config config )
{ {
config.augment( GraphDatabaseSettings.ephemeral, FALSE ); File databasesRoot = storeDir.getParentFile();
config.augment( GraphDatabaseSettings.ephemeral, Settings.FALSE );
config.augment( GraphDatabaseSettings.active_database, storeDir.getName() );
config.augment( GraphDatabaseSettings.databases_root_path, databasesRoot.getAbsolutePath() );
return new EnterpriseGraphDatabase( storeDir, config, state.databaseDependencies() ); return new EnterpriseGraphDatabase( storeDir, config, state.databaseDependencies() );
} }
}; };
Expand Down

0 comments on commit 4e2761f

Please sign in to comment.