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

Configuration#get return value optimization (jeagles)

This commit is contained in:
Jonathan Eagles 2017-03-27 12:48:44 -05:00
parent 858d597be0
commit db2adf356a
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -619,42 +619,44 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
* deprecated key, the value of the deprecated key is set as the value for * deprecated key, the value of the deprecated key is set as the value for
* the provided property name. * the provided property name.
* *
* @param deprecations deprecation context
* @param name the property name * @param name the property name
* @return the first property in the list of properties mapping * @return the first property in the list of properties mapping
* the <code>name</code> or the <code>name</code> itself. * the <code>name</code> or the <code>name</code> itself.
*/ */
private String[] handleDeprecation(DeprecationContext deprecations, private String[] handleDeprecation(DeprecationContext deprecations,
String name) { String name) {
if (null != name) { if (null != name) {
name = name.trim(); name = name.trim();
} }
ArrayList<String > names = new ArrayList<String>(); // Initialize the return value with requested name
if (isDeprecated(name)) { String[] names = new String[]{name};
DeprecatedKeyInfo keyInfo = deprecations.getDeprecatedKeyMap().get(name); // Deprecated keys are logged once and an updated names are returned
if (keyInfo != null) { DeprecatedKeyInfo keyInfo = deprecations.getDeprecatedKeyMap().get(name);
if (!keyInfo.getAndSetAccessed()) { if (keyInfo != null) {
logDeprecation(keyInfo.getWarningMessage(name)); if (!keyInfo.getAndSetAccessed()) {
} logDeprecation(keyInfo.getWarningMessage(name));
}
for (String newKey : keyInfo.newKeys) { // Override return value for deprecated keys
if (newKey != null) { names = keyInfo.newKeys;
names.add(newKey); }
} // If there are no overlay values we can return early
Properties overlayProperties = getOverlay();
if (overlayProperties.isEmpty()) {
return names;
}
// Update properties and overlays with reverse lookup values
for (String n : names) {
String deprecatedKey = deprecations.getReverseDeprecatedKeyMap().get(n);
if (deprecatedKey != null && !overlayProperties.containsKey(n)) {
String deprecatedValue = overlayProperties.getProperty(deprecatedKey);
if (deprecatedValue != null) {
getProps().setProperty(n, deprecatedValue);
overlayProperties.setProperty(n, deprecatedValue);
} }
} }
} }
if(names.size() == 0) { return names;
names.add(name);
}
for(String n : names) {
String deprecatedKey = deprecations.getReverseDeprecatedKeyMap().get(n);
if (deprecatedKey != null && !getOverlay().containsKey(n) &&
getOverlay().containsKey(deprecatedKey)) {
getProps().setProperty(n, getOverlay().getProperty(deprecatedKey));
getOverlay().setProperty(n, getOverlay().getProperty(deprecatedKey));
}
}
return names.toArray(new String[names.size()]);
} }
private void handleDeprecation() { private void handleDeprecation() {