From d01caaf78d4d5e571daa07f129c78be9b3dfd499 Mon Sep 17 00:00:00 2001
From: "leon.li" <leon.li@dianping.com>
Date: Tue, 8 Jul 2014 17:50:28 +0800
Subject: [PATCH] add table alert_summary

---
 .../META-INF/dal/jdbc/report-codegen.xml      | 100 ++++++++----------
 .../resources/META-INF/wizard/jdbc/wizard.xml |   1 +
 script/Cat.sql                                |  11 +-
 3 files changed, 56 insertions(+), 56 deletions(-)

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 3238473d6..9c3338fb1 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entities>
-    <entity name="alert" table="alert" alias="a">
+  <entity name="alert" table="alert" alias="a">
     <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
     <member name="domain" field="domain" value-type="String" length="128" nullable="false" />
     <member name="alert-time" field="alert_time" value-type="Date" nullable="false" />
@@ -41,7 +41,46 @@
       </query>
     </query-defs>
   </entity>
-  <entity name="alteration" table="alteration" alias="a">
+  <entity name="alert-summary" table="alert_summary" alias="as">
+    <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
+    <member name="domain" field="domain" value-type="String" length="128" nullable="false" />
+    <member name="alert-time" field="alert_time" value-type="Date" nullable="false" />
+    <member name="content" field="content" value-type="String" length="65535" nullable="false" />
+    <member name="creation-date" field="creation_date" value-type="Date" nullable="false" />
+    <var name="key-id" value-type="int" key-member="id" />
+    <primary-key name="PRIMARY" members="id" />
+    <index name="alert_summary_index" members="alert_time ASC, domain ASC" />
+    <readsets>
+      <readset name="FULL" all="true" />
+    </readsets>
+    <updatesets>
+      <updateset name="FULL" all="true" />
+    </updatesets>
+    <query-defs>
+      <query name="find-by-PK" type="SELECT">
+        <param name="key-id" />
+        <statement><![CDATA[SELECT <FIELDS/>
+        FROM <TABLE/>
+        WHERE <FIELD name='id'/> = ${key-id}]]></statement>
+      </query>
+      <query name="insert" type="INSERT">
+        <statement><![CDATA[INSERT INTO <TABLE/>(<FIELDS/>)
+        VALUES(<VALUES/>)]]></statement>
+      </query>
+      <query name="update-by-PK" type="UPDATE">
+        <param name="key-id" />
+        <statement><![CDATA[UPDATE <TABLE/>
+        SET <FIELDS/>
+        WHERE <FIELD name='id'/> = ${key-id}]]></statement>
+      </query>
+      <query name="delete-by-PK" type="DELETE">
+        <param name="key-id" />
+        <statement><![CDATA[DELETE FROM <TABLE/>
+        WHERE <FIELD name='id'/> = ${key-id}]]></statement>
+      </query>
+    </query-defs>
+  </entity>
+  <entity name="alteration" table="alteration" alias="a2">
     <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
     <member name="type" field="type" value-type="String" length="64" nullable="false" />
     <member name="title" field="title" value-type="String" length="128" nullable="false" />
@@ -90,12 +129,14 @@
   <entity name="baseline" table="baseline" alias="b">
     <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
     <member name="report-name" field="report_name" value-type="String" length="100" />
-    <member name="index-key" field="index_key" value-type="String" length="256" nullable="false" />
+    <member name="index-key" field="index_key" value-type="String" length="100" />
     <member name="report-period" field="report_period" value-type="Date" />
     <member name="data" field="data" value-type="byte[]" length="65535" />
     <member name="creation-date" field="creation_date" value-type="Date" />
     <var name="key-id" value-type="int" key-member="id" />
     <primary-key name="PRIMARY" members="id" />
+    <index name="ix_indexkey_reportperiod" members="index_key ASC, report_period ASC" />
+    <index name="ix_reportperiod" members="report_period ASC" />
     <readsets>
       <readset name="FULL" all="true" />
     </readsets>
@@ -174,6 +215,7 @@
     <member name="creation-date" field="creation_date" value-type="Date" nullable="false" />
     <var name="key-id" value-type="int" key-member="id" />
     <primary-key name="PRIMARY" members="id" />
+    <index name="ix_date_domain" members="date ASC, domain ASC" />
     <readsets>
       <readset name="FULL" all="true" />
     </readsets>
@@ -240,58 +282,6 @@
       </query>
     </query-defs>
   </entity>
