Updated Branches: refs/heads/1.6.0-SNAPSHOT 379881e69 -> 16ccbf5e1
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/16ccbf5e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/16ccbf5e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/16ccbf5e Branch: refs/heads/1.6.0-SNAPSHOT Commit: 16ccbf5e16467729b558cf08a379770cba10f5ab Parents: 379881e Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Dec 31 14:26:29 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Dec 31 15:22:11 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/16ccbf5e/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);
