You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/04/10 00:28:43 UTC
svn commit: r1466269 -
/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
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;