From 8e1c273df22d47a2bab4086c5123cb9cc90b1a89 Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Fri, 10 Aug 2018 17:08:39 +0200 Subject: [PATCH] Switch to using factory methods --- .../consistency/CheckConsistencyCommand.java | 2 +- .../neo4j/consistency/ConsistencyCheckTool.java | 2 +- .../consistency/CheckConsistencyCommandTest.java | 6 +++--- .../org/neo4j/commandline/dbms/CsvImporter.java | 2 +- .../main/java/org/neo4j/tooling/ImportTool.java | 2 +- .../test/java/org/neo4j/tooling/QuickImport.java | 2 +- .../java/org/neo4j/io/layout/DatabaseLayout.java | 16 +++++++++++++--- .../java/org/neo4j/io/layout/StoreLayout.java | 2 +- .../impl/storemigration/StoreUpgrader.java | 2 +- .../org/neo4j/kernel/impl/util/Validators.java | 4 ++-- .../batchinsert/internal/BatchInserterImpl.java | 2 +- .../batchimport/store/BatchingNeoStores.java | 2 +- .../participant/ExplicitIndexMigratorTest.java | 4 ++-- .../participant/SchemaIndexMigratorTest.java | 6 +++--- .../api/impl/index/LuceneKernelExtension.java | 2 +- .../main/java/org/neo4j/backup/BackupTool.java | 2 +- .../main/java/org/neo4j/backup/OnlineBackup.java | 10 +++++----- .../org/neo4j/backup/impl/BackupCopyService.java | 4 ++-- .../backup/impl/BackupStrategyCoordinator.java | 2 +- .../neo4j/backup/impl/BackupStrategyWrapper.java | 6 +++--- .../BackupToolCmdArgumentsAcceptanceTest.java | 2 +- .../java/org/neo4j/backup/BackupToolTest.java | 16 ++++++++-------- .../org/neo4j/backup/BackupToolUrisTest.java | 4 ++-- .../neo4j/backup/impl/BackupDelegatorTest.java | 4 ++-- .../backup/impl/OnlineBackupCommandCcIT.java | 2 +- .../storecopy/TemporaryStoreDirectory.java | 2 +- .../storecopy/CopiedStoreRecoveryTest.java | 2 +- .../catchup/storecopy/RemoteStoreTest.java | 6 +++--- .../storecopy/StoreCopyRequestHandlerTest.java | 2 +- .../core/state/CoreBootstrapperIT.java | 4 ++-- .../state/snapshot/CoreStateDownloaderTest.java | 2 +- .../ReadReplicaStartupProcessTest.java | 2 +- .../causalclustering/scenarios/RecoveryIT.java | 2 +- .../causalclustering/scenarios/RestartIT.java | 4 ++-- .../scenarios/TransactionLogRecoveryIT.java | 2 +- .../org/neo4j/com/storecopy/StoreCopyClient.java | 2 +- .../kernel/ha/OnDiskLastTxIdGetterTest.java | 5 ++--- .../HighAvailabilityMemberStateMachineTest.java | 2 +- .../cluster/SwitchToSlaveBranchThenCopyTest.java | 2 +- .../cluster/SwitchToSlaveCopyThenBranchTest.java | 2 +- .../org/neo4j/storeupgrade/StoreUpgradeIT.java | 8 ++++---- .../test/java/org/neo4j/backup/BackupHelper.java | 2 +- .../CheckPointingLogRotationStressTesting.java | 2 +- .../log/TransactionAppenderStressTesting.java | 2 +- .../tools/applytx/ApplyTransactionsCommand.java | 2 +- .../org/neo4j/tools/dump/DumpCountsStore.java | 2 +- .../java/org/neo4j/tools/dump/DumpStore.java | 2 +- .../org/neo4j/tools/dump/DumpStoreChain.java | 2 +- .../neo4j/tools/migration/StoreMigration.java | 2 +- .../org/neo4j/tools/rawstorereader/RsdrMain.java | 2 +- 50 files changed, 92 insertions(+), 83 deletions(-) diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java b/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java index bc6e98655ee38..e322c447c03d6 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java @@ -183,7 +183,7 @@ public void execute( String[] args ) throws IncorrectUsage, CommandFailed try ( FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction() ) { File databaseDirectory = backupPath.map( Path::toFile ).orElse( config.get( database_path ) ); - DatabaseLayout databaseLayout = new DatabaseLayout( databaseDirectory ); + DatabaseLayout databaseLayout = DatabaseLayout.of( databaseDirectory ); checkDbState( databaseLayout, config ); ZoneId logTimeZone = config.get( GraphDatabaseSettings.db_timezone ).getZoneId(); // Only output progress indicator if a console receives the output diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java index c55412ae9cdf9..b0e69e2df0e8f 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java @@ -113,7 +113,7 @@ ConsistencyCheckService.Result run( String... args ) throws ToolFailureException Config tuningConfiguration = readConfiguration( arguments ); boolean verbose = isVerbose( arguments ); - DatabaseLayout databaseLayout = new DatabaseLayout( storeDir ); + DatabaseLayout databaseLayout = DatabaseLayout.of( storeDir ); checkDbState( databaseLayout, tuningConfiguration ); ZoneId logTimeZone = tuningConfiguration.get( GraphDatabaseSettings.db_timezone ).getZoneId(); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/CheckConsistencyCommandTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/CheckConsistencyCommandTest.java index 0b65a6c3149d7..61c960a135c4b 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/CheckConsistencyCommandTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/CheckConsistencyCommandTest.java @@ -76,7 +76,7 @@ void runsConsistencyChecker() throws Exception new CheckConsistencyCommand( homeDir, testDir.directory( "conf" ).toPath(), outsideWorld, consistencyCheckService ); - DatabaseLayout databaseLayout = new DatabaseLayout( databasesFolder, "mydb" ); + DatabaseLayout databaseLayout = DatabaseLayout.of( databasesFolder, "mydb" ); when( consistencyCheckService .runFullConsistencyCheck( eq( databaseLayout ), any( Config.class ), any( ProgressMonitorFactory.class ), @@ -104,7 +104,7 @@ void enablesVerbosity() throws Exception new CheckConsistencyCommand( homeDir, testDir.directory( "conf" ).toPath(), outsideWorld, consistencyCheckService ); - DatabaseLayout databaseLayout = new DatabaseLayout( databasesFolder, "mydb" ); + DatabaseLayout databaseLayout = DatabaseLayout.of( databasesFolder, "mydb" ); when( consistencyCheckService .runFullConsistencyCheck( eq( databaseLayout ), any( Config.class ), any( ProgressMonitorFactory.class ), @@ -131,7 +131,7 @@ void failsWhenInconsistenciesAreFound() throws Exception CheckConsistencyCommand checkConsistencyCommand = new CheckConsistencyCommand( homeDir, testDir.directory( "conf" ).toPath(), outsideWorld, consistencyCheckService ); - DatabaseLayout databaseLayout = new DatabaseLayout( databasesFolder, "mydb" ); + DatabaseLayout databaseLayout = DatabaseLayout.of( databasesFolder, "mydb" ); when( consistencyCheckService .runFullConsistencyCheck( eq( databaseLayout ), any( Config.class ), any( ProgressMonitorFactory.class ), diff --git a/community/dbms/src/main/java/org/neo4j/commandline/dbms/CsvImporter.java b/community/dbms/src/main/java/org/neo4j/commandline/dbms/CsvImporter.java index c094b0df4017c..725669195f76d 100644 --- a/community/dbms/src/main/java/org/neo4j/commandline/dbms/CsvImporter.java +++ b/community/dbms/src/main/java/org/neo4j/commandline/dbms/CsvImporter.java @@ -125,7 +125,7 @@ public void doImport() throws IOException new WrappedCsvInputConfigurationForNeo4jAdmin( csvConfiguration( args, false ) ), badCollector ); - ImportTool.doImport( outsideWorld.errorStream(), outsideWorld.errorStream(), outsideWorld.inStream(), new DatabaseLayout( storeDir ), logsDir, + ImportTool.doImport( outsideWorld.errorStream(), outsideWorld.errorStream(), outsideWorld.inStream(), DatabaseLayout.of( storeDir ), logsDir, reportFile, fs, nodesFiles, relationshipsFiles, false, input, this.databaseConfig, badOutput, configuration, false ); } diff --git a/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java b/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java index d03d755755ed0..907f044d21030 100644 --- a/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java +++ b/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java @@ -481,7 +481,7 @@ public static void main( String[] incomingArguments, boolean defaultSettingsSuit in = defaultSettingsSuitableForTests ? new ByteArrayInputStream( EMPTY_BYTE_ARRAY ) : System.in; boolean detailedPrinting = args.getBoolean( Options.DETAILED_PROGRESS.key(), (Boolean) Options.DETAILED_PROGRESS.defaultValue() ); - doImport( out, err, in, new DatabaseLayout( storeDir ), logsDir, badFile, fs, nodesFiles, relationshipsFiles, + doImport( out, err, in, DatabaseLayout.of( storeDir ), logsDir, badFile, fs, nodesFiles, relationshipsFiles, enableStacktrace, input, dbConfig, badOutput, configuration, detailedPrinting ); success = true; diff --git a/community/import-tool/src/test/java/org/neo4j/tooling/QuickImport.java b/community/import-tool/src/test/java/org/neo4j/tooling/QuickImport.java index 5e43b3b137ae7..7c7828efce36e 100644 --- a/community/import-tool/src/test/java/org/neo4j/tooling/QuickImport.java +++ b/community/import-tool/src/test/java/org/neo4j/tooling/QuickImport.java @@ -168,7 +168,7 @@ public long maxMemoryUsage() { System.out.println( "Seed " + randomSeed ); final JobScheduler jobScheduler = life.add( new CentralJobScheduler() ); - consumer = BatchImporterFactory.withHighestPriority().instantiate( new DatabaseLayout( dir ), fileSystem, null, importConfig, + consumer = BatchImporterFactory.withHighestPriority().instantiate( DatabaseLayout.of( dir ), fileSystem, null, importConfig, new SimpleLogService( logging, logging ), defaultVisible( jobScheduler ), EMPTY, dbConfig, RecordFormatSelector.selectForConfig( dbConfig, logging ), NO_MONITOR ); ImportTool.printOverview( dir, Collections.emptyList(), Collections.emptyList(), importConfig, System.out ); diff --git a/community/io/src/main/java/org/neo4j/io/layout/DatabaseLayout.java b/community/io/src/main/java/org/neo4j/io/layout/DatabaseLayout.java index 4f23db37f792a..de569f025e910 100644 --- a/community/io/src/main/java/org/neo4j/io/layout/DatabaseLayout.java +++ b/community/io/src/main/java/org/neo4j/io/layout/DatabaseLayout.java @@ -29,13 +29,23 @@ public class DatabaseLayout private final File databaseDirectory; private final File databasesDirectory; - public DatabaseLayout( File databaseDirectory ) + public static DatabaseLayout of( File databaseDirectory ) + { + return new DatabaseLayout( databaseDirectory ); + } + + public static DatabaseLayout of( File rootDirectory, String databaseName ) + { + return new DatabaseLayout( rootDirectory, databaseName ); + } + + private DatabaseLayout( File databaseDirectory ) { this.databaseDirectory = databaseDirectory; this.databasesDirectory = databaseDirectory.getParentFile(); } - public DatabaseLayout( File rootDirectory, String databaseName ) + private DatabaseLayout( File rootDirectory, String databaseName ) { this.databasesDirectory = rootDirectory; this.databaseDirectory = new File( rootDirectory, databaseName ); @@ -70,7 +80,7 @@ public File[] listDatabaseFiles( FilenameFilter filter ) @Override public String toString() { - return "DatabaseLayout{" + "databaseDirectory=" + databaseDirectory + '}'; + return String.valueOf( databaseDirectory ); } @Override diff --git a/community/io/src/main/java/org/neo4j/io/layout/StoreLayout.java b/community/io/src/main/java/org/neo4j/io/layout/StoreLayout.java index 00a0ac551a64e..ea5b2817d0afc 100644 --- a/community/io/src/main/java/org/neo4j/io/layout/StoreLayout.java +++ b/community/io/src/main/java/org/neo4j/io/layout/StoreLayout.java @@ -42,6 +42,6 @@ public File rootDirectory() //TODO:rename public DatabaseLayout databaseDirectory( String databaseName ) { - return new DatabaseLayout( rootDirectory, databaseName ); + return DatabaseLayout.of( rootDirectory, databaseName ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreUpgrader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreUpgrader.java index 2e2ddedea24f4..d9e759d5578d7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreUpgrader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreUpgrader.java @@ -105,7 +105,7 @@ public void addParticipant( StoreMigrationParticipant participant ) public void migrateIfNeeded( DatabaseLayout dbDirectoryStructure ) { - DatabaseLayout migrationStructure = new DatabaseLayout( dbDirectoryStructure.databaseDirectory(), MIGRATION_DIRECTORY ); + DatabaseLayout migrationStructure = DatabaseLayout.of( dbDirectoryStructure.databaseDirectory(), MIGRATION_DIRECTORY ); cleanupLegacyLeftOverDirsIn( dbDirectoryStructure.databaseDirectory() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Validators.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Validators.java index d6dfc277f0e95..336dcc722d2b8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Validators.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Validators.java @@ -91,7 +91,7 @@ static List matchingFiles( File fileWithRegexInName ) { try ( FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction() ) { - if ( isExistingDatabase( fileSystem, new DatabaseLayout( value ) ) ) + if ( isExistingDatabase( fileSystem, DatabaseLayout.of( value ) ) ) { throw new IllegalArgumentException( "Directory '" + value + "' already contains a database" ); } @@ -106,7 +106,7 @@ static List matchingFiles( File fileWithRegexInName ) { try ( FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction() ) { - if ( !isExistingDatabase( fileSystem, new DatabaseLayout( dbDir ) ) ) + if ( !isExistingDatabase( fileSystem, DatabaseLayout.of( dbDir ) ) ) { throw new IllegalArgumentException( "Directory '" + dbDir + "' does not contain a database" ); } diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java index 6830447906fd2..4919fc6de72c6 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java @@ -246,7 +246,7 @@ public BatchInserterImpl( final File databaseDirectory, final FileSystemAbstract this.fileSystem = fileSystem; life = new LifeSupport(); - this.directoryStructure = new DatabaseLayout( databaseDirectory ); + this.directoryStructure = DatabaseLayout.of( databaseDirectory ); storeLocker = tryLockStore( fileSystem ); ConfiguringPageCacheFactory pageCacheFactory = new ConfiguringPageCacheFactory( fileSystem, config, PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, NullLog.getInstance(), diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java index 60258ed2e82fb..e81fcdc6b40a7 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java @@ -134,7 +134,7 @@ private BatchingNeoStores( FileSystemAbstraction fileSystem, PageCache pageCache this.importConfiguration = importConfiguration; this.initialIds = initialIds; this.logProvider = logService.getInternalLogProvider(); - this.directoryStructure = new DatabaseLayout( databaseDirectory ); + this.directoryStructure = DatabaseLayout.of( databaseDirectory ); this.neo4jConfig = neo4jConfig; this.pageCache = pageCache; this.ioTracer = ioTracer; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/ExplicitIndexMigratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/ExplicitIndexMigratorTest.java index 2e604f8930f0e..d88348996a05f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/ExplicitIndexMigratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/ExplicitIndexMigratorTest.java @@ -54,8 +54,8 @@ public class ExplicitIndexMigratorTest private final FileSystemAbstraction fs = mock( FileSystemAbstraction.class ); private final LogProvider logProvider = mock( LogProvider.class ); private final ProgressReporter progressMonitor = mock( ProgressReporter.class ); - private final DatabaseLayout storeLayout = new DatabaseLayout( new File( DatabaseManager.DEFAULT_DATABASE_NAME ) ); - private final DatabaseLayout migrationLayout = new DatabaseLayout( new File( StoreUpgrader.MIGRATION_DIRECTORY ) ); + private final DatabaseLayout storeLayout = DatabaseLayout.of( new File( DatabaseManager.DEFAULT_DATABASE_NAME ) ); + private final DatabaseLayout migrationLayout = DatabaseLayout.of( new File( StoreUpgrader.MIGRATION_DIRECTORY ) ); private final File originalIndexStore = mock( File.class ); private final File migratedIndexStore = new File( "." ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigratorTest.java index b3e8656530584..ed4cbd850a0a7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigratorTest.java @@ -24,8 +24,8 @@ import java.io.File; import java.io.IOException; -import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; import org.neo4j.dbms.database.DatabaseManager; +import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.layout.DatabaseLayout; import org.neo4j.kernel.api.index.IndexDirectoryStructure; @@ -43,8 +43,8 @@ public class SchemaIndexMigratorTest private final FileSystemAbstraction fs = mock( FileSystemAbstraction.class ); private final ProgressReporter progressReporter = mock( ProgressReporter.class ); private final IndexProvider indexProvider = mock( IndexProvider.class ); - private final DatabaseLayout databaseLayout = new DatabaseLayout( new File( "store" ), DatabaseManager.DEFAULT_DATABASE_NAME ); - private final DatabaseLayout migrationLayout = new DatabaseLayout( new File( "migrationDir" ), DatabaseManager.DEFAULT_DATABASE_NAME ); + private final DatabaseLayout databaseLayout = DatabaseLayout.of( new File( "store" ), DatabaseManager.DEFAULT_DATABASE_NAME ); + private final DatabaseLayout migrationLayout = DatabaseLayout.of( new File( "migrationDir" ), DatabaseManager.DEFAULT_DATABASE_NAME ); private final SchemaIndexMigrator migrator = new SchemaIndexMigrator( fs, indexProvider ); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneKernelExtension.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneKernelExtension.java index 788bca839e146..0d4b9d9cb27a4 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneKernelExtension.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneKernelExtension.java @@ -43,7 +43,7 @@ public class LuceneKernelExtension extends LifecycleAdapter public LuceneKernelExtension( File databaseDirectory, Config config, Supplier indexStore, FileSystemAbstraction fileSystemAbstraction, IndexProviders indexProviders, OperationalMode operationalMode ) { - this.databaseLayout = new DatabaseLayout( databaseDirectory ); + this.databaseLayout = DatabaseLayout.of( databaseDirectory ); this.config = config; this.indexStore = indexStore; this.fileSystemAbstraction = fileSystemAbstraction; diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java index 5a8fa9d92e965..6bd16249fb90e 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java @@ -209,7 +209,7 @@ BackupOutcome executeBackup( HostnamePort hostnamePort, Path to, ConsistencyChec String host = hostnamePort.getHost(); int port = hostnamePort.getPort(); - BackupOutcome outcome = backupProtocolService.doIncrementalBackupOrFallbackToFull( host, port, new DatabaseLayout( to.toFile() ), + BackupOutcome outcome = backupProtocolService.doIncrementalBackupOrFallbackToFull( host, port, DatabaseLayout.of( to.toFile() ), consistencyCheck, config, timeout, forensics ); systemOut.println( "Done" ); return outcome; diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackup.java b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackup.java index 5bec24ff2942c..246dd68e82cfd 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackup.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackup.java @@ -110,7 +110,7 @@ public OnlineBackup backup( String targetDirectory ) public OnlineBackup backup( File targetDirectory ) { outcome = new BackupProtocolService( out ).doIncrementalBackupOrFallbackToFull( - hostNameOrIp, port, new DatabaseLayout( targetDirectory ), getConsistencyCheck( true ), defaultConfig(), timeoutMillis, forensics ); + hostNameOrIp, port, DatabaseLayout.of( targetDirectory ), getConsistencyCheck( true ), defaultConfig(), timeoutMillis, forensics ); return this; } @@ -144,7 +144,7 @@ public OnlineBackup backup( String targetDirectory, boolean verification ) public OnlineBackup backup( File targetDirectory, boolean verification ) { outcome = new BackupProtocolService( out ).doIncrementalBackupOrFallbackToFull( - hostNameOrIp, port, new DatabaseLayout( targetDirectory ), getConsistencyCheck( verification ), defaultConfig(), + hostNameOrIp, port, DatabaseLayout.of( targetDirectory ), getConsistencyCheck( verification ), defaultConfig(), timeoutMillis, forensics ); return this; } @@ -178,7 +178,7 @@ public OnlineBackup backup( String targetDirectory, Config tuningConfiguration ) public OnlineBackup backup( File targetDirectory, Config tuningConfiguration ) { outcome = new BackupProtocolService( out ).doIncrementalBackupOrFallbackToFull( - hostNameOrIp, port, new DatabaseLayout( targetDirectory ), getConsistencyCheck( true ), tuningConfiguration, + hostNameOrIp, port, DatabaseLayout.of( targetDirectory ), getConsistencyCheck( true ), tuningConfiguration, timeoutMillis, forensics ); return this; } @@ -215,7 +215,7 @@ public OnlineBackup backup( String targetDirectory, Config tuningConfiguration, public OnlineBackup backup( File targetDirectory, Config tuningConfiguration, boolean verification ) { outcome = new BackupProtocolService( out ).doIncrementalBackupOrFallbackToFull( - hostNameOrIp, port, new DatabaseLayout( targetDirectory ), getConsistencyCheck( verification ), tuningConfiguration, + hostNameOrIp, port, DatabaseLayout.of( targetDirectory ), getConsistencyCheck( verification ), tuningConfiguration, timeoutMillis, forensics ); return this; } @@ -417,7 +417,7 @@ public OnlineBackup gatheringForensics( boolean forensics ) private static DatabaseLayout getTargetDatabaseLayout( String targetDirectory ) { - return new DatabaseLayout( Paths.get( targetDirectory ).toFile() ); + return DatabaseLayout.of( Paths.get( targetDirectory ).toFile() ); } private static ConsistencyCheck getConsistencyCheck( boolean verification ) diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupCopyService.java b/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupCopyService.java index 684dfb29d5216..f74597e3ae144 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupCopyService.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupCopyService.java @@ -124,7 +124,7 @@ Path findAnAvailableLocationForNewFullBackup( Path desiredBackupLocation ) */ private Path findAnAvailableBackupLocation( Path file, String pattern ) { - if ( backupExists( new DatabaseLayout( file.toFile() ) ) ) + if ( backupExists( DatabaseLayout.of( file.toFile() ) ) ) { // find alternative name final AtomicLong counter = new AtomicLong( 0 ); @@ -133,7 +133,7 @@ private Path findAnAvailableBackupLocation( Path file, String pattern ) return availableAlternativeNames( file, pattern ) .peek( countNumberOfFilesProcessedForPotentialErrorMessage ) - .filter( f -> !backupExists( new DatabaseLayout( f.toFile() ) ) ) + .filter( f -> !backupExists( DatabaseLayout.of( f.toFile() ) ) ) .findFirst() .orElseThrow( noFreeBackupLocation( file, counter ) ); } diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupStrategyCoordinator.java b/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupStrategyCoordinator.java index 21cadb9f3e294..714f3f70b5bb9 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupStrategyCoordinator.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupStrategyCoordinator.java @@ -103,7 +103,7 @@ public void performBackup( OnlineBackupContext onlineBackupContext ) throws Comm } if ( requiredArgs.isDoConsistencyCheck() ) { - performConsistencyCheck( onlineBackupContext.getConfig(), requiredArgs, consistencyFlags, new DatabaseLayout( destination.toFile() ) ); + performConsistencyCheck( onlineBackupContext.getConfig(), requiredArgs, consistencyFlags, DatabaseLayout.of( destination.toFile() ) ); } } diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupStrategyWrapper.java b/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupStrategyWrapper.java index 92bb4dee27ad5..69fe3816f067d 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupStrategyWrapper.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupStrategyWrapper.java @@ -83,12 +83,12 @@ private Fallible performBackupWithoutLifecycle( log.debug( "User specified address is %s:%s", userSpecifiedAddress.getHostname().toString(), userSpecifiedAddress.getPort().toString() ); Config config = onlineBackupContext.getConfig(); - boolean previousBackupExists = backupCopyService.backupExists( new DatabaseLayout( backupLocation.toFile() ) ); + boolean previousBackupExists = backupCopyService.backupExists( DatabaseLayout.of( backupLocation.toFile() ) ); if ( previousBackupExists ) { log.info( "Previous backup found, trying incremental backup." ); Fallible state = - backupStrategy.performIncrementalBackup( new DatabaseLayout( backupLocation.toFile() ), config, userSpecifiedAddress ); + backupStrategy.performIncrementalBackup( DatabaseLayout.of( backupLocation.toFile() ), config, userSpecifiedAddress ); boolean fullBackupWontWork = BackupStageOutcome.WRONG_PROTOCOL.equals( state.getState() ); boolean incrementalWasSuccessful = BackupStageOutcome.SUCCESS.equals( state.getState() ); @@ -143,7 +143,7 @@ private Fallible fullBackupWithTemporaryFolderResolutions( Path temporaryFullBackupLocation = backupCopyService.findAnAvailableLocationForNewFullBackup( userSpecifiedBackupLocation ); OptionalHostnamePort address = onlineBackupContext.getRequiredArguments().getAddress(); - Fallible state = backupStrategy.performFullBackup( new DatabaseLayout( temporaryFullBackupLocation.toFile() ), config, address ); + Fallible state = backupStrategy.performFullBackup( DatabaseLayout.of( temporaryFullBackupLocation.toFile() ), config, address ); // NOTE temporaryFullBackupLocation can be equal to desired boolean aBackupAlreadyExisted = !userSpecifiedBackupLocation.equals( temporaryFullBackupLocation ); diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolCmdArgumentsAcceptanceTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolCmdArgumentsAcceptanceTest.java index 82e0b63fd2e65..3e48dee3ffbea 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolCmdArgumentsAcceptanceTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolCmdArgumentsAcceptanceTest.java @@ -105,7 +105,7 @@ public void shouldInvokeBackupServiceWhenArgsAreValid() throws Exception // Then verify( backupProtocolService ).doIncrementalBackupOrFallbackToFull( eq( HOST ), - eq( PORT ), eq( new DatabaseLayout( PATH.toFile() ) ), + eq( PORT ), eq( DatabaseLayout.of( PATH.toFile() ) ), expectedVerifyStoreValue ? eq( ConsistencyCheck.FULL ) : eq( ConsistencyCheck.NONE ), any( Config.class ), eq( BackupClient.BIG_READ_TIMEOUT ), diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java index eab5faab433b3..041b45e188581 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java @@ -101,7 +101,7 @@ public void shouldUseIncrementalOrFallbackToFull() throws Exception // then verify( service ).doIncrementalBackupOrFallbackToFull( eq( "localhost" ), - eq( BackupServer.DEFAULT_PORT ), eq( new DatabaseLayout( Paths.get( "my_backup" ).toFile() ) ), eq( ConsistencyCheck.FULL ), + eq( BackupServer.DEFAULT_PORT ), eq( DatabaseLayout.of( Paths.get( "my_backup" ).toFile() ) ), eq( ConsistencyCheck.FULL ), any( Config.class ), eq( BackupClient.BIG_READ_TIMEOUT ), eq( false ) ); verify( systemOut ).println( "Performing backup from '" + new HostnamePort( "localhost", BackupServer.DEFAULT_PORT ) + "'" ); @@ -122,7 +122,7 @@ public void shouldResetTimeout() throws Exception // then verify( service ).doIncrementalBackupOrFallbackToFull( eq( "localhost" ), eq( BackupServer.DEFAULT_PORT ), - eq( new DatabaseLayout( Paths.get( "my_backup" ).toFile() ) ), eq( ConsistencyCheck.FULL ), any( Config.class ), eq( expectedTimeout ), + eq( DatabaseLayout.of( Paths.get( "my_backup" ).toFile() ) ), eq( ConsistencyCheck.FULL ), any( Config.class ), eq( expectedTimeout ), eq( false ) ); verify( systemOut ).println( "Performing backup from '" + new HostnamePort( "localhost", BackupServer.DEFAULT_PORT ) + "'" ); @@ -141,7 +141,7 @@ public void shouldIgnoreIncrementalFlag() throws Exception // then verify( service ).doIncrementalBackupOrFallbackToFull( eq( "localhost" ), eq( BackupServer.DEFAULT_PORT ), - eq( new DatabaseLayout( Paths.get( "my_backup" ).toFile() ) ), eq( ConsistencyCheck.FULL ), any( Config.class ), + eq( DatabaseLayout.of( Paths.get( "my_backup" ).toFile() ) ), eq( ConsistencyCheck.FULL ), any( Config.class ), eq( BackupClient.BIG_READ_TIMEOUT ), eq( false ) ); verify( systemOut ).println( "Performing backup from '" + new HostnamePort( "localhost", BackupServer.DEFAULT_PORT ) + "'" ); @@ -160,7 +160,7 @@ public void shouldIgnoreFullFlag() throws Exception // then verify( service ).doIncrementalBackupOrFallbackToFull( eq( "localhost" ), eq( BackupServer.DEFAULT_PORT ), - eq( new DatabaseLayout( Paths.get( "my_backup" ).toFile() ) ), eq( ConsistencyCheck.FULL ), any( Config.class ), + eq( DatabaseLayout.of( Paths.get( "my_backup" ).toFile() ) ), eq( ConsistencyCheck.FULL ), any( Config.class ), eq( BackupClient.BIG_READ_TIMEOUT ), eq( false ) ); verify( systemOut ).println( "Performing backup from '" + new HostnamePort( "localhost", BackupServer.DEFAULT_PORT ) + "'" ); @@ -180,7 +180,7 @@ public void appliesDefaultTuningConfigurationForConsistencyChecker() throws Exce // then ArgumentCaptor config = ArgumentCaptor.forClass( Config.class ); - verify( service ).doIncrementalBackupOrFallbackToFull( anyString(), anyInt(), eq( new DatabaseLayout( Paths.get( "my_backup" ).toFile() ) ), + verify( service ).doIncrementalBackupOrFallbackToFull( anyString(), anyInt(), eq( DatabaseLayout.of( Paths.get( "my_backup" ).toFile() ) ), any( ConsistencyCheck.class ), config.capture(), eq( BackupClient.BIG_READ_TIMEOUT ), eq( false ) ); assertFalse( config.getValue().get( ConsistencyCheckSettings.consistency_check_property_owners ) ); } @@ -203,7 +203,7 @@ public void passesOnConfigurationIfProvided() throws Exception // then ArgumentCaptor config = ArgumentCaptor.forClass( Config.class ); - verify( service ).doIncrementalBackupOrFallbackToFull( anyString(), anyInt(), eq( new DatabaseLayout( Paths.get( "my_backup" ).toFile() ) ), + verify( service ).doIncrementalBackupOrFallbackToFull( anyString(), anyInt(), eq( DatabaseLayout.of( Paths.get( "my_backup" ).toFile() ) ), any( ConsistencyCheck.class ), config.capture(), anyLong(), eq( false ) ); assertTrue( config.getValue().get( ConsistencyCheckSettings.consistency_check_property_owners ) ); } @@ -345,7 +345,7 @@ public void shouldRespectVerifyFlagWithLegacyArguments() throws BackupTool.ToolF // Then verify( service ).doIncrementalBackupOrFallbackToFull( eq( host ), eq( BackupServer.DEFAULT_PORT ), - eq( new DatabaseLayout( targetDir.toFile() ) ), eq( ConsistencyCheck.NONE ), any( Config.class ), eq( BackupClient.BIG_READ_TIMEOUT ), + eq( DatabaseLayout.of( targetDir.toFile() ) ), eq( ConsistencyCheck.NONE ), any( Config.class ), eq( BackupClient.BIG_READ_TIMEOUT ), eq( false ) ); verify( systemOut ).println( "Performing backup from '" + new HostnamePort( host, BackupServer.DEFAULT_PORT ) + "'" ); @@ -364,7 +364,7 @@ public void shouldMakeUseOfDebugArgument() throws Exception new BackupTool( service, systemOut ).run( args ); // then - verify( service ).doIncrementalBackupOrFallbackToFull( anyString(), anyInt(), eq( new DatabaseLayout( Paths.get( "my_backup" ).toFile() ) ), + verify( service ).doIncrementalBackupOrFallbackToFull( anyString(), anyInt(), eq( DatabaseLayout.of( Paths.get( "my_backup" ).toFile() ) ), any( ConsistencyCheck.class ), any( Config.class ), anyLong(), eq( true ) ); } diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolUrisTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolUrisTest.java index 886db7d03158d..918920592cf4a 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolUrisTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolUrisTest.java @@ -101,7 +101,7 @@ public void shouldExecuteBackupWithValidUri() throws Exception verify( backupProtocolService ).doIncrementalBackupOrFallbackToFull( eq( host ), eq( port ), - eq( new DatabaseLayout( Paths.get( "/var/backup/graph" ).toFile() ) ), + eq( DatabaseLayout.of( Paths.get( "/var/backup/graph" ).toFile() ) ), eq( ConsistencyCheck.FULL ), any( Config.class ), eq( BackupClient.BIG_READ_TIMEOUT ), @@ -205,7 +205,7 @@ public void shouldExecuteBackupWithValidUri() throws Exception verify( backupProtocolService ).doIncrementalBackupOrFallbackToFull( eq( host ), eq( port ), - eq( new DatabaseLayout( Paths.get( "/var/backup/graph" ).toFile() ) ), + eq( DatabaseLayout.of( Paths.get( "/var/backup/graph" ).toFile() ) ), eq( ConsistencyCheck.FULL ), any( Config.class ), eq( BackupClient.BIG_READ_TIMEOUT ), diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/impl/BackupDelegatorTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/impl/BackupDelegatorTest.java index f26d20f4d5a2d..aa1dff7146d08 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/impl/BackupDelegatorTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/impl/BackupDelegatorTest.java @@ -71,7 +71,7 @@ public void tryCatchingUpDelegatesToRemoteStore() throws StoreCopyFailedExceptio // given AdvertisedSocketAddress fromAddress = new AdvertisedSocketAddress( "neo4j.com", 5432 ); StoreId expectedStoreId = new StoreId( 7, 2, 5, 98 ); - DatabaseLayout databaseLayout = new DatabaseLayout( new File( "." ) ); + DatabaseLayout databaseLayout = DatabaseLayout.of( new File( "." ) ); // when subject.tryCatchingUp( fromAddress, expectedStoreId, databaseLayout ); @@ -123,7 +123,7 @@ public void retrieveStoreDelegatesToStoreCopyService() { // given StoreId storeId = new StoreId( 92, 5, 7, 32 ); - DatabaseLayout databaseLayout = new DatabaseLayout( new File( "." ) ); + DatabaseLayout databaseLayout = DatabaseLayout.of( new File( "." ) ); // when subject.copy( anyAddress, storeId, databaseLayout ); diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/impl/OnlineBackupCommandCcIT.java b/enterprise/backup/src/test/java/org/neo4j/backup/impl/OnlineBackupCommandCcIT.java index 96bee3c0e13bb..423640b63b503 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/impl/OnlineBackupCommandCcIT.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/impl/OnlineBackupCommandCcIT.java @@ -277,7 +277,7 @@ public void onlyTheLatestTransactionIsKeptAfterIncrementalBackup() throws Except "--name=" + backupName ) ); // then there has been a rotation - LogFiles logFiles = BackupTransactionLogFilesHelper.readLogFiles( new DatabaseLayout( new File( backupStoreDir, backupName ) ) ); + LogFiles logFiles = BackupTransactionLogFilesHelper.readLogFiles( DatabaseLayout.of( new File( backupStoreDir, backupName ) ) ); long highestTxIdInLogFiles = logFiles.getHighestLogVersion(); assertEquals( 2, highestTxIdInLogFiles ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/TemporaryStoreDirectory.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/TemporaryStoreDirectory.java index 2fc2f5e0e30e0..a4319182170c2 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/TemporaryStoreDirectory.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/TemporaryStoreDirectory.java @@ -45,7 +45,7 @@ public TemporaryStoreDirectory( FileSystemAbstraction fs, PageCache pageCache, F { this.tempStoreDir = new File( parent, TEMP_COPY_DIRECTORY_NAME ); // TODO - this.tempDatabaseLayout = new DatabaseLayout( new File( tempStoreDir, DatabaseManager.DEFAULT_DATABASE_NAME ) ); + this.tempDatabaseLayout = DatabaseLayout.of( new File( tempStoreDir, DatabaseManager.DEFAULT_DATABASE_NAME ) ); storeFiles = new StoreFiles( fs, pageCache, ( directory, name ) -> true ); tempLogFiles = LogFilesBuilder.logFilesBasedOnlyBuilder( tempDatabaseLayout.databaseDirectory(), fs ).build(); storeFiles.delete( tempStoreDir, tempLogFiles ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/CopiedStoreRecoveryTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/CopiedStoreRecoveryTest.java index 5e9544cb83920..7517653216aaa 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/CopiedStoreRecoveryTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/CopiedStoreRecoveryTest.java @@ -48,7 +48,7 @@ public void shouldThrowIfAlreadyShutdown() try { // when - copiedStoreRecovery.recoverCopiedStore( new DatabaseLayout( new File( "nowhere" ) ) ); + copiedStoreRecovery.recoverCopiedStore( DatabaseLayout.of( new File( "nowhere" ) ) ); fail( "should have thrown" ); } catch ( DatabaseShutdownException ex ) diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/RemoteStoreTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/RemoteStoreTest.java index 2952a167f746c..ebd2e8f3076e7 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/RemoteStoreTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/RemoteStoreTest.java @@ -72,7 +72,7 @@ public void shouldCopyStoreFilesAndPullTransactions() throws Exception // when AdvertisedSocketAddress localhost = new AdvertisedSocketAddress( "127.0.0.1", 1234 ); CatchupAddressProvider catchupAddressProvider = CatchupAddressProvider.fromSingleAddress( localhost ); - remoteStore.copy( catchupAddressProvider, storeId, new DatabaseLayout( new File( "destination" ) ), true ); + remoteStore.copy( catchupAddressProvider, storeId, DatabaseLayout.of( new File( "destination" ) ), true ); // then verify( storeCopyClient ).copyStoreFiles( eq( catchupAddressProvider ), eq( storeId ), any( StoreFileStreamProvider.class ), any(), any() ); @@ -102,7 +102,7 @@ public void shouldSetLastPulledTransactionId() throws Exception null, storeCopyClient, txPullClient, factory( writer ), Config.defaults(), new Monitors() ); // when - remoteStore.copy( catchupAddressProvider, wantedStoreId, new DatabaseLayout( new File( "destination" ) ), true ); + remoteStore.copy( catchupAddressProvider, wantedStoreId, DatabaseLayout.of( new File( "destination" ) ), true ); // then long previousTxId = lastFlushedTxId - 1; // the interface is defined as asking for the one preceding @@ -130,7 +130,7 @@ public void shouldCloseDownTxLogWriterIfTxStreamingFails() throws Exception // when try { - remoteStore.copy( catchupAddressProvider, storeId, new DatabaseLayout( new File( "." ) ), true ); + remoteStore.copy( catchupAddressProvider, storeId, DatabaseLayout.of( new File( "." ) ), true ); } catch ( StoreCopyFailedException e ) { diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyRequestHandlerTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyRequestHandlerTest.java index 0c8d12233d36d..c0d6900bdabf4 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyRequestHandlerTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyRequestHandlerTest.java @@ -88,7 +88,7 @@ public void setup() Dependencies dependencies = new Dependencies(); when( neoStoreDataSource.getStoreId() ).thenReturn( new org.neo4j.storageengine.api.StoreId( 1, 2, 5, 3, 4 ) ); when( neoStoreDataSource.getDependencyResolver() ).thenReturn( dependencies ); - when( neoStoreDataSource.getDatabaseLayout() ).thenReturn( new DatabaseLayout( new File( "." ) ) ); + when( neoStoreDataSource.getDatabaseLayout() ).thenReturn( DatabaseLayout.of( new File( "." ) ) ); embeddedChannel = new EmbeddedChannel( storeCopyRequestHandler ); } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/CoreBootstrapperIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/CoreBootstrapperIT.java index c07a25f764e3e..f23aee1feaf8a 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/CoreBootstrapperIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/CoreBootstrapperIT.java @@ -84,7 +84,7 @@ public void shouldSetAllCoreState() throws Exception testDirectory.directory(), fileSystem, nodeCount, Standard.LATEST_NAME ); PageCache pageCache = pageCacheRule.getPageCache( fileSystem ); - DatabaseLayout databaseLayout = new DatabaseLayout( classicNeo4jStore ); + DatabaseLayout databaseLayout = DatabaseLayout.of( classicNeo4jStore ); CoreBootstrapper bootstrapper = new CoreBootstrapper( databaseLayout, pageCache, fileSystem, Config.defaults(), NullLogProvider.getInstance() ); bootstrapAndVerify( nodeCount, fileSystem, databaseLayout, pageCache, Config.defaults(), bootstrapper ); @@ -102,7 +102,7 @@ public void setAllCoreStateOnDatabaseWithCustomLogFilesLocation() throws Excepti Standard.LATEST_NAME, customTransactionLogsLocation ); PageCache pageCache = pageCacheRule.getPageCache( fileSystem ); - DatabaseLayout databaseLayout = new DatabaseLayout( classicNeo4jStore ); + DatabaseLayout databaseLayout = DatabaseLayout.of( classicNeo4jStore ); Config config = Config.defaults( GraphDatabaseSettings.logical_logs_location, customTransactionLogsLocation ); CoreBootstrapper bootstrapper = new CoreBootstrapper( databaseLayout, pageCache, fileSystem, diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/snapshot/CoreStateDownloaderTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/snapshot/CoreStateDownloaderTest.java index 418ffdda074c0..39fd06130e698 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/snapshot/CoreStateDownloaderTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/snapshot/CoreStateDownloaderTest.java @@ -73,7 +73,7 @@ public class CoreStateDownloaderTest private final AdvertisedSocketAddress remoteAddress = new AdvertisedSocketAddress( "remoteAddress", 1234 ); private final CatchupAddressProvider catchupAddressProvider = CatchupAddressProvider.fromSingleAddress( remoteAddress ); private final StoreId storeId = new StoreId( 1, 2, 3, 4 ); - private final DatabaseLayout databaseLayout = new DatabaseLayout( new File( "." ) ); + private final DatabaseLayout databaseLayout = DatabaseLayout.of( new File( "." ) ); private final CoreStateDownloader downloader = new CoreStateDownloader( localDatabase, startStopLife, remoteStore, catchUpClient, logProvider, storeCopyProcess, coreStateMachines, diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/readreplica/ReadReplicaStartupProcessTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/readreplica/ReadReplicaStartupProcessTest.java index 9e7241d97dd3b..fed9a6d3cde7b 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/readreplica/ReadReplicaStartupProcessTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/readreplica/ReadReplicaStartupProcessTest.java @@ -79,7 +79,7 @@ public class ReadReplicaStartupProcessTest private AdvertisedSocketAddress fromAddress = new AdvertisedSocketAddress( "127.0.0.1", 123 ); private StoreId localStoreId = new StoreId( 1, 2, 3, 4 ); private StoreId otherStoreId = new StoreId( 5, 6, 7, 8 ); - private DatabaseLayout databaseLayout = new DatabaseLayout( new File( "store-dir" ) ); + private DatabaseLayout databaseLayout = DatabaseLayout.of( new File( "store-dir" ) ); @Before public void commonMocking() throws IOException diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RecoveryIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RecoveryIT.java index 51268cbfe6d18..1fcdf3f71b9ff 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RecoveryIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RecoveryIT.java @@ -113,7 +113,7 @@ private static void assertConsistent( File storeDir ) ConsistencyCheckService.Result result; try { - result = new ConsistencyCheckService().runFullConsistencyCheck( new DatabaseLayout( storeDir ), Config.defaults(), + result = new ConsistencyCheckService().runFullConsistencyCheck( DatabaseLayout.of( storeDir ), Config.defaults(), ProgressMonitorFactory.NONE, NullLogProvider.getInstance(), true ); } catch ( Exception e ) diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RestartIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RestartIT.java index e63b1f1c572ef..efe4d42fd351b 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RestartIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RestartIT.java @@ -172,7 +172,7 @@ public void readReplicaTest() throws Exception for ( CoreClusterMember core : cluster.coreMembers() ) { ConsistencyCheckService.Result result = new ConsistencyCheckService() - .runFullConsistencyCheck( new DatabaseLayout( core.databaseDirectory() ), Config.defaults(), ProgressMonitorFactory.NONE, + .runFullConsistencyCheck( DatabaseLayout.of( core.databaseDirectory() ), Config.defaults(), ProgressMonitorFactory.NONE, NullLogProvider.getInstance(), fileSystem, false, new ConsistencyFlags( true, true, true, false ) ); assertTrue( "Inconsistent: " + core, result.isSuccessful() ); @@ -181,7 +181,7 @@ public void readReplicaTest() throws Exception for ( ReadReplica readReplica : cluster.readReplicas() ) { ConsistencyCheckService.Result result = new ConsistencyCheckService() - .runFullConsistencyCheck( new DatabaseLayout( readReplica.databaseDirectory() ), Config.defaults(), ProgressMonitorFactory.NONE, + .runFullConsistencyCheck( DatabaseLayout.of( readReplica.databaseDirectory() ), Config.defaults(), ProgressMonitorFactory.NONE, NullLogProvider.getInstance(), fileSystem, false, new ConsistencyFlags( true, true, true, false ) ); assertTrue( "Inconsistent: " + readReplica, result.isSuccessful() ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/TransactionLogRecoveryIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/TransactionLogRecoveryIT.java index ab09843932ead..d0d8f6c727756 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/TransactionLogRecoveryIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/TransactionLogRecoveryIT.java @@ -147,7 +147,7 @@ private void writePartialTx( File storeDir ) throws IOException { try ( PageCache pageCache = this.pageCache.getPageCache( fs ) ) { - LogFiles logFiles = LogFilesBuilder.activeFilesBuilder( new DatabaseLayout( storeDir ), fs, pageCache ).build(); + LogFiles logFiles = LogFilesBuilder.activeFilesBuilder( DatabaseLayout.of( storeDir ), fs, pageCache ).build(); try ( Lifespan ignored = new Lifespan( logFiles ) ) { LogEntryWriter writer = new LogEntryWriter( logFiles.getLogFile().getWriter() ); diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/StoreCopyClient.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/StoreCopyClient.java index 0204a7b29dc9c..5a79b006c8178 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/storecopy/StoreCopyClient.java +++ b/enterprise/com/src/main/java/org/neo4j/com/storecopy/StoreCopyClient.java @@ -130,7 +130,7 @@ public void copyStore( StoreCopyRequester requester, CancellationRequest cancell monitor.finishReceivingStoreFiles(); // Update highest archived log id // Write transactions that happened during the copy to the currently active logical log - writeTransactionsToActiveLogFile( new DatabaseLayout( tempDatabaseDirectory ), response ); + writeTransactionsToActiveLogFile( DatabaseLayout.of( tempDatabaseDirectory ), response ); } finally { diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java index 0883398b7be19..26e295edb1cab 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java @@ -61,9 +61,8 @@ public void testGetLastTxIdNoFilePresent() @Test public void lastTransactionIdIsBaseTxIdWhileNeoStoresAreStopped() { - final StoreFactory storeFactory = new StoreFactory( - new DatabaseLayout( new File( "store" ) ), Config.defaults(), new DefaultIdGeneratorFactory( fs.get() ), - pageCacheRule.getPageCache( fs.get() ), fs.get(), + final StoreFactory storeFactory = new StoreFactory( DatabaseLayout.of( new File( "store" ) ), + Config.defaults(), new DefaultIdGeneratorFactory( fs.get() ), pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); final NeoStores neoStores = storeFactory.openAllNeoStores( true ); neoStores.close(); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachineTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachineTest.java index 8deb58ab74fda..179d643563ff9 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachineTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachineTest.java @@ -557,7 +557,7 @@ public void switchToSlaveCompleted( boolean wasSuccessful ) TransactionIdStore transactionIdStoreMock = mock( TransactionIdStore.class ); when( transactionIdStoreMock.getLastCommittedTransaction() ).thenReturn( new TransactionId( 0, 0, 0 ) ); - SwitchToSlaveCopyThenBranch switchToSlave = new SwitchToSlaveCopyThenBranch( new DatabaseLayout( new File( "" ) ), NullLogService.getInstance(), + SwitchToSlaveCopyThenBranch switchToSlave = new SwitchToSlaveCopyThenBranch( DatabaseLayout.of( new File( "" ) ), NullLogService.getInstance(), mock( FileSystemAbstraction.class ), config, mock( HaIdGeneratorFactory.class ), handler, diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveBranchThenCopyTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveBranchThenCopyTest.java index debce1d60888c..14bd6f2bfac07 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveBranchThenCopyTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveBranchThenCopyTest.java @@ -336,7 +336,7 @@ private SwitchToSlaveBranchThenCopy newSwitchToSlaveSpy( PageCache pageCacheMock when( masterClientResolver.instantiate( anyString(), anyInt(), anyString(), any( Monitors.class ), argThat( storeId -> true ), any( LifeSupport.class ) ) ).thenReturn( masterClient ); - return spy( new SwitchToSlaveBranchThenCopy( new DatabaseLayout( new File( "" ) ), NullLogService.getInstance(), + return spy( new SwitchToSlaveBranchThenCopy( DatabaseLayout.of( new File( "" ) ), NullLogService.getInstance(), configMock(), mock( HaIdGeneratorFactory.class ), mock( DelegateInvocationHandler.class ), diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveCopyThenBranchTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveCopyThenBranchTest.java index 9a2035346bd5b..c88a6f1fb9fb6 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveCopyThenBranchTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveCopyThenBranchTest.java @@ -387,7 +387,7 @@ private SwitchToSlaveCopyThenBranch newSwitchToSlaveSpy( PageCache pageCacheMock when( masterClientResolver.instantiate( anyString(), anyInt(), anyString(), any( Monitors.class ), argThat( storeId -> true ), any( LifeSupport.class ) ) ).thenReturn( masterClient ); - return spy( new SwitchToSlaveCopyThenBranch( new DatabaseLayout( new File( "" ) ), NullLogService.getInstance(), + return spy( new SwitchToSlaveCopyThenBranch( DatabaseLayout.of( new File( "" ) ), NullLogService.getInstance(), configMock(), mock( HaIdGeneratorFactory.class ), mock( DelegateInvocationHandler.class ), diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIT.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIT.java index 0f6335ff1820c..4da423cf30ea0 100644 --- a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIT.java +++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIT.java @@ -167,7 +167,7 @@ public void embeddedDatabaseShouldStartOnOlderStoreWhenUpgradeIsEnabled() throws db.shutdown(); } - assertConsistentStore( new DatabaseLayout( databaseDirectory ) ); + assertConsistentStore( DatabaseLayout.of( databaseDirectory ) ); } @Test @@ -209,7 +209,7 @@ public void serverDatabaseShouldStartOnOlderStoreWhenUpgradeIsEnabled() throws T bootstrapper.stop(); } - assertConsistentStore( new DatabaseLayout( databaseDirectory ) ); + assertConsistentStore( DatabaseLayout.of( databaseDirectory ) ); } @Test @@ -234,7 +234,7 @@ public void migratingOlderDataAndThanStartAClusterUsingTheNewerDataShouldWork() db.shutdown(); } - assertConsistentStore( new DatabaseLayout( databaseDirectory ) ); + assertConsistentStore( DatabaseLayout.of( databaseDirectory ) ); // start the cluster with the db migrated from the old instance File haDir = testDir.storeDir( "ha-stuff" ); @@ -358,7 +358,7 @@ public void shouldBeAbleToUpgradeAStoreWithoutIdFilesAsBackups() throws Throwabl db.shutdown(); } - assertConsistentStore( new DatabaseLayout( databaseDirectory ) ); + assertConsistentStore( DatabaseLayout.of( databaseDirectory ) ); } } diff --git a/stresstests/src/test/java/org/neo4j/backup/BackupHelper.java b/stresstests/src/test/java/org/neo4j/backup/BackupHelper.java index 1140ae0becb43..d23df9f6b43e5 100644 --- a/stresstests/src/test/java/org/neo4j/backup/BackupHelper.java +++ b/stresstests/src/test/java/org/neo4j/backup/BackupHelper.java @@ -63,7 +63,7 @@ public static BackupResult backup( String host, int port, Path targetDirectory ) try { BackupProtocolService backupProtocolService = new BackupProtocolService( outputStream ); - BackupOutcome backupOutcome = backupProtocolService.doIncrementalBackupOrFallbackToFull( host, port, new DatabaseLayout( targetDirectory.toFile() ), + BackupOutcome backupOutcome = backupProtocolService.doIncrementalBackupOrFallbackToFull( host, port, DatabaseLayout.of( targetDirectory.toFile() ), ConsistencyCheck.FULL, Config.defaults(), BackupClient.BIG_READ_TIMEOUT, false ); consistent = backupOutcome.isConsistent(); diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/CheckPointingLogRotationStressTesting.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/CheckPointingLogRotationStressTesting.java index 63581851c36c9..31f442c6b9749 100644 --- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/CheckPointingLogRotationStressTesting.java +++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/CheckPointingLogRotationStressTesting.java @@ -107,7 +107,7 @@ public void shouldBehaveCorrectlyUnderStress() throws Throwable try ( FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction() ) { Config dbConfig = Config.defaults(); - new ParallelBatchImporter( new DatabaseLayout( ensureExistsAndEmpty( storeDir ) ), fileSystem, null, DEFAULT, + new ParallelBatchImporter( DatabaseLayout.of( ensureExistsAndEmpty( storeDir ) ), fileSystem, null, DEFAULT, NullLogService.getInstance(), ExecutionMonitors.defaultVisible( jobScheduler ), EMPTY, dbConfig, RecordFormatSelector.selectForConfig( dbConfig, NullLogProvider.getInstance() ), NO_MONITOR ) .doImport( new NodeCountInputs( nodeCount ) ); diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/log/TransactionAppenderStressTesting.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/log/TransactionAppenderStressTesting.java index 1831dd3207851..a7ca569b1b7bf 100644 --- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/log/TransactionAppenderStressTesting.java +++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/log/TransactionAppenderStressTesting.java @@ -58,7 +58,7 @@ public void shouldBehaveCorrectlyUnderStress() throws Throwable Callable runner = new Builder() .with( untilTimeExpired( durationInMinutes, MINUTES ) ) - .withWorkingDirectory( new DatabaseLayout( ensureExistsAndEmpty( workingDirectory ) ) ) + .withWorkingDirectory( DatabaseLayout.of( ensureExistsAndEmpty( workingDirectory ) ) ) .withNumThreads( threads ) .build(); diff --git a/tools/src/main/java/org/neo4j/tools/applytx/ApplyTransactionsCommand.java b/tools/src/main/java/org/neo4j/tools/applytx/ApplyTransactionsCommand.java index 03795bec20ee0..4bf248d65b4e7 100644 --- a/tools/src/main/java/org/neo4j/tools/applytx/ApplyTransactionsCommand.java +++ b/tools/src/main/java/org/neo4j/tools/applytx/ApplyTransactionsCommand.java @@ -112,7 +112,7 @@ private long applyTransactions( File fromPath, GraphDatabaseAPI toDb, Config toC try ( DefaultFileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction(); PageCache pageCache = StandalonePageCacheFactory.createPageCache( fileSystem ) ) { - LogicalTransactionStore source = life.add( new ReadOnlyTransactionStore( pageCache, fileSystem, new DatabaseLayout( fromPath ), + LogicalTransactionStore source = life.add( new ReadOnlyTransactionStore( pageCache, fileSystem, DatabaseLayout.of( fromPath ), Config.defaults(), new Monitors() ) ); life.start(); long lastAppliedTx = fromTxExclusive; diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java b/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java index 383948b35cbe9..bf76957dd7626 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java @@ -88,7 +88,7 @@ public static void dumpCountsStore( FileSystemAbstraction fs, File path, PrintSt Config config = Config.defaults(); if ( fs.isDirectory( path ) ) { - StoreFactory factory = new StoreFactory( new DatabaseLayout( path ), Config.defaults(), new DefaultIdGeneratorFactory( fs ), + StoreFactory factory = new StoreFactory( DatabaseLayout.of( path ), Config.defaults(), new DefaultIdGeneratorFactory( fs ), pages, fs, logProvider, EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = factory.openAllNeoStores(); diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpStore.java b/tools/src/main/java/org/neo4j/tools/dump/DumpStore.java index 81ae57ed9e110..19785abb54a2f 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpStore.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpStore.java @@ -101,7 +101,7 @@ public static void main( String... args ) throws Exception PageCache pageCache = createPageCache( fs ) ) { final DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs ); - Function createStoreFactory = file -> new StoreFactory( new DatabaseLayout( file.getParentFile() ), + Function createStoreFactory = file -> new StoreFactory( DatabaseLayout.of( file.getParentFile() ), Config.defaults(), idGeneratorFactory, pageCache, fs, logProvider(), EmptyVersionContextSupplier.EMPTY ); for ( String arg : args ) diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpStoreChain.java b/tools/src/main/java/org/neo4j/tools/dump/DumpStoreChain.java index 8042b102dc114..8fc952a13bf8d 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpStoreChain.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpStoreChain.java @@ -104,7 +104,7 @@ else if ( PROPSTORE.equals( storeFile.getName() ) ) throw invalidUsage( "not a chain store: " + storeFile.getName() ); } } - tool.dump( new DatabaseLayout( storeFile ) ); + tool.dump( DatabaseLayout.of( storeFile ) ); } long firstRecord; diff --git a/tools/src/main/java/org/neo4j/tools/migration/StoreMigration.java b/tools/src/main/java/org/neo4j/tools/migration/StoreMigration.java index 9b6070b4f83f6..70a4b28d4c010 100644 --- a/tools/src/main/java/org/neo4j/tools/migration/StoreMigration.java +++ b/tools/src/main/java/org/neo4j/tools/migration/StoreMigration.java @@ -126,7 +126,7 @@ public static void run( final FileSystemAbstraction fs, final File storeDirector kernelContext, GraphDatabaseDependencies.newDependencies().kernelExtensions(), deps, ignore() ) ); - DatabaseLayout databaseLayout = new DatabaseLayout( storeDirectory ); + DatabaseLayout databaseLayout = DatabaseLayout.of( storeDirectory ); final LogFiles logFiles = LogFilesBuilder.activeFilesBuilder( databaseLayout, fs, pageCache ) .withConfig( config ).build(); LogTailScanner tailScanner = new LogTailScanner( logFiles, new VersionAwareLogEntryReader<>(), monitors ); diff --git a/tools/src/main/java/org/neo4j/tools/rawstorereader/RsdrMain.java b/tools/src/main/java/org/neo4j/tools/rawstorereader/RsdrMain.java index 4a51dc3c73619..2fcfff298cbe2 100644 --- a/tools/src/main/java/org/neo4j/tools/rawstorereader/RsdrMain.java +++ b/tools/src/main/java/org/neo4j/tools/rawstorereader/RsdrMain.java @@ -113,7 +113,7 @@ private static StoreFactory openStore( FileSystemAbstraction fileSystem, File st { IdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fileSystem ); NullLogProvider logProvider = NullLogProvider.getInstance(); - return new StoreFactory( new DatabaseLayout( storeDir ), config, idGeneratorFactory, pageCache, fileSystem, logProvider, + return new StoreFactory( DatabaseLayout.of( storeDir ), config, idGeneratorFactory, pageCache, fileSystem, logProvider, EmptyVersionContextSupplier.EMPTY ); }