Andrei review comments.

neo4j · Aug 21, 2018 · 2630331 · 2630331
1 parent b4314e6
commit 2630331
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
@@ -450,11 +450,11 @@ private LifeSupport initializeExtensions( Dependencies dependencies )
         return extensionsLife;
     }
 
-    private static RecordFormats selectStoreFormats( Config config, DatabaseLayout dbDirectoryStructure, FileSystemAbstraction fs, PageCache pageCache,
+    private static RecordFormats selectStoreFormats( Config config, DatabaseLayout databaseLayout, FileSystemAbstraction fs, PageCache pageCache,
             LogService logService )
     {
         LogProvider logging = logService.getInternalLogProvider();
-        RecordFormats formats = RecordFormatSelector.selectNewestFormat( config, dbDirectoryStructure, fs, pageCache, logging );
+        RecordFormats formats = RecordFormatSelector.selectNewestFormat( config, databaseLayout, fs, pageCache, logging );
         new RecordFormatPropertyConfigurator( formats, config ).configure();
         return formats;
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java
@@ -67,22 +67,22 @@ public abstract class CommonAbstractStore<RECORD extends AbstractBaseRecord,HEAD
 {
     static final String UNKNOWN_VERSION = "Unknown";
 
-    private final File idFile;
     protected final Config configuration;
     protected final PageCache pageCache;
-    private final String databaseName;
-    final File storageFile;
     protected final IdType idType;
     protected final IdGeneratorFactory idGeneratorFactory;
     protected final Log log;
-    protected PagedFile pagedFile;
     protected final String storeVersion;
     protected final RecordFormat<RECORD> recordFormat;
+    final File storageFile;
+    private final File idFile;
+    private final String databaseName;
+    private final String typeDescriptor;
+    protected PagedFile pagedFile;
+    protected int recordSize;
     private IdGenerator idGenerator;
     private boolean storeOk = true;
     private RuntimeException causeOfStoreNotOk;
-    private final String typeDescriptor;
-    protected int recordSize;
 
     private final StoreHeaderFormat<HEADER> storeHeaderFormat;
     private HEADER storeHeader;