accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [44/50] [abbrv] git commit: ACCUMULO-324 Don't inherit iters/constraints in system namespace
Date Wed, 04 Dec 2013 23:58:36 GMT
ACCUMULO-324 Don't inherit iters/constraints in system namespace


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a7c614e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a7c614e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a7c614e

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4a7c614ef8cd58aea02d55f0fd60b8654c388c2a
Parents: 5b791b1
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Nov 14 15:05:18 2013 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Dec 4 18:46:11 2013 -0500

----------------------------------------------------------------------
 .../accumulo/server/conf/TableNamespaceConfiguration.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a7c614e/server/base/src/main/java/org/apache/accumulo/server/conf/TableNamespaceConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableNamespaceConfiguration.java
b/server/base/src/main/java/org/apache/accumulo/server/conf/TableNamespaceConfiguration.java
index 74621a3..888c5ed 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableNamespaceConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableNamespaceConfiguration.java
@@ -57,8 +57,10 @@ public class TableNamespaceConfiguration extends AccumuloConfiguration
{
     if (value == null || !property.getType().isValidFormat(value)) {
       if (value != null)
         log.error("Using default value for " + key + " due to improperly formatted " + property.getType()
+ ": " + value);
-      if (!isIterConst(property.getKey()))
+      if (!(namespaceId.equals(Constants.SYSTEM_TABLE_NAMESPACE_ID) && isIteratorOrConstraint(property.getKey())))
{
+        // ignore iterators from parent if system namespace
         value = parent.get(property);
+      }
     }
     return value;
   }
@@ -92,7 +94,7 @@ public class TableNamespaceConfiguration extends AccumuloConfiguration {
 
     @Override
     public boolean accept(String key) {
-      if (isIterConst(key))
+      if (isIteratorOrConstraint(key))
         return false;
       return userFilter.accept(key);
     }
@@ -166,7 +168,7 @@ public class TableNamespaceConfiguration extends AccumuloConfiguration
{
       co.propertiesChanged();
   }
 
-  protected boolean isIterConst(String key) {
+  protected boolean isIteratorOrConstraint(String key) {
     return key.startsWith(Property.TABLE_ITERATOR_PREFIX.getKey()) || key.startsWith(Property.TABLE_CONSTRAINT_PREFIX.getKey());
   }
 }


Mime
View raw message