eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinh...@apache.org
Subject incubator-eagle git commit: [EAGLE-618] migration eagle-jpm-aggregation to application framework-bug fix
Date Fri, 14 Oct 2016 07:50:51 GMT
Repository: incubator-eagle
Updated Branches:
  refs/heads/master e6f9d1bbd -> c6ac2eb6f


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

Author: wujinhu <wujinhu920@126.com>

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 <wujinhu920@126.com>
Authored: Fri Oct 14 15:50:39 2016 +0800
Committer: wujinhu <wujinhu920@126.com>
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<String> 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 @@
         </property>
         <property>
             <name>aggregate.counters.groupBys</name>
-            <description>groupBys that each metric need to aggregate. If group by many
columns, then split them by &</description>
-            <value>site&jobType, site&user, site</value>
+            <description>groupBys that each metric need to aggregate. If group by many
columns, then split them by ,</description>
+            <value>site, jobType; site, user; site</value>
         </property>
     </configuration>
     <docs>

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&jobType, site&user, site"
+      "groupBys": "site, jobType; site, user; site"
     }
   },
 


Mime
View raw message