You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by sj...@apache.org on 2018/01/23 19:33:55 UTC
asterixdb git commit: [ASTERIXDB-2260][CONF] Pass extension arguments
through
Repository: asterixdb
Updated Branches:
refs/heads/master e00e1ffb6 -> 2d059fd1c
[ASTERIXDB-2260][CONF] Pass extension arguments through
Change-Id: I1f2332ee85316a452d6efe9967992b30bd605f5b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2312
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Steven Jacobs <sj...@ucr.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/2d059fd1
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/2d059fd1
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/2d059fd1
Branch: refs/heads/master
Commit: 2d059fd1c2113ad75311829bc3f6a51a56c0fdba
Parents: e00e1ff
Author: Ian Maxon <im...@apache.org>
Authored: Mon Jan 22 16:34:13 2018 -0800
Committer: Steven Jacobs <sj...@ucr.edu>
Committed: Tue Jan 23 11:33:38 2018 -0800
----------------------------------------------------------------------
.../apache/hyracks/control/common/config/ConfigManager.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2d059fd1/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
index 7d3ada5..67ea33f 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
@@ -29,7 +29,6 @@ import java.util.Comparator;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -86,6 +85,7 @@ public class ConfigManager implements IConfigManager, Serializable {
private transient SortedMap<Integer, List<IConfigurator>> configurators = new TreeMap<>();
private boolean configured;
private String versionString = "version undefined";
+ private transient Map<String, Set<Map.Entry<String, String>>> extensionOptions = new TreeMap();
public ConfigManager() {
this(null);
@@ -309,6 +309,7 @@ public class ConfigManager implements IConfigManager, Serializable {
.parseSectionName(section.getParent() == null ? section.getName() : section.getParent().getName());
String node;
if (rootSection == Section.EXTENSION) {
+ extensionOptions.put(section.getName(), section.entrySet());
continue;
} else if (rootSection == Section.NC) {
node = section.getName().equals(section.getSimpleName()) ? null : section.getSimpleName();
@@ -472,6 +473,10 @@ public class ConfigManager implements IConfigManager, Serializable {
}
}
});
+ extensionOptions.forEach((extension, options) -> {
+ options.forEach(option -> ini
+ .add(extension, option.getKey(), option.getValue()));
+ });
return ini;
}