Remove the PagedFile.force method because it already has a flushAndFo…

…rce method
neo4j · Jun 23, 2015 · a53edb7 · a53edb7
1 parent 32e3ad9
commit a53edb7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/PagedFile.java b/community/io/src/main/java/org/neo4j/io/pagecache/PagedFile.java
@@ -146,11 +146,6 @@ public interface PagedFile extends AutoCloseable
      */
     void flushAndForce() throws IOException;
 
-    /**
-     * Force all changes to this file handle down to disk. Does not flush dirty pages.
-     */
-    void force() throws IOException;
-
     /**
      * Get the file-page-id of the last page in the file.
      *

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPagedFile.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPagedFile.java
@@ -197,20 +197,15 @@ void flushAndForceInternal( FlushEventOpportunity flushOpportunity ) throws IOEx
                     }
                 }
             }
-            force();
+
+            swapper.force();
         }
         finally
         {
             pageCache.unpauseBackgroundFlushTask();
         }
     }
 
-    @Override
-    public void force() throws IOException
-    {
-        swapper.force();
-    }
-
     @Override
     public long getLastPageId()
     {

diff --git a/...unity/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingPageCache.java b/...unity/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingPageCache.java
@@ -279,11 +279,6 @@ public void flushAndForce() throws IOException
             cursors[PF_EXCLUSIVE_LOCK].flush();
         }
 
-        @Override
-        public void force() throws IOException
-        {   // no-op
-        }
-
         @Override
         public long getLastPageId() throws IOException
         {

diff --git a/community/kernel/src/test/java/org/neo4j/test/PageCacheRule.java b/community/kernel/src/test/java/org/neo4j/test/PageCacheRule.java
@@ -233,12 +233,6 @@ public void flushAndForce() throws IOException
             pagedFile.flushAndForce();
         }
 
-        @Override
-        public void force() throws IOException
-        {
-            pagedFile.force();
-        }
-
         @Override
         public long getLastPageId() throws IOException
         {