This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch 1.7 in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 0b446a31cb7425f153bd7278e739c216cf26e8a4 Author: Keith Turner <ktur...@apache.org> AuthorDate: Fri Feb 2 12:13:44 2018 -0500 Revert "ACCUMULO-4779 made getting vfs config more efficient" This reverts commit 7bc630cdce4a0aa02be4873e2873ff1036a94e14. --- .../accumulo/core/client/impl/ClientContext.java | 6 ----- .../core/client/mock/MockConfiguration.java | 5 ---- .../accumulo/core/conf/AccumuloConfiguration.java | 27 ---------------------- .../accumulo/core/conf/ConfigurationCopy.java | 5 ---- .../accumulo/core/conf/DefaultConfiguration.java | 5 ---- .../accumulo/core/conf/SiteConfiguration.java | 9 -------- .../accumulo/server/conf/ZooConfiguration.java | 15 ++---------- .../java/org/apache/accumulo/master/Master.java | 4 ++-- .../org/apache/accumulo/tserver/TabletServer.java | 4 ++-- .../main/java/org/apache/accumulo/shell/Shell.java | 4 ++-- .../start/classloader/vfs/ContextManager.java | 11 ++++----- 11 files changed, 13 insertions(+), 82 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java index cb1ccb9..6828174 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java @@ -176,12 +176,6 @@ public class ClientContext { final AccumuloConfiguration defaults = DefaultConfiguration.getInstance(); return new AccumuloConfiguration() { - - @Override - protected String getArbitrarySystemPropertyImpl(String property) { - return config.getString(property, null); - } - @Override public String get(Property property) { final String key = property.getKey(); diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockConfiguration.java index f642770..410105b 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockConfiguration.java @@ -36,11 +36,6 @@ class MockConfiguration extends AccumuloConfiguration { } @Override - protected String getArbitrarySystemPropertyImpl(String property) { - return map.get(property); - } - - @Override public String get(Property property) { return map.get(property.getKey()); } diff --git a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java index 008418e..25d4c60 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java @@ -33,7 +33,6 @@ import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -107,32 +106,6 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str private static final Logger log = LoggerFactory.getLogger(AccumuloConfiguration.class); - protected String getArbitrarySystemPropertyImpl(AccumuloConfiguration parent, String property) { - return parent.getArbitrarySystemPropertyImpl(property); - } - - /** - * This method is not called with sensitive or per table properties. - */ - protected String getArbitrarySystemPropertyImpl(String property) { - throw new UnsupportedOperationException(); - } - - /** - * This method was created because {@link #get(String)} is very slow. However this method does not properly handle everything that {@link #get(String)} does. - * For example it does not properly handle table or sensitive properties. - * - * <p> - * This method has a whitelist of prefixes it handles. To see the whitelist, check the implementation. When adding to the whitelist, ensure that all - * configurations can properly handle. - */ - public String getArbitrarySystemProperty(Property prefix, String property) { - Preconditions.checkArgument(prefix == Property.VFS_CONTEXT_CLASSPATH_PROPERTY); - - String key = prefix.getKey() + property; - return getArbitrarySystemPropertyImpl(key); - } - /** * Gets a property value from this configuration. * diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationCopy.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationCopy.java index df43557..28b188f 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationCopy.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationCopy.java @@ -64,11 +64,6 @@ public class ConfigurationCopy extends AccumuloConfiguration { } @Override - protected String getArbitrarySystemPropertyImpl(String property) { - return copy.get(property); - } - - @Override public void getProperties(Map<String,String> props, Predicate<String> filter) { for (Entry<String,String> entry : copy.entrySet()) { if (filter.apply(entry.getKey())) { diff --git a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java index 994d960..e1ff7e1 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java @@ -58,9 +58,4 @@ public class DefaultConfiguration extends AccumuloConfiguration { if (filter.apply(entry.getKey())) props.put(entry.getKey(), entry.getValue()); } - - @Override - protected String getArbitrarySystemPropertyImpl(String property) { - return null; - } } diff --git a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java index 32b2564..9f047e2 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java @@ -129,15 +129,6 @@ public class SiteConfiguration extends AccumuloConfiguration { } @Override - protected String getArbitrarySystemPropertyImpl(String property) { - String val = staticConfigs.get(property); - if (val == null) { - val = parent.getArbitrarySystemPropertyImpl(property); - } - return val; - } - - @Override public void getProperties(Map<String,String> props, Predicate<String> filter) { parent.getProperties(props, filter); diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java index 2817ba0..f178ff1 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java +++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java @@ -40,13 +40,11 @@ public class ZooConfiguration extends AccumuloConfiguration { private final ZooCache propCache; private final AccumuloConfiguration parent; private final Map<String,String> fixedProps = Collections.synchronizedMap(new HashMap<String,String>()); - private final String propPathPrefix; protected ZooConfiguration(String instanceId, ZooCache propCache, AccumuloConfiguration parent) { this.instanceId = instanceId; this.propCache = propCache; this.parent = parent; - this.propPathPrefix = ZooUtil.getRoot(instanceId) + Constants.ZCONFIG; } @Override @@ -81,15 +79,6 @@ public class ZooConfiguration extends AccumuloConfiguration { } @Override - protected String getArbitrarySystemPropertyImpl(String property) { - String val = getRaw(property); - if (val == null) { - val = getArbitrarySystemPropertyImpl(parent, property); - } - return val; - } - - @Override public String get(Property property) { if (Property.isFixedZooPropertyKey(property)) { if (fixedProps.containsKey(property.getKey())) { @@ -108,7 +97,7 @@ public class ZooConfiguration extends AccumuloConfiguration { } private String getRaw(String key) { - String zPath = propPathPrefix + "/" + key; + String zPath = ZooUtil.getRoot(instanceId) + Constants.ZCONFIG + "/" + key; byte[] v = propCache.get(zPath); String value = null; if (v != null) @@ -120,7 +109,7 @@ public class ZooConfiguration extends AccumuloConfiguration { public void getProperties(Map<String,String> props, Predicate<String> filter) { parent.getProperties(props, filter); - List<String> children = propCache.getChildren(propPathPrefix); + List<String> children = propCache.getChildren(ZooUtil.getRoot(instanceId) + Constants.ZCONFIG); if (children != null) { for (String child : children) { if (child != null && filter.apply(child)) { diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 740e05f..984fb60 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -591,8 +591,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List try { AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig() { @Override - public String getVfsContextClasspathProperty(String key) { - return getConfiguration().getArbitrarySystemProperty(Property.VFS_CONTEXT_CLASSPATH_PROPERTY, key); + public String getProperty(String key) { + return getConfiguration().get(key); } }); } catch (IOException e) { diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 7809e2e..5240db6 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -2816,8 +2816,8 @@ public class TabletServer extends AccumuloServerContext implements Runnable { try { AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig() { @Override - public String getVfsContextClasspathProperty(String key) { - return getConfiguration().getArbitrarySystemProperty(Property.VFS_CONTEXT_CLASSPATH_PROPERTY, key); + public String getProperty(String key) { + return getConfiguration().get(key); } }); } catch (IOException e) { diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java index b1e473d..b5e5afb 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java +++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java @@ -550,8 +550,8 @@ public class Shell extends ShellOptions implements KeywordExecutable { AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig() { @Override - public String getVfsContextClasspathProperty(String key) { - return systemConfig.get(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.getKey() + key); + public String getProperty(String key) { + return systemConfig.get(key); } }); diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java index e155b3d..a3d51fc 100644 --- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java +++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java @@ -99,21 +99,20 @@ public class ContextManager { public static abstract class DefaultContextsConfig implements ContextsConfig { - /** - * Implementations should prepend {@link AccumuloVFSClassLoader#VFS_CONTEXT_CLASSPATH_PROPERTY} to the given key. - */ - public abstract String getVfsContextClasspathProperty(String key); + public abstract String getProperty(String key); @Override public ContextConfig getContextConfig(String context) { - String uris = getVfsContextClasspathProperty(context); + String key = AccumuloVFSClassLoader.VFS_CONTEXT_CLASSPATH_PROPERTY + context; + + String uris = getProperty(key); if (uris == null) { return null; } - String delegate = getVfsContextClasspathProperty(context + ".delegation"); + String delegate = getProperty(key + ".delegation"); boolean preDelegate = true; -- To stop receiving notification emails like this one, please contact ktur...@apache.org.