ACCUMULO-2234 Remove the hardcoded tables dir and put it with the rest of the constants in core.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40ef5d42 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40ef5d42 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40ef5d42 Branch: refs/heads/master Commit: 40ef5d426d968f0032a4e2a844c7ffc624db0d7c Parents: 028b3c5 Author: Josh Elser <els...@apache.org> Authored: Thu Jan 23 21:32:40 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Jan 23 21:32:40 2014 -0500 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/Constants.java | 2 ++ .../java/org/apache/accumulo/core/client/impl/OfflineScanner.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/40ef5d42/core/src/main/java/org/apache/accumulo/core/Constants.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java b/core/src/main/java/org/apache/accumulo/core/Constants.java index 7dee32c..9065fd5 100644 --- a/core/src/main/java/org/apache/accumulo/core/Constants.java +++ b/core/src/main/java/org/apache/accumulo/core/Constants.java @@ -111,4 +111,6 @@ public class Constants { // Variables that will be substituted with environment vars in PropertyType.PATH values public static final String[] PATH_PROPERTY_ENV_VARS = new String[] {"ACCUMULO_HOME", "ACCUMULO_CONF_DIR"}; + + public static final String HDFS_TABLES_DIR = "/tables"; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/40ef5d42/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java index eaf1b76..42088ea 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java @@ -231,7 +231,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> { if (currentExtent != null && !extent.isPreviousExtent(currentExtent)) throw new AccumuloException(" " + currentExtent + " is not previous extent " + extent); - String tablesDir = config.get(Property.INSTANCE_DFS_DIR) + "/tables"; + String tablesDir = config.get(Property.INSTANCE_DFS_DIR) + Constants.HDFS_TABLES_DIR; List<String> absFiles = new ArrayList<String>(); for (String relPath : relFiles) {
