honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix listAll when using switch dir to return unique list of files

This commit is contained in:
kimchy 2010-10-30 01:26:00 +02:00
parent b315c5f848
commit db24148413
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/store/SwitchDirectory.java
View File

@ -26,6 +26,7 @@ import org.elasticsearch.common.collect.ImmutableSet;
import org.elasticsearch.index.store.support.ForceSyncDirectory;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
/**
@ -86,12 +87,14 @@ public class SwitchDirectory extends Directory implements ForceSyncDirectory {
}
@Override public String[] listAll() throws IOException {
String[] primaryFiles = primaryDir.listAll();
String[] secondaryFiles = secondaryDir.listAll();
String[] files = new String[primaryFiles.length + secondaryFiles.length];
System.arraycopy(primaryFiles, 0, files, 0, primaryFiles.length);
System.arraycopy(secondaryFiles, 0, files, primaryFiles.length, secondaryFiles.length);
return files;
Set<String> files = new HashSet<String>();
for (String f : primaryDir.listAll()) {
files.add(f);
}
for (String f : secondaryDir.listAll()) {
files.add(f);
}
return files.toArray(new String[files.size()]);
}
/**