Merge branch 'master' of ssh://192.168.8.22:58422/cat

cat-hadoop/src/main/resources/META-INF/plexus/components.xml

@@ -120,6 +120,16 @@
 				<data-source-name>cat</data-source-name>
 			</configuration>
 		</component>
+		<component>
+			<role>com.site.dal.jdbc.mapping.TableProvider</role>
+			<role-hint>location</role-hint>
+			<implementation>com.site.dal.jdbc.mapping.SimpleTableProvider</implementation>
+			<configuration>
+				<logical-table-name>location</logical-table-name>
+				<physical-table-name>location</physical-table-name>
+				<data-source-name>cat</data-source-name>
+			</configuration>
+		</component>
 		<component>
 			<role>com.site.dal.jdbc.mapping.TableProvider</role>
 			<role-hint>logview</role-hint>
@@ -196,6 +206,15 @@
 				</requirement>
 			</requirements>
 		</component>
+		<component>
+			<role>com.dianping.cat.hadoop.dal.LocationDao</role>
+			<implementation>com.dianping.cat.hadoop.dal.LocationDao</implementation>
+			<requirements>
+				<requirement>
+					<role>com.site.dal.jdbc.QueryEngine</role>
+				</requirement>
+			</requirements>
+		</component>
 		<component>
 			<role>com.dianping.cat.hadoop.dal.LogviewDao</role>
 			<implementation>com.dianping.cat.hadoop.dal.LogviewDao</implementation>

cat-home/src/main/java/com/dianping/cat/report/task/DefaultTaskConsumer.java

@@ -172,8 +172,9 @@ public class DefaultTaskConsumer extends TaskConsumer implements LogEnabled {
 				eventReport.getIps().add("All");
 				content = eventReport.toString();
 			} else if ("heartbeat".equals(reportName)) {
-				HeartbeatReport heartbeatReport = mergeHeartbeatReports(reportDomain, reports);
-				content = heartbeatReport.toString();
+				// TODO
+				// HeartbeatReport heartbeatReport = mergeHeartbeatReports(reportDomain, reports);
+				// content = heartbeatReport.toString();
 			} else if ("problem".equals(reportName)) {
 				ProblemReport problemReport = mergeProblemReports(reportDomain, reports);
 				content = problemReport.toString();
@@ -219,8 +220,9 @@ public class DefaultTaskConsumer extends TaskConsumer implements LogEnabled {
 				EventReport eventReport = mergeEventReports(reportDomain, reports);
 				graphs = splitEventReportToGraphs(reportPeriod, reportDomain, reportName, eventReport);
 			} else if ("heartbeat".equals(reportName)) {
-				HeartbeatReport heartbeatReport = mergeHeartbeatReports(reportDomain, reports);
-				graphs = splitHeartbeatReportToGraphs(reportPeriod, reportDomain, reportName, heartbeatReport);
+				// TODO
+				// HeartbeatReport heartbeatReport = mergeHeartbeatReports(reportDomain, reports);
+				// graphs = splitHeartbeatReportToGraphs(reportPeriod, reportDomain, reportName, heartbeatReport);
 			} else if ("problem".equals(reportName)) {
 				ProblemReport problemReport = mergeProblemReports(reportDomain, reports);
 				graphs = splitProblemReportToGraphs(reportPeriod, reportDomain, reportName, problemReport);