You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by ey...@apache.org on 2012/08/05 04:43:54 UTC
svn commit: r1369518 - in /incubator/chukwa/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java
Author: eyang
Date: Sun Aug 5 02:43:54 2012
New Revision: 1369518
URL: http://svn.apache.org/viewvc?rev=1369518&view=rev
Log:
CHUKWA-654. Added additional check for getting row key. (Saisai Shao via Eric Yang)
Modified:
incubator/chukwa/trunk/CHANGES.txt
incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java
Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1369518&r1=1369517&r2=1369518&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Sun Aug 5 02:43:54 2012
@@ -22,6 +22,8 @@ Trunk (unreleased changes)
BUGS
+ CHUKWA-654. Added additional check for getting row key. (Saisai Shao via Eric Yang)
+
CHUKWA-652. Fixed JSON error in utilization.descriptor. (Saisai Shao via Eric Yang)
CHUKWA-646. Fix file rotation correctly for 0 byte rotated files. (Ivy Tang via Eric Yang)
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java?rev=1369518&r1=1369517&r2=1369518&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java Sun Aug 5 02:43:54 2012
@@ -103,6 +103,9 @@ public class MetricsController {
String[] rkeys = (session.getAttribute(skey).toString()).split(",");
JSONArray seriesList = new JSONArray();
for(String rowKey : rkeys) {
+ if (rowKey == null || rowKey.equals("")) {
+ continue;
+ }
Series output = ChukwaHBaseStore.getSeries(table, rowKey, family, qualifier, startTime, endTime, true);
seriesList.add(output.toJSONObject());
}