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 B82201016B for ; Tue, 29 Oct 2013 03:10:33 +0000 (UTC) Received: (qmail 25700 invoked by uid 500); 29 Oct 2013 03:10:33 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 25676 invoked by uid 500); 29 Oct 2013 03:10:32 -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 25669 invoked by uid 99); 29 Oct 2013 03:10:31 -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, 29 Oct 2013 03:10:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E29F988A49F; Tue, 29 Oct 2013 03:10:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Message-Id: <4828e63e6c25413689ed14c2f30dedd1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-1481 ACCUMULO-1823 fixed bug w/ major compaction Date: Tue, 29 Oct 2013 03:10:30 +0000 (UTC) Updated Branches: refs/heads/master 9a2041d56 -> 7200e43a6 ACCUMULO-1481 ACCUMULO-1823 fixed bug w/ major compaction Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7200e43a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7200e43a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7200e43a Branch: refs/heads/master Commit: 7200e43a610694d2a9652d3d603bafc86e4395da Parents: 9a2041d Author: Keith Turner Authored: Mon Oct 28 23:10:17 2013 -0400 Committer: Keith Turner Committed: Mon Oct 28 23:10:17 2013 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/tabletserver/Tablet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7200e43a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java index 72c78c3..ca0df8d 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java @@ -3179,7 +3179,7 @@ public class Tablet { droppedFiles.addAll(inputFiles); if (plan != null) droppedFiles.addAll(plan.deleteFiles); - propogateDeletes = droppedFiles.equals(allFiles.keySet()); + propogateDeletes = !(droppedFiles.equals(allFiles.keySet())); log.debug("Major compaction plan: " + plan + " propogate deletes : " + propogateDeletes); filesToCompact = new HashMap(allFiles); filesToCompact.keySet().retainAll(inputFiles);