Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9902: StandardDirectoryFactory should use Files API for it's move implementation.

This commit is contained in:
markrmiller 2016-12-29 05:29:51 -05:00
parent 662be93ed1
commit 2781145eb3
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/CHANGES.txt
View File

@ -222,6 +222,7 @@ Optimizations
resulting in less produced garbage and 5-7% better performance.
(yonik)
* SOLR-9902: StandardDirectoryFactory should use Files API for it's move implementation. (Mark Miller)
Bug Fixes
----------------------

20
solr/core/src/java/org/apache/solr/core/StandardDirectoryFactory.java
View File

@ -129,13 +129,14 @@ public class StandardDirectoryFactory extends CachingDirectoryFactory {
Directory baseToDir = getBaseDir(toDir);
if (baseFromDir instanceof FSDirectory && baseToDir instanceof FSDirectory) {
File dir1 = ((FSDirectory) baseFromDir).getDirectory().toFile();
File dir2 = ((FSDirectory) baseToDir).getDirectory().toFile();
File indexFileInTmpDir = new File(dir1, fileName);
File indexFileInIndex = new File(dir2, fileName);
boolean success = indexFileInTmpDir.renameTo(indexFileInIndex);
if (success) {
return;
Path path1 = ((FSDirectory) baseFromDir).getDirectory().toAbsolutePath();
Path path2 = ((FSDirectory) baseFromDir).getDirectory().toAbsolutePath();
try {
Files.move(path1.resolve(fileName), path2.resolve(fileName), StandardCopyOption.ATOMIC_MOVE);
} catch (AtomicMoveNotSupportedException e) {
Files.move(path1.resolve(fileName), path2.resolve(fileName));
}
}
@ -148,8 +149,9 @@ public class StandardDirectoryFactory extends CachingDirectoryFactory {
if (baseDir instanceof FSDirectory) {
Path path = ((FSDirectory) baseDir).getDirectory().toAbsolutePath();
try {
Files.move(FileSystems.getDefault().getPath(path.toString(), fileName),
FileSystems.getDefault().getPath(path.toString(), toName), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
Files.move(path.resolve(fileName),
path.resolve(toName), StandardCopyOption.ATOMIC_MOVE,
StandardCopyOption.REPLACE_EXISTING);
} catch (AtomicMoveNotSupportedException e) {
Files.move(FileSystems.getDefault().getPath(path.toString(), fileName),
FileSystems.getDefault().getPath(path.toString(), toName), StandardCopyOption.REPLACE_EXISTING);