accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/7] git commit: ACCUMULO-2110 cannot remove a FileRef with a Path
Date Tue, 31 Dec 2013 20:24:08 GMT
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 16ccbf5e1 -> 072d54e1f
  refs/heads/master bdc6c041a -> cc4e8e7b5


ACCUMULO-2110 cannot remove a FileRef with a Path


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec772482
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec772482
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec772482

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ec7724823628c240f6f31a3fbd5b4b59bb03053e
Parents: 379881e
Author: Eric Newton <eric.newton@gmail.com>
Authored: Tue Dec 31 14:26:29 2013 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Tue Dec 31 14:26:29 2013 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/tserver/Tablet.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec772482/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 3c62a86..c4a2770 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -704,7 +704,7 @@ public class Tablet {
         List<FileRef> files = MetadataTableUtil.getBulkFilesLoaded(conn, extent, tid);
 
         for (FileRef file : files)
-          if (paths.keySet().remove(file.path()))
+          if (paths.keySet().remove(file))
             log.debug("Ignoring request to re-import a file already imported: " + extent
+ ": " + file);
 
         if (paths.size() > 0) {
@@ -3565,7 +3565,7 @@ public class Tablet {
       String time = tabletTime.getMetadataValue();
 
       // it is possible that some of the bulk loading flags will be deleted after being read
below because the bulk load
-      // finishes.... therefore split could propogate load flags for a finished bulk load...
there is a special iterator
+      // finishes.... therefore split could propagate load flags for a finished bulk load...
there is a special iterator
       // on the metadata table to clean up this type of garbage
       Map<FileRef,Long> bulkLoadedFiles = MetadataTableUtil.getBulkFilesLoaded(SystemCredentials.get(),
extent);
 


Mime
View raw message