[30/50] incubator-eagle git commit: [EAGLE-618] migration eagle-jpm-aggregation to application framework-bug fix

2016-10-18 Thread hao 
[EAGLE-618] migration eagle-jpm-aggregation to application framework-bug fix

Author: wujinhu 

Closes #509 from wujinhu/EAGLE-618.


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/8ff8ecf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/8ff8ecf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/8ff8ecf1

Branch: refs/heads/master
Commit: 8ff8ecf1b8d9ace5c87ad6acc30235b4a43d98bf
Parents: 98d1964
Author: wujinhu 
Authored: Fri Oct 14 17:46:33 2016 +0800
Committer: wujinhu 
Committed: Fri Oct 14 17:46:33 2016 +0800

--
 .../org/apache/eagle/jpm/aggregation/AggregationApplication.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/8ff8ecf1/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
--
diff --git 
a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
 
b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
index b040d3e..214c688 100644
--- 
a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
+++ 
b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
@@ -35,13 +35,13 @@ public class AggregationApplication extends 
StormApplication {
 List metricNames = new ArrayList<>();
 String[] metricNamesArr = 
config.getString("aggregate.counters.metrics").split(",");
 for (int i = 0; i < metricNamesArr.length; i++) {
-metricNames.add(metricNamesArr[i]);
+metricNames.add(metricNamesArr[i].trim());
 }
 List groupByColumns = new ArrayList<>();
 
 String[] groupByColumnsArr = 
config.getString("aggregate.counters.groupBys").split(";");
 for (int i = 0; i < groupByColumnsArr.length; i++) {
-groupByColumns.add(groupByColumnsArr[i]);
+groupByColumns.add(groupByColumnsArr[i].trim());
 }
 
 Map> metrics = new HashMap<>();

incubator-eagle git commit: [EAGLE-618] migration eagle-jpm-aggregation to application framework-bug fix

2016-10-14 Thread jinhuwu 
Repository: incubator-eagle
Updated Branches:
  refs/heads/master e6f9d1bbd -> c6ac2eb6f


[EAGLE-618] migration eagle-jpm-aggregation to application framework-bug fix

Author: wujinhu 

Closes #508 from wujinhu/EAGLE-618.


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/c6ac2eb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/c6ac2eb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/c6ac2eb6

Branch: refs/heads/master
Commit: c6ac2eb6f1b5ba6d6c8702e79e7f669e77dcb0a7
Parents: e6f9d1b
Author: wujinhu 
Authored: Fri Oct 14 15:50:39 2016 +0800
Committer: wujinhu 
Committed: Fri Oct 14 15:50:39 2016 +0800

--
 .../apache/eagle/jpm/aggregation/AggregationApplication.java| 5 +++--
 ...che.eagle.jpm.aggregation.AggregationApplicationProvider.xml | 4 ++--
 .../eagle-jpm-aggregation/src/main/resources/application.conf   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/c6ac2eb6/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
--
diff --git 
a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
 
b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
index 0577070..b040d3e 100644
--- 
a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
+++ 
b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java
@@ -38,7 +38,8 @@ public class AggregationApplication extends StormApplication {
 metricNames.add(metricNamesArr[i]);
 }
 List groupByColumns = new ArrayList<>();
-String[] groupByColumnsArr = 
config.getString("aggregate.counters.groupBys").split(",");
+
+String[] groupByColumnsArr = 
config.getString("aggregate.counters.groupBys").split(";");
 for (int i = 0; i < groupByColumnsArr.length; i++) {
 groupByColumns.add(groupByColumnsArr[i]);
 }
@@ -47,7 +48,7 @@ public class AggregationApplication extends StormApplication {
 for (String metric : metricNames) {
 metrics.put(metric, new ArrayList<>());
 for (String cols : groupByColumns) {
-metrics.get(metric).add(Arrays.asList(cols.replaceAll(" ", 
"").split("&")));
+metrics.get(metric).add(Arrays.asList(cols.replaceAll(" ", 
"").split(",")));
 }
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/c6ac2eb6/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml
--
diff --git 
a/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml
 
b/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml
index 237a437..99e3fca 100644
--- 
a/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml
+++ 
b/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml
@@ -102,8 +102,8 @@
 
 
 aggregate.counters.groupBys
-groupBys that each metric need to aggregate. If group 
by many columns, then split them by &
-site, site, site
+groupBys that each metric need to aggregate. If group 
by many columns, then split them by ,
+site, jobType; site, user; site
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/c6ac2eb6/eagle-jpm/eagle-jpm-aggregation/src/main/resources/application.conf
--
diff --git 
a/eagle-jpm/eagle-jpm-aggregation/src/main/resources/application.conf 
b/eagle-jpm/eagle-jpm-aggregation/src/main/resources/application.conf
index 98fc009..529dd57 100644
--- a/eagle-jpm/eagle-jpm-aggregation/src/main/resources/application.conf
+++ b/eagle-jpm/eagle-jpm-aggregation/src/main/resources/application.conf
@@ -51,7 +51,7 @@
   "aggregate" : {
 "counters" : {
   "metrics" : "cpu_milliseconds,file_bytes_read, file_bytes_written, 
hdfs_bytes_read, hdfs_bytes_written, hdfs_read_ops, hdfs_write_ops",
-  "groupBys": "site, site, site"
+  "groupBys":