Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 07F05101C5 for ; Tue, 31 Dec 2013 20:23:02 +0000 (UTC) Received: (qmail 49765 invoked by uid 500); 31 Dec 2013 20:23:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 49711 invoked by uid 500); 31 Dec 2013 20:23:01 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 49704 invoked by uid 99); 31 Dec 2013 20:23:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Dec 2013 20:23:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 02ECD90CCA3; Tue, 31 Dec 2013 20:23:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-2110 cannot remove a FileRef with a Path Date: Tue, 31 Dec 2013 20:23:00 +0000 (UTC) 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 Authored: Tue Dec 31 14:26:29 2013 -0500 Committer: Christopher Tubbs 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 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 bulkLoadedFiles = MetadataTableUtil.getBulkFilesLoaded(SystemCredentials.get(), extent);