From acc9cac8f1079334cbaa2563d35568083c5e36e1 Mon Sep 17 00:00:00 2001 From: "leon.li" Date: Thu, 30 Oct 2014 14:52:54 +0800 Subject: [PATCH] add new table highload_sql --- .../cat/build/TaskComponentConfigurator.java | 3 +- .../META-INF/dal/jdbc/report-codegen.xml | 39 +++++++++++++++++++ .../META-INF/dal/jdbc/report-dal.xml | 15 +++++++ .../resources/META-INF/plexus/components.xml | 22 +++++++++++ .../resources/META-INF/wizard/jdbc/wizard.xml | 1 + script/Cat.sql | 10 +++++ 6 files changed, 89 insertions(+), 1 deletion(-) 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 eb0d7aa08..c3dc8d524 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 6c34a97ec..be4912412 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 e57f73efe..85a2ca19d 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 02260cade..af306cb02 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 fd585bc17..93e95ef49 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 74108ded7..d8369dbe6 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 -- GitLab