You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ga...@apache.org on 2016/01/15 01:03:30 UTC
[1/3] incubator-apex-core git commit: APEXCORE-303 #resolve evaluate
the launch properties at application launch
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 59770d064 -> ff198ae97
APEXCORE-303 #resolve evaluate the launch properties at application launch
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/ec0c88b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/ec0c88b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/ec0c88b1
Branch: refs/heads/devel-3
Commit: ec0c88b183d82257da185d42e664bd95474ad206
Parents: 56b55fe
Author: David Yan <da...@datatorrent.com>
Authored: Fri Jan 8 16:23:52 2016 -0800
Committer: David Yan <da...@datatorrent.com>
Committed: Fri Jan 8 16:23:52 2016 -0800
----------------------------------------------------------------------
.../com/datatorrent/stram/client/StramAppLauncher.java | 1 +
.../com/datatorrent/stram/client/StramClientUtils.java | 13 ++++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ec0c88b1/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java b/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java
index f1e7261..d3666d4 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java
@@ -435,6 +435,7 @@ public class StramAppLauncher
conf.set(entry.getKey(), entry.getValue());
}
}
+ StramClientUtils.evalConfiguration(conf);
return conf;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ec0c88b1/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
index 27f58f0..7e23fa5 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
@@ -659,7 +659,6 @@ public class StramClientUtils
engine.eval("var _prop = {}");
for (Map.Entry<String, String> entry : vars) {
String evalString = String.format("_prop[\"%s\"] = \"%s\"", StringEscapeUtils.escapeJava(entry.getKey()), StringEscapeUtils.escapeJava(entry.getValue()));
- LOG.debug("Evaluating: {}", evalString);
engine.eval(evalString);
}
} catch (ScriptException ex) {
@@ -709,6 +708,18 @@ public class StramClientUtils
}
}
+ public static void evalConfiguration(Configuration conf)
+ {
+ Properties props = new Properties();
+ for (Map.Entry entry : conf) {
+ props.put(entry.getKey(), entry.getValue());
+ }
+ evalProperties(props, conf);
+ for (Map.Entry<Object, Object> entry : props.entrySet()) {
+ conf.set((String)entry.getKey(), (String)entry.getValue());
+ }
+ }
+
public static <T> T doAs(String userName, PrivilegedExceptionAction<T> action) throws Exception
{
if (StringUtils.isNotBlank(userName) && !userName.equals(UserGroupInformation.getLoginUser().getShortUserName())) {
[3/3] incubator-apex-core git commit: Merge branch 'APEXCORE-303' of
https://github.com/davidyan74/incubator-apex-core into devel-3
Posted by ga...@apache.org.
Merge branch 'APEXCORE-303' of https://github.com/davidyan74/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/ff198ae9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/ff198ae9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/ff198ae9
Branch: refs/heads/devel-3
Commit: ff198ae9705aa1897b161ce95370e923ac1323ea
Parents: 59770d0 42ac8ae
Author: Gaurav Gupta <ga...@apache.org>
Authored: Thu Jan 14 16:03:04 2016 -0800
Committer: Gaurav Gupta <ga...@apache.org>
Committed: Thu Jan 14 16:03:04 2016 -0800
----------------------------------------------------------------------
.../datatorrent/stram/client/StramAppLauncher.java | 1 +
.../datatorrent/stram/client/StramClientUtils.java | 13 ++++++++++++-
.../stram/client/StramClientUtilsTest.java | 15 +++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] incubator-apex-core git commit: APEXCORE-303 Added unit test
Posted by ga...@apache.org.
APEXCORE-303 Added unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/42ac8ae0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/42ac8ae0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/42ac8ae0
Branch: refs/heads/devel-3
Commit: 42ac8ae05b1b4fb2cffc09dcc9dcb17e2c2665c7
Parents: ec0c88b
Author: David Yan <da...@datatorrent.com>
Authored: Fri Jan 8 16:44:08 2016 -0800
Committer: David Yan <da...@datatorrent.com>
Committed: Fri Jan 8 16:44:08 2016 -0800
----------------------------------------------------------------------
.../stram/client/StramClientUtilsTest.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/42ac8ae0/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
index 51193ef..bb67020 100644
--- a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
@@ -76,6 +76,21 @@ public class StramClientUtilsTest
Assert.assertEquals("1111 123 xxx foobar yyy", prop.get("var.result"));
}
+ @Test
+ public void testEvalConfiguration() throws Exception
+ {
+ Configuration conf = new Configuration();
+ conf.set("a.b.c", "123");
+ conf.set("x.y.z", "foobar");
+ conf.set("sub.result", "1111 ${a.b.c} xxx ${x.y.z} yyy");
+ conf.set("script.result", "1111 {% (_prop[\"a.b.c\"] * _prop[\"a.b.c\"]).toFixed(0) %} xxx");
+
+ StramClientUtils.evalConfiguration(conf);
+
+ Assert.assertEquals("1111 123 xxx foobar yyy", conf.get("sub.result"));
+ Assert.assertEquals("1111 15129 xxx", conf.get("script.result"));
+ }
+
private String getHostString(String host) throws UnknownHostException
{
InetAddress address = InetAddress.getByName(host);