-  <entity name="sqlreport" table="sqlreport" alias="s">
-    <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
-    <member name="domain" field="domain" value-type="String" length="50" nullable="false" />
-    <member name="name" field="name" value-type="String" length="100" nullable="false" />
-    <member name="statement" field="statement" value-type="String" length="3000" nullable="false" />
-    <member name="total-count" field="total_count" value-type="int" length="10" nullable="false" />
-    <member name="failure-count" field="failure_count" value-type="int" length="10" nullable="false" />
-    <member name="long-sqls" field="long_sqls" value-type="int" length="10" nullable="false" />
-    <member name="min-value" field="min_value" value-type="double" length="22" nullable="false" />
-    <member name="max-value" field="max_value" value-type="double" length="22" nullable="false" />
-    <member name="avg2-value" field="avg2_value" value-type="double" length="22" nullable="false" />
-    <member name="sum-value" field="sum_value" value-type="double" length="22" nullable="false" />
-    <member name="sum2-value" field="sum2_value" value-type="double" length="22" nullable="false" />
-    <member name="sample-link" field="sample_link" value-type="String" length="64" nullable="false" />
-    <member name="transaction-date" field="transaction_date" value-type="Date" nullable="false" />
-    <member name="creation-date" field="creation_date" value-type="Date" nullable="false" />
-    <member name="duration-distribution" field="duration_distribution" value-type="String" length="512" nullable="false" />
-    <member name="hits-over-time" field="hits_over_time" value-type="String" length="512" nullable="false" />
-    <member name="duration-over-time" field="duration_over_time" value-type="String" length="512" nullable="false" />
-    <member name="failure-over-time" field="failure_over_time" value-type="String" length="512" nullable="false" />
-    <var name="key-id" value-type="int" key-member="id" />
-    <primary-key name="PRIMARY" members="id" />
-    <readsets>
-      <readset name="FULL" all="true" />
-    </readsets>
-    <updatesets>
-      <updateset name="FULL" all="true" />
-    </updatesets>
-    <query-defs>
-      <query name="find-by-PK" type="SELECT">
-        <param name="key-id" />
-        <statement><![CDATA[SELECT <FIELDS/>
-        FROM <TABLE/>
-        WHERE <FIELD name='id'/> = ${key-id}]]></statement>
-      </query>
-      <query name="insert" type="INSERT">
-        <statement><![CDATA[INSERT INTO <TABLE/>(<FIELDS/>)
-        VALUES(<VALUES/>)]]></statement>
-      </query>
-      <query name="update-by-PK" type="UPDATE">
-        <param name="key-id" />
-        <statement><![CDATA[UPDATE <TABLE/>
-        SET <FIELDS/>
-        WHERE <FIELD name='id'/> = ${key-id}]]></statement>
-      </query>
-      <query name="delete-by-PK" type="DELETE">
-        <param name="key-id" />
-        <statement><![CDATA[DELETE FROM <TABLE/>
-        WHERE <FIELD name='id'/> = ${key-id}]]></statement>
-      </query>
-    </query-defs>
-  </entity>
   <entity name="topology-graph" table="topologyGraph" alias="t">
     <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
     <member name="ip" field="ip" value-type="String" length="20" />
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 f3765559e..6be030c5f 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
@@ -17,6 +17,7 @@
          <table name="monthly_report_content"/>
          <table name="weekly_report_content"/>
          <table name="alert"/>
+         <table name="alert_summary"/>
       </group>
       <group name="alarm" package="com.dianping.cat.home.dal.alarm">
          <table name="mailRecord"/>
diff --git a/script/Cat.sql b/script/Cat.sql
index 5efbf7b15..83e676564 100644
--- a/script/Cat.sql
+++ b/script/Cat.sql
@@ -321,4 +321,13 @@ CREATE TABLE `alert` (
   `metric` varchar(128) NOT NULL COMMENT '告警指标',
   `creation_date` datetime NOT NULL COMMENT '数据插入时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='存储告警信息';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='存储告警信息';
+
+CREATE TABLE `alert_summary` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增长ID',
+  `domain` varchar(128) NOT NULL COMMENT '告警项目',
+  `alert_time` datetime NOT NULL COMMENT '告警时间',
+  `content` text NOT NULL COMMENT '统一告警内容',
+  `creation_date` datetime NOT NULL COMMENT '数据插入时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='统一告警信息';
\ No newline at end of file
-- 
GitLab