Change method name tryMappedPagedFile to getExistingMapping

neo4j · Aug 19, 2016 · b6d1cc2 · b6d1cc2
1 parent a58e93a
commit b6d1cc2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/PageCache.java b/community/io/src/main/java/org/neo4j/io/pagecache/PageCache.java
@@ -54,8 +54,7 @@ public interface PageCache extends AutoCloseable
      * All other options are either silently ignored, or will cause an exception to be thrown.
      * @throws java.nio.file.NoSuchFileException if the given file does not exist, and the
      * {@link StandardOpenOption#CREATE} option was not specified.
-     * @throws IOException if the file could otherwise not be mapped. Causes include the file being locked, or exclusive
+     * @throws IOException if the file could otherwise not be mapped. Causes include the file being locked.
-     * mapping conflicts.
      */
     PagedFile map( File file, int pageSize, OpenOption... openOptions ) throws IOException;
 
@@ -75,7 +74,7 @@ public interface PageCache extends AutoCloseable
      * empty {@link Optional} if no mapping exist.
      * @throws IOException if page cache has been closed or page eviction problems occur.
      */
-    Optional<PagedFile> tryMappedPagedFile( File file ) throws IOException;
+    Optional<PagedFile> getExistingMapping( File file ) throws IOException;
 
     /** Flush all dirty pages */
     void flushAndForce() throws IOException;

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCache.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCache.java
@@ -364,7 +364,7 @@ else if ( !ignoredOpenOptions.contains( option ) )
     }
 
     @Override
-    public synchronized Optional<PagedFile> tryMappedPagedFile( File file ) throws IOException
+    public synchronized Optional<PagedFile> getExistingMapping( File file ) throws IOException
     {
         assertHealthy();
         ensureThreadsInitialised();

diff --git a/community/io/src/test/java/org/neo4j/adversaries/pagecache/AdversarialPageCache.java b/community/io/src/test/java/org/neo4j/adversaries/pagecache/AdversarialPageCache.java
@@ -69,10 +69,10 @@ public PagedFile map( File file, int pageSize, OpenOption... openOptions ) throw
     }
 
     @Override
-    public Optional<PagedFile> tryMappedPagedFile( File file ) throws IOException
+    public Optional<PagedFile> getExistingMapping( File file ) throws IOException
     {
         adversary.injectFailure( IOException.class, SecurityException.class );
-        final Optional<PagedFile> optional = delegate.tryMappedPagedFile( file );
+        final Optional<PagedFile> optional = delegate.getExistingMapping( file );
         if ( optional.isPresent() )
         {
             return Optional.of( new AdversarialPagedFile( optional.get(), adversary ) );

diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/DelegatingPageCache.java b/community/io/src/test/java/org/neo4j/io/pagecache/DelegatingPageCache.java
@@ -39,9 +39,9 @@ public PagedFile map( File file, int pageSize, OpenOption... openOptions ) throw
     }
 
     @Override
-    public Optional<PagedFile> tryMappedPagedFile( File file ) throws IOException
+    public Optional<PagedFile> getExistingMapping( File file ) throws IOException
     {
-        return delegate.tryMappedPagedFile( file );
+        return delegate.getExistingMapping( file );
     }
 
     public int pageSize()

diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java
@@ -1044,7 +1044,7 @@ public void tryMappedPagedFileShouldReportMappedFilePresent() throws Exception
         final File file = file( "a" );
         try ( PagedFile pf = cache.map( file, filePageSize ) )
         {
-            final Optional<PagedFile> optional = cache.tryMappedPagedFile( file );
+            final Optional<PagedFile> optional = cache.getExistingMapping( file );
             assertTrue( optional.isPresent() );
             final PagedFile actual = optional.get();
             assertThat( actual, sameInstance( pf ) );
@@ -1056,7 +1056,7 @@ public void tryMappedPagedFileShouldReportMappedFilePresent() throws Exception
     public void tryMappedPagedFileShouldReportNonMappedFileNotPresent() throws Exception
     {
         PageCache cache = getPageCache( fs, maxPages, pageCachePageSize, PageCacheTracer.NULL );
-        final Optional<PagedFile> dont_exist = cache.tryMappedPagedFile( new File( "dont_exist" ) );
+        final Optional<PagedFile> dont_exist = cache.getExistingMapping( new File( "dont_exist" ) );
         assertFalse( dont_exist.isPresent() );
     }
 

diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/ExternallyManagedPageCache.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/ExternallyManagedPageCache.java
@@ -69,9 +69,9 @@ public PagedFile map( File file, int pageSize, OpenOption... openOptions ) throw
     }
 
     @Override
-    public Optional<PagedFile> tryMappedPagedFile( File file ) throws IOException
+    public Optional<PagedFile> getExistingMapping( File file ) throws IOException
     {
-        return delegate.tryMappedPagedFile( file );
+        return delegate.getExistingMapping( file );
     }
 
     @Override