HADOOP-13556. Change Configuration.getPropsWithPrefix to use getProps instead of iterator. (Larry McCay via asuresh)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b6c2c905 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b6c2c905 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b6c2c905 Branch: refs/heads/YARN-1011 Commit: b6c2c9058e83116dcca46cd6934db3428f931347 Parents: 8acdf5c Author: Arun Suresh <asur...@apache.org> Authored: Wed Oct 11 15:21:21 2017 -0700 Committer: Arun Suresh <asur...@apache.org> Committed: Wed Oct 11 15:21:21 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/conf/Configuration.java | 9 ++++++--- .../org/apache/hadoop/conf/TestConfiguration.java | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b6c2c905/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 2890853..9d5bb1b 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 @@ -2700,11 +2700,14 @@ public class Configuration implements Iterable<Map.Entry<String,String>>, * @return mapping of configuration properties with prefix stripped */ public Map<String, String> getPropsWithPrefix(String confPrefix) { + Properties props = getProps(); + Enumeration e = props.propertyNames(); Map<String, String> configMap = new HashMap<>(); - for (Map.Entry<String, String> entry : this) { - String name = entry.getKey(); + String name = null; + while (e.hasMoreElements()) { + name = (String) e.nextElement(); if (name.startsWith(confPrefix)) { - String value = this.get(name); + String value = props.getProperty(name); name = name.substring(confPrefix.length()); configMap.put(name, value); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b6c2c905/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 a806b8c..52215da 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 @@ -2242,6 +2242,21 @@ public class TestConfiguration { FileUtil.fullyDelete(tmpDir); } + public void testGettingPropertiesWithPrefix() throws Exception { + Configuration conf = new Configuration(); + for (int i = 0; i < 10; i++) { + conf.set("prefix" + ".name" + i, "value"); + } + conf.set("different.prefix" + ".name", "value"); + Map<String, String> props = conf.getPropsWithPrefix("prefix"); + assertEquals(props.size(), 10); + + // test call with no properties for a given prefix + props = conf.getPropsWithPrefix("none"); + assertNotNull(props.isEmpty()); + assertTrue(props.isEmpty()); + } + public static void main(String[] argv) throws Exception { junit.textui.TestRunner.main(new String[]{ TestConfiguration.class.getName() --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
