Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-15357. Configuration.getPropsWithPrefix no longer does variable substitution. Contributed by Jim Brennan 

(cherry picked from commit e81397545a)
This commit is contained in:
Jason Lowe 2018-04-10 16:44:03 -05:00
parent 3414bf6dbb
commit ffceb907fe
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -2866,15 +2866,12 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
*/ */
public Map<String, String> getPropsWithPrefix(String confPrefix) { public Map<String, String> getPropsWithPrefix(String confPrefix) {
Properties props = getProps(); Properties props = getProps();
Enumeration e = props.propertyNames();
Map<String, String> configMap = new HashMap<>(); Map<String, String> configMap = new HashMap<>();
String name = null; for (String name : props.stringPropertyNames()) {
while (e.hasMoreElements()) {
name = (String) e.nextElement();
if (name.startsWith(confPrefix)) { if (name.startsWith(confPrefix)) {
String value = props.getProperty(name); String value = get(name);
name = name.substring(confPrefix.length()); String keyName = name.substring(confPrefix.length());
configMap.put(name, value); configMap.put(keyName, value);
} }
} }
return configMap; return configMap;

26
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
View File

@ -2320,19 +2320,33 @@ public class TestConfiguration {
FileUtil.fullyDelete(tmpDir); FileUtil.fullyDelete(tmpDir);
} }
@Test
public void testGettingPropertiesWithPrefix() throws Exception { public void testGettingPropertiesWithPrefix() throws Exception {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
for (int i = 0; i < 10; i++) { 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"); conf.set("different.prefix" + ".name", "value");
Map<String, String> props = conf.getPropsWithPrefix("prefix"); Map<String, String> prefixedProps = conf.getPropsWithPrefix("prefix.");
assertEquals(props.size(), 10); 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 // test call with no properties for a given prefix
props = conf.getPropsWithPrefix("none"); prefixedProps = conf.getPropsWithPrefix("none");
assertNotNull(props.isEmpty()); assertNotNull(prefixedProps.isEmpty());
assertTrue(props.isEmpty()); assertTrue(prefixedProps.isEmpty());
} }
public static void main(String[] argv) throws Exception { public static void main(String[] argv) throws Exception {