From a787b0253c4b4301367fd4e424381898f5246edb Mon Sep 17 00:00:00 2001
From: Chris Vest <mr.chrisvest@gmail.com>
Date: Mon, 19 Mar 2018 16:02:07 +0100
Subject: [PATCH] Tighten up some names in the page cache warmer.

---
 .../kernel/impl/pagecache/PageCacheWarmer.java | 18 +++++++++---------
 .../impl/pagecache/ProfileRefCounts.java       | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmer.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmer.java
index d859a7b356a39..a40d754f3123e 100644
--- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmer.java
+++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmer.java
@@ -164,12 +164,12 @@ private long reheat( PagedFile file, Profile[] existingProfiles ) throws IOExcep
 
         // The file contents checks out. Let's load it in.
         long pagesLoaded = 0;
-        try ( InputStream inputStream = savedProfile.get().read( fs );
+        try ( InputStream input = savedProfile.get().read( fs );
               PageLoader loader = pageLoaderFactory.getLoader( file ) )
         {
             long pageId = 0;
             int b;
-            while ( (b = inputStream.read()) != -1 )
+            while ( (b = input.read()) != -1 )
             {
                 for ( int i = 0; i < 8; i++ )
                 {
@@ -195,12 +195,12 @@ private long reheat( PagedFile file, Profile[] existingProfiles ) throws IOExcep
     private boolean verifyChecksum( Profile profile )
     {
         // Successfully reading through and closing the compressed file implies verifying the gzip checksum.
-        try ( InputStream inputStream = profile.read( fs ) )
+        try ( InputStream input = profile.read( fs ) )
         {
             int b;
             do
             {
-                b = inputStream.read();
+                b = input.read();
             }
             while ( b != -1 );
         }
@@ -254,7 +254,7 @@ private long profile( PagedFile file, Profile[] existingProfiles ) throws IOExce
                 .map( Profile::next )
                 .orElse( Profile.first( file.file() ) );
 
-        try ( OutputStream outputStream = nextProfile.write( fs );
+        try ( OutputStream output = nextProfile.write( fs );
               PageCursor cursor = file.io( 0, PF_SHARED_READ_LOCK | PF_NO_FAULT ) )
         {
             int stepper = 0;
@@ -273,19 +273,19 @@ private long profile( PagedFile file, Profile[] existingProfiles ) throws IOExce
                 stepper++;
                 if ( stepper == 8 )
                 {
-                    outputStream.write( b );
+                    output.write( b );
                     b = 0;
                     stepper = 0;
                 }
             }
-            outputStream.write( b );
-            outputStream.flush();
+            output.write( b );
+            output.flush();
         }
 
         // Delete previous profile files.
         filterRelevant( existingProfiles, file )
                 .filter( profile -> !refCounts.contains( profile ) )
-                .forEach( p -> p.delete( fs ) );
+                .forEach( profile -> profile.delete( fs ) );
 
         return pagesInMemory;
     }
diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ProfileRefCounts.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ProfileRefCounts.java
index c869aa386ef1b..279f12d310521 100644
--- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ProfileRefCounts.java
+++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ProfileRefCounts.java
@@ -26,18 +26,18 @@
 
 class ProfileRefCounts
 {
-    private final Map<Profile,MutableInt> fileBag;
+    private final Map<Profile,MutableInt> bag;
 
     public ProfileRefCounts()
     {
-        fileBag = new HashMap<>();
+        bag = new HashMap<>();
     }
 
     synchronized void incrementRefCounts( Profile[] profiles )
     {
         for ( Profile profile : profiles )
         {
-            fileBag.computeIfAbsent( profile, p -> new MutableInt() ).increment();
+            bag.computeIfAbsent( profile, p -> new MutableInt() ).increment();
         }
     }
 
@@ -45,12 +45,12 @@ synchronized void decrementRefCounts( Profile[] profiles )
     {
         for ( Profile profile : profiles )
         {
-            fileBag.computeIfPresent( profile, (p,i) -> i.decrementAndGet() == 0 ? null : i );
+            bag.computeIfPresent( profile, ( p, i) -> i.decrementAndGet() == 0 ? null : i );
         }
     }
 
     synchronized boolean contains( Profile profile )
     {
-        return fileBag.containsKey( profile );
+        return bag.containsKey( profile );
     }
 }