You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/03/11 19:25:12 UTC
[03/23] git commit: ACCUMULO-2061 Fix FileUtil
ACCUMULO-2061 Fix FileUtil
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3b3ccbb0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3b3ccbb0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3b3ccbb0
Branch: refs/heads/ACCUMULO-2061
Commit: 3b3ccbb02e3d0e2cb5f46d506ab1080d6f95d2d6
Parents: 0c84156
Author: Josh Elser <el...@apache.org>
Authored: Fri Mar 7 16:46:47 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Mar 7 16:46:47 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/FileUtil.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3b3ccbb0/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
index 8e38cbd..277a0c2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
@@ -125,7 +125,7 @@ public class FileUtil {
String newMapFile = String.format("%s/%04d.%s", newDir, count++, RFile.EXTENSION);
outFiles.add(newMapFile);
- FileSystem ns = fs.getFileSystemByPath(new Path(newMapFile));
+ FileSystem ns = fs.getVolumeByPath(new Path(newMapFile)).getFileSystem();
FileSKVWriter writer = new RFileOperations().openWriter(newMapFile.toString(), ns, ns.getConf(), acuConf);
writer.startDefaultLocalityGroup();
List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(inFiles.size());
@@ -133,7 +133,7 @@ public class FileUtil {
FileSKVIterator reader = null;
try {
for (String s : inFiles) {
- ns = fs.getFileSystemByPath(new Path(s));
+ ns = fs.getVolumeByPath(new Path(s)).getFileSystem();
reader = FileOperations.getInstance().openIndex(s, ns, ns.getConf(), acuConf);
iters.add(reader);
}
@@ -390,7 +390,7 @@ public class FileUtil {
for (String ref : mapFiles) {
FileSKVIterator reader = null;
Path path = new Path(ref);
- FileSystem ns = fs.getFileSystemByPath(path);
+ FileSystem ns = fs.getVolumeByPath(path).getFileSystem();
try {
if (useIndex)
reader = FileOperations.getInstance().openIndex(path.toString(), ns, ns.getConf(), acuConf);
@@ -435,7 +435,7 @@ public class FileUtil {
for (FileRef mapfile : mapfiles) {
FileSKVIterator reader = null;
- FileSystem ns = fs.getFileSystemByPath(mapfile.path());
+ FileSystem ns = fs.getVolumeByPath(mapfile.path()).getFileSystem();
try {
reader = FileOperations.getInstance().openReader(mapfile.toString(), false, ns, ns.getConf(), acuConf);
@@ -470,7 +470,7 @@ public class FileUtil {
for (FileRef ref : mapFiles) {
Path path = ref.path();
- FileSystem ns = fs.getFileSystemByPath(path);
+ FileSystem ns = fs.getVolumeByPath(path).getFileSystem();
FileSKVIterator reader = FileOperations.getInstance().openReader(path.toString(), true, ns, ns.getConf(), acuConf);
try {
@@ -513,7 +513,7 @@ public class FileUtil {
counts.put(keyExtent, new MLong(0));
Text row = new Text();
- FileSystem ns = fs.getFileSystemByPath(mapFile);
+ FileSystem ns = fs.getVolumeByPath(mapFile).getFileSystem();
FileSKVIterator index = FileOperations.getInstance().openIndex(mapFile.toString(), ns, ns.getConf(), acuConf);
try {