Repository: hadoop Updated Branches: refs/heads/branch-3.0 afbdd8fdc -> eef5d1947
HADOOP-15357. Configuration.getPropsWithPrefix no longer does variable substitution. Contributed by Jim Brennan (cherry picked from commit e81397545a273cf9a090010eb644b836e0ef8c7b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eef5d194 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eef5d194 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eef5d194 Branch: refs/heads/branch-3.0 Commit: eef5d1947e22fec89c77f47a6f462c9ce71a13f6 Parents: afbdd8f Author: Jason Lowe <jl...@apache.org> Authored: Tue Apr 10 16:44:03 2018 -0500 Committer: Jason Lowe <jl...@apache.org> Committed: Tue Apr 10 16:54:17 2018 -0500 ---------------------------------------------------------------------- .../org/apache/hadoop/conf/Configuration.java | 11 +++------ .../apache/hadoop/conf/TestConfiguration.java | 26 +++++++++++++++----- 2 files changed, 24 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eef5d194/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index 7eaf00e..0d4c30a 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2833,15 +2833,12 @@ public class Configuration implements Iterable<Map.Entry<String,String>>, */ public Map<String, String> getPropsWithPrefix(String confPrefix) { Properties props = getProps(); - Enumeration e = props.propertyNames(); Map<String, String> configMap = new HashMap<>(); - String name = null; - while (e.hasMoreElements()) { - name = (String) e.nextElement(); + for (String name : props.stringPropertyNames()) { if (name.startsWith(confPrefix)) { - String value = props.getProperty(name); - name = name.substring(confPrefix.length()); - configMap.put(name, value); + String value = get(name); + String keyName = name.substring(confPrefix.length()); + configMap.put(keyName, value); } } return configMap; http://git-wip-us.apache.org/repos/asf/hadoop/blob/eef5d194/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java index 1ebfa35..b11349e 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java @@ -2285,19 +2285,33 @@ public class TestConfiguration { FileUtil.fullyDelete(tmpDir); } + @Test public void testGettingPropertiesWithPrefix() throws Exception { Configuration conf = new Configuration(); for (int i = 0; i < 10; i++) { - conf.set("prefix" + ".name" + i, "value"); + conf.set("prefix." + "name" + i, "value" + i); } conf.set("different.prefix" + ".name", "value"); - Map<String, String> props = conf.getPropsWithPrefix("prefix"); - assertEquals(props.size(), 10); + Map<String, String> prefixedProps = conf.getPropsWithPrefix("prefix."); + assertEquals(prefixedProps.size(), 10); + for (int i = 0; i < 10; i++) { + assertEquals("value" + i, prefixedProps.get("name" + i)); + } + // Repeat test with variable substitution + conf.set("foo", "bar"); + for (int i = 0; i < 10; i++) { + conf.set("subprefix." + "subname" + i, "value_${foo}" + i); + } + prefixedProps = conf.getPropsWithPrefix("subprefix."); + assertEquals(prefixedProps.size(), 10); + for (int i = 0; i < 10; i++) { + assertEquals("value_bar" + i, prefixedProps.get("subname" + i)); + } // test call with no properties for a given prefix - props = conf.getPropsWithPrefix("none"); - assertNotNull(props.isEmpty()); - assertTrue(props.isEmpty()); + prefixedProps = conf.getPropsWithPrefix("none"); + assertNotNull(prefixedProps.isEmpty()); + assertTrue(prefixedProps.isEmpty()); } public static void main(String[] argv) throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
