Refactor to use renamed setting and cleanup

neo4j · Sep 5, 2017 · d72c3e8 · d72c3e8
1 parent 7697882
commit d72c3e8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.../kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/LogVersionUpgradeChecker.java b/.../kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/LogVersionUpgradeChecker.java
@@ -41,7 +41,7 @@ private LogVersionUpgradeChecker()
 
     public static void check( LogTailScanner tailScanner, Config config ) throws UpgradeNotAllowedByConfigurationException
     {
-        if ( !config.get( GraphDatabaseSettings.allow_store_upgrade ) )
+        if ( !config.get( GraphDatabaseSettings.allow_upgrade ) )
         {
             // The user doesn't want us to upgrade the store.
             LogEntryVersion latestLogEntryVersion = tailScanner.getTailInformation().latestLogEntryVersion;

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryWriter.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryWriter.java
@@ -46,7 +46,7 @@ public class LogEntryWriter
      */
     public LogEntryWriter( FlushableChannel channel )
     {
-        this(channel, CURRENT );
+        this( channel, CURRENT );
     }
 
     /**

diff --git a/...ernel/src/test/java/org/neo4j/kernel/impl/transaction/log/LogVersionUpgradeCheckerIT.java b/...ernel/src/test/java/org/neo4j/kernel/impl/transaction/log/LogVersionUpgradeCheckerIT.java
@@ -66,7 +66,7 @@ public void startAsNormalWhenUpgradeIsNotAllowed() throws Exception
         final GraphDatabaseService db = new TestGraphDatabaseFactory()
                 .setFileSystem( fs.get() )
                 .newImpermanentDatabaseBuilder( storeDirectory.graphDbDir() )
-                .setConfig( GraphDatabaseSettings.allow_store_upgrade, "false" )
+                .setConfig( GraphDatabaseSettings.allow_upgrade, "false" )
                 .newGraphDatabase();
         db.shutdown();
     }
@@ -82,7 +82,7 @@ public void failToStartFromOlderTransactionLogsIfNotAllowed() throws Exception
         final GraphDatabaseService db = new TestGraphDatabaseFactory()
                 .setFileSystem( fs.get() )
                 .newImpermanentDatabaseBuilder( storeDirectory.graphDbDir() )
-                .setConfig( GraphDatabaseSettings.allow_store_upgrade, "false" )
+                .setConfig( GraphDatabaseSettings.allow_upgrade, "false" )
                 .newGraphDatabase();
         db.shutdown();
     }
@@ -96,7 +96,7 @@ public void startFromOlderTransactionLogsIfAllowed() throws Exception
         final GraphDatabaseService db = new TestGraphDatabaseFactory()
                 .setFileSystem( fs.get() )
                 .newImpermanentDatabaseBuilder( storeDirectory.graphDbDir() )
-                .setConfig( GraphDatabaseSettings.allow_store_upgrade, "true" )
+                .setConfig( GraphDatabaseSettings.allow_upgrade, "true" )
                 .newGraphDatabase();
         db.shutdown();
     }

diff --git a/...nel/src/test/java/org/neo4j/kernel/impl/transaction/log/LogVersionUpgradeCheckerTest.java b/...nel/src/test/java/org/neo4j/kernel/impl/transaction/log/LogVersionUpgradeCheckerTest.java
@@ -43,7 +43,7 @@ public void noThrowWhenLatestVersionAndUpgradeIsNotAllowed() throws Throwable
     {
         when( tailScanner.getTailInformation() ).thenReturn( new OnlyVersionTailInformation( LogEntryVersion.CURRENT ) );
 
-        LogVersionUpgradeChecker.check( tailScanner, Config.defaults( GraphDatabaseSettings.allow_store_upgrade, "false") );
+        LogVersionUpgradeChecker.check( tailScanner, Config.defaults( GraphDatabaseSettings.allow_upgrade, "false") );
     }
 
     @Test
@@ -53,23 +53,23 @@ public void throwWhenVersionIsOlderAndUpgradeIsNotAllowed() throws Throwable
 
         expect.expect( UpgradeNotAllowedByConfigurationException.class );
 
-        LogVersionUpgradeChecker.check( tailScanner, Config.defaults( GraphDatabaseSettings.allow_store_upgrade, "false") );
+        LogVersionUpgradeChecker.check( tailScanner, Config.defaults( GraphDatabaseSettings.allow_upgrade, "false") );
     }
 
     @Test
     public void stillAcceptLatestVersionWhenUpgradeIsAllowed() throws Throwable
     {
         when( tailScanner.getTailInformation() ).thenReturn( new OnlyVersionTailInformation( LogEntryVersion.CURRENT ) );
 
-        LogVersionUpgradeChecker.check( tailScanner, Config.defaults( GraphDatabaseSettings.allow_store_upgrade, "true") );
+        LogVersionUpgradeChecker.check( tailScanner, Config.defaults( GraphDatabaseSettings.allow_upgrade, "true") );
     }
 
     @Test
     public void acceptOlderLogsWhenUpgradeIsAllowed() throws Throwable
     {
         when( tailScanner.getTailInformation() ).thenReturn( new OnlyVersionTailInformation( LogEntryVersion.V2_3 ) );
 
-        LogVersionUpgradeChecker.check( tailScanner, Config.defaults( GraphDatabaseSettings.allow_store_upgrade, "true") );
+        LogVersionUpgradeChecker.check( tailScanner, Config.defaults( GraphDatabaseSettings.allow_upgrade, "true") );
     }
 
     private static class OnlyVersionTailInformation extends LogTailScanner.LogTailInformation

diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java b/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java
@@ -227,7 +227,7 @@ private void startStopDatabase( File workingDirectory )
     {
         GraphDatabaseService databaseService =
                 new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( workingDirectory )
-                        .setConfig( GraphDatabaseSettings.allow_store_upgrade, "true" ).newGraphDatabase();
+                        .setConfig( GraphDatabaseSettings.allow_upgrade, "true" ).newGraphDatabase();
         databaseService.shutdown();
     }
 }
diff --git a/.../src/test/java/org/neo4j/causalclustering/catchup/tx/TransactionLogCatchUpWriterTest.java b/.../src/test/java/org/neo4j/causalclustering/catchup/tx/TransactionLogCatchUpWriterTest.java
@@ -35,6 +35,7 @@
 import org.neo4j.kernel.impl.transaction.command.Commands;
 import org.neo4j.kernel.impl.transaction.log.LogPosition;
 import org.neo4j.kernel.impl.transaction.log.LogTailScanner;
+import org.neo4j.kernel.impl.transaction.log.LogTailScanner.LogTailInformation;
 import org.neo4j.kernel.impl.transaction.log.LogVersionBridge;
 import org.neo4j.kernel.impl.transaction.log.LogVersionedStoreChannel;
 import org.neo4j.kernel.impl.transaction.log.PhysicalLogFile;
@@ -118,10 +119,9 @@ private void verifyCheckpointInLog() throws IOException
         LogEntryReader<ReadableClosablePositionAwareChannel> logEntryReader = new VersionAwareLogEntryReader<>(
                 new RecordStorageCommandReaderFactory(), InvalidLogEntryHandler.STRICT );
         PhysicalLogFiles logFiles = new PhysicalLogFiles( storeDir, fs );
-        final LogTailScanner logTailScanner =
+        final LogTailScanner logTailScanner = new LogTailScanner( logFiles, fs, logEntryReader );
-                new LogTailScanner( logFiles, fs, logEntryReader );
 
-        LogTailScanner.LogTailInformation tailInformation = logTailScanner.getTailInformation();
+        LogTailInformation tailInformation = logTailScanner.getTailInformation();
         assertNotNull( tailInformation.lastCheckPoint );
         assertTrue( tailInformation.commitsAfterLastCheckPoint );
     }