You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/07/22 22:06:14 UTC
git commit: ACCUMULO-3011 correct for full filename references
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 8bcf34698 -> e8916f13c
ACCUMULO-3011 correct for full filename references
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e8916f13
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e8916f13
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e8916f13
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: e8916f13c301b58c70130ae3649dad7133732b48
Parents: 8bcf346
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Jul 22 16:05:13 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Jul 22 16:05:13 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/master/tableOps/BulkImport.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e8916f13/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index e42fee6..1226806 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -65,6 +65,7 @@ import org.apache.accumulo.master.Master;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.conf.ServerConfiguration;
+import org.apache.accumulo.server.fs.FileRef;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection;
import org.apache.accumulo.server.master.state.TServerInstance;
@@ -387,8 +388,8 @@ class CopyFailed extends MasterRepo {
if (!fs.exists(new Path(error, BulkImport.FAILURES_TXT)))
return new CleanUpBulkImport(tableId, source, bulk, error);
- HashMap<String,String> failures = new HashMap<String,String>();
- HashMap<String,String> loadedFailures = new HashMap<String,String>();
+ HashMap<FileRef,String> failures = new HashMap<FileRef,String>();
+ HashMap<FileRef,String> loadedFailures = new HashMap<FileRef,String>();
FSDataInputStream failFile = fs.open(new Path(error, BulkImport.FAILURES_TXT));
BufferedReader in = new BufferedReader(new InputStreamReader(failFile, Constants.UTF8));
@@ -397,7 +398,7 @@ class CopyFailed extends MasterRepo {
while ((line = in.readLine()) != null) {
Path path = new Path(line);
if (!fs.exists(new Path(error, path.getName())))
- failures.put("/" + path.getParent().getName() + "/" + path.getName(), line);
+ failures.put(new FileRef(line, path), line);
}
} finally {
failFile.close();
@@ -416,7 +417,7 @@ class CopyFailed extends MasterRepo {
for (Entry<Key,Value> entry : mscanner) {
if (Long.parseLong(entry.getValue().toString()) == tid) {
- String loadedFile = entry.getKey().getColumnQualifier().toString();
+ FileRef loadedFile = new FileRef(fs, entry.getKey());
String absPath = failures.remove(loadedFile);
if (absPath != null) {
loadedFailures.put(loadedFile, absPath);