diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveAction.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveAction.java index ebff12bc2ef40..27cdefa8d8b49 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveAction.java +++ b/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveAction.java @@ -38,7 +38,7 @@ public interface FileMoveAction File file(); - static FileMoveAction moveViaPageCache( File file, PageCache pageCache ) + static FileMoveAction copyViaPageCache( File file, PageCache pageCache ) { return new FileMoveAction() { @@ -61,7 +61,7 @@ public File file() }; } - static FileMoveAction moveViaFileSystem( File file, File basePath ) + static FileMoveAction copyViaFileSystem( File file, File basePath ) { Path base = basePath.toPath(); return new FileMoveAction() diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveProvider.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveProvider.java index 8ba1169b4e439..62e04a8d93af1 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveProvider.java +++ b/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveProvider.java @@ -175,8 +175,8 @@ private FileMoveAction moveFileCorrectly( File fileToMove, File basePath ) { if ( fileMoveActionInformer.shouldBeManagedByPageCache( fileToMove.getName() ) ) { - return FileMoveAction.moveViaPageCache( fileToMove, pageCache ); + return FileMoveAction.copyViaPageCache( fileToMove, pageCache ); } - return FileMoveAction.moveViaFileSystem( fileToMove, basePath ); + return FileMoveAction.copyViaFileSystem( fileToMove, basePath ); } } diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/ToFileStoreWriter.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/ToFileStoreWriter.java index 19083fb5c123f..f3f52c1567030 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/storecopy/ToFileStoreWriter.java +++ b/enterprise/com/src/main/java/org/neo4j/com/storecopy/ToFileStoreWriter.java @@ -103,7 +103,7 @@ public long write( String path, ReadableByteChannel data, ByteBuffer temporaryBu // the page cache later on when we want to move the files written through the page cache. private void addPageCacheMoveAction( File file ) { - fileMoveActions.add( FileMoveAction.moveViaPageCache( file, pageCache ) ); + fileMoveActions.add( FileMoveAction.copyViaPageCache( file, pageCache ) ); } private int filePageSize( int alignment ) diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/FileMoveActionTest.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/FileMoveActionTest.java index d661a81568dfe..08ba010f9fe93 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/FileMoveActionTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/FileMoveActionTest.java @@ -59,7 +59,7 @@ public void pageCacheFilesMovedDoNotLeaveOriginal() throws IOException // when File targetRename = new File( "target" ); - FileMoveAction.moveViaPageCache( pageCacheFile, pageCache ).move( targetRename ); + FileMoveAction.copyViaPageCache( pageCacheFile, pageCache ).move( targetRename ); // then assertFalse( pageCacheFile.exists() ); @@ -84,7 +84,7 @@ public void nonPageCacheFilesMovedDoNotLeaveOriginal() throws IOException assertFalse( targetFile.exists() ); // when - FileMoveAction.moveViaFileSystem( sourceFile, sourceDirectory ).move( targetDirectory ); + FileMoveAction.copyViaFileSystem( sourceFile, sourceDirectory ).move( targetDirectory ); // then assertTrue( targetFile.exists() );