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 6CACC10ECE for ; Tue, 9 Apr 2013 22:29:06 +0000 (UTC) Received: (qmail 36673 invoked by uid 500); 9 Apr 2013 22:29:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 36651 invoked by uid 500); 9 Apr 2013 22:29:06 -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 36641 invoked by uid 99); 9 Apr 2013 22:29:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Apr 2013 22:29:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Apr 2013 22:29:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 282612388900; Tue, 9 Apr 2013 22:28:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1466269 - /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java Date: Tue, 09 Apr 2013 22:28:43 -0000 To: commits@accumulo.apache.org From: kturner@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130409222843.282612388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kturner Date: Tue Apr 9 22:28:42 2013 New Revision: 1466269 URL: http://svn.apache.org/r1466269 Log: ACCUMULO-1044 make metadata constraint bulk flag check for column set when new split tablet is added Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java?rev=1466269&r1=1466268&r2=1466269&view=diff ============================================================================== --- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java (original) +++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java Tue Apr 9 22:28:42 2013 @@ -32,9 +32,9 @@ import org.apache.accumulo.core.util.Col import org.apache.accumulo.core.util.MetadataTable.DataFileValue; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.server.client.HdfsZooInstance; +import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator; import org.apache.accumulo.server.zookeeper.ZooCache; import org.apache.accumulo.server.zookeeper.ZooLock; -import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; @@ -178,8 +178,8 @@ public class MetadataConstraints impleme // See ACCUMULO-1230. boolean isLocationMutation = false; for (ColumnUpdate update : mutation.getUpdates()) { - if (new ColumnFQ(update).equals(Constants.METADATA_SPLIT_RATIO_COLUMN)) { - isSplitMutation = update.isDeleted(); + if (new ColumnFQ(update).equals(Constants.METADATA_DIRECTORY_COLUMN)) { + isSplitMutation = true; } if (update.getColumnFamily().equals(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY)) { isLocationMutation = true;