diff --git a/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java index eb0d7aa0869f02c9b4439fe085ae14284404107f..c3dc8d52459e9729a695887a88a14901e2db8313 100644 --- a/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java @@ -26,6 +26,7 @@ import com.dianping.cat.home.dal.alarm.ScheduledReportDao; import com.dianping.cat.home.dal.alarm.ScheduledSubscriptionDao; import com.dianping.cat.home.dal.report.BaselineDao; import com.dianping.cat.home.dal.report.DailyReportContentDao; +import com.dianping.cat.home.dal.report.HighloadSqlDao; import com.dianping.cat.home.dal.report.MonthlyReportContentDao; import com.dianping.cat.home.dal.report.OverloadDao; import com.dianping.cat.home.dal.report.TopologyGraphDao; @@ -187,7 +188,7 @@ public class TaskComponentConfigurator extends AbstractResourceConfigurator { all.add(C(ReportTaskBuilder.class, HighLoadSqlUpdater.ID, HighLoadSqlUpdater.class)// .req(ModelService.class, TransactionAnalyzer.ID)// - .req(ReportServiceManager.class)); + .req(ReportServiceManager.class).req(HighloadSqlDao.class)); all.add(C(ReportRender.class, ReportRenderImpl.class)); diff --git a/cat-home/src/main/resources/META-INF/dal/jdbc/report-codegen.xml b/cat-home/src/main/resources/META-INF/dal/jdbc/report-codegen.xml index 6c34a97ece2f7f4841c46b453d67c703a4bfba3f..be4912412212870d27686af4e20e9f54568727a5 100644 --- a/cat-home/src/main/resources/META-INF/dal/jdbc/report-codegen.xml +++ b/cat-home/src/main/resources/META-INF/dal/jdbc/report-codegen.xml @@ -285,6 +285,45 @@ + + + + + + + + + + + + + + + + + + + + FROM + WHERE = ${key-id}]]> + + + () + VALUES()]]> + + + + + SET + WHERE = ${key-id}]]> + + + + + WHERE = ${key-id}]]> + + + diff --git a/cat-home/src/main/resources/META-INF/dal/jdbc/report-dal.xml b/cat-home/src/main/resources/META-INF/dal/jdbc/report-dal.xml index e57f73efeceda8526c27debf128de4f14e0553ab..85a2ca19db39cdd2899e15776c21371c5de2011b 100644 --- a/cat-home/src/main/resources/META-INF/dal/jdbc/report-dal.xml +++ b/cat-home/src/main/resources/META-INF/dal/jdbc/report-dal.xml @@ -302,4 +302,19 @@ + + + + + + + + FROM
+ WHERE = ${select-date} + ORDER BY DESC + ]]> + + + \ No newline at end of file diff --git a/cat-home/src/main/resources/META-INF/plexus/components.xml b/cat-home/src/main/resources/META-INF/plexus/components.xml index 02260cade88fec7fe52d34f424351433a5999141..af306cb02884ea4f0664009bf65358259205b393 100755 --- a/cat-home/src/main/resources/META-INF/plexus/components.xml +++ b/cat-home/src/main/resources/META-INF/plexus/components.xml @@ -1451,6 +1451,9 @@ com.dianping.cat.report.service.ReportServiceManager + + com.dianping.cat.home.dal.report.HighloadSqlDao + @@ -2110,6 +2113,16 @@ cat + + org.unidal.dal.jdbc.mapping.TableProvider + highload-sql + org.unidal.dal.jdbc.mapping.SimpleTableProvider + + highload-sql + highload_sql + cat + + org.unidal.dal.jdbc.mapping.TableProvider monthly-report-content @@ -2223,6 +2236,15 @@ + + com.dianping.cat.home.dal.report.HighloadSqlDao + com.dianping.cat.home.dal.report.HighloadSqlDao + + + org.unidal.dal.jdbc.QueryEngine + + + com.dianping.cat.home.dal.report.MonthlyReportContentDao com.dianping.cat.home.dal.report.MonthlyReportContentDao diff --git a/cat-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml b/cat-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml index fd585bc179f46def01444fc7053db2c12da54890..93e95ef49d66ee8f3eda477cab87d885e50d13b1 100644 --- a/cat-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml +++ b/cat-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml @@ -21,6 +21,7 @@
+
diff --git a/script/Cat.sql b/script/Cat.sql index 74108ded78ea11040f26f602863e5c8f6a50631c..d8369dbe6eafcecd1a214fadc82b2753de99834f 100644 --- a/script/Cat.sql +++ b/script/Cat.sql @@ -402,3 +402,13 @@ CREATE TABLE `user_define_rule` ( `creation_date` datetime NOT NULL COMMENT '创建时间', PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=1242 DEFAULT CHARSET=utf8 COMMENT='用户定义规则表'; + +CREATE TABLE `highload_sql` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增长ID', + `domain` varchar(50) NOT NULL COMMENT '项目名称', + `weight` double NOT NULL COMMENT '权重', + `transaction_name_content` text NOT NULL COMMENT 'TransactionName内容', + `date` datetime NOT NULL COMMENT '统计时间', + `creation_date` datetime NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1242 DEFAULT CHARSET=utf8 COMMENT='高消耗SQL记录表'; \ No newline at end of file