Skip to content

C
cat

梦中观雨 / cat
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

体验新版 GitCode，发现更多精彩内容 >>

提交 0819827d 编写于 作者: Y You Yong
浏览文件
操作

modify the database

上级 152dab38
隐藏空白更改
内联 并排
Showing with 46 addition and 36 deletion
cat-home/src/main/java/com/dianping/cat/report/page/sql/SqlReportModel.java
浏览文件 @ 0819827d
......@@ -11,7 +11,7 @@ public class SqlReportModel {
}
public double getFailurePercent() {
return (double)m_record.getFailures() / (double)m_record.getTotalCount();
return (double)m_record.getFailureCount() / (double)m_record.getTotalCount();
}
public double getLongPercent() {
......
cat-job/src/main/java/com/dianping/cat/job/sql/database/SqlRecordJobReducer.java
浏览文件 @ 0819827d
......@@ -21,7 +21,7 @@ public class SqlRecordJobReducer extends Reducer<Text, Text, Text, Text> {
SqlReportRecord row = dao.createLocal();
row.setDomain(sql.getDomain());
row.setTotalCount(sql.getTotalCount());
row.setFailures(sql.getFailureCount());
row.setFailureCount(sql.getFailureCount());
row.setLongSqls(sql.getLongCount());
row.setAvg2Value(sql.getAvg2());
row.setSumValue(sql.getSum());
......
cat-job/src/main/java/com/dianping/cat/job/storage/RemoteMessageBucket.java
浏览文件 @ 0819827d
......@@ -73,7 +73,7 @@ public class RemoteMessageBucket implements Bucket<MessageTree>, LogEnabled {
@Override
public MessageTree findById(String id) throws IOException {
try {
Logview logview = m_logviewDao.findByPK(id, LogviewEntity.READSET_FULL);
Logview logview = m_logviewDao.findByMessageId(id, LogviewEntity.READSET_FULL);
MessageTree tree = readMessageTree(logview);
return tree;
......
cat-job/src/main/resources/META-INF/dal/jdbc/codegen.xml
浏览文件 @ 0819827d
<?xml version="1.0" encoding="UTF-8"?>
<entities>
<entity name="logview" table="logview" alias="l">
<member name="message-id" field="message_id" value-type="String" length="64" nullable="false" key="true" />
<member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
<member name="message-id" field="message_id" value-type="String" length="64" nullable="false" />
<member name="data-path" field="data_path" value-type="String" length="200" nullable="false" />
<member name="data-offset" field="data_offset" value-type="long" length="19" nullable="false" />
<member name="data-length" field="data_length" value-type="int" length="10" nullable="false" />
<member name="tag-thread" field="tag_thread" value-type="String" length="32" />
<member name="tag-session" field="tag_session" value-type="String" length="32" />
<member name="tag-request" field="tag_request" value-type="String" length="64" />
<member name="tag-thread" field="tag_thread" value-type="String" length="128" />
<member name="tag-session" field="tag_session" value-type="String" length="128" />
<member name="tag-request" field="tag_request" value-type="String" length="128" />
<member name="creation-date" field="creation_date" value-type="Date" nullable="false" />
<var name="key-message-id" value-type="String" key-member="message-id" />
<primary-key name="PRIMARY" members="message_id" />
<var name="key-id" value-type="int" key-member="id" />
<primary-key name="PRIMARY" members="id" />
<index name="message_id" members="message_id ASC" />
<index name="tag_thread" members="tag_thread ASC" />
<index name="tag_session" members="tag_session ASC" />
<index name="tag_request" members="tag_request ASC" />
......@@ -22,19 +24,19 @@
</updatesets>
<query-defs>
<query name="find-by-PK" type="SELECT">
<param name="key-message-id" />
<statement><![CDATA[SELECT <FIELDS/> FROM <TABLE/> WHERE <FIELD name='message-id'/> = ${key-message-id}]]></statement>
<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-message-id" />
<statement><![CDATA[UPDATE <TABLE/> SET <FIELDS/> WHERE <FIELD name='message-id'/> = ${key-message-id}]]></statement>
<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-message-id" />
<statement><![CDATA[DELETE FROM <TABLE/> WHERE <FIELD name='message-id'/> = ${key-message-id}]]></statement>
<param name="key-id" />
<statement><![CDATA[DELETE FROM <TABLE/> WHERE <FIELD name='id'/> = ${key-id}]]></statement>
</query>
</query-defs>
</entity>
......@@ -42,13 +44,13 @@
<member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
<member name="type" field="type" value-type="int" length="3" nullable="false" />
<member name="name" field="name" value-type="String" length="20" nullable="false" />
<member name="ip" field="ip" value-type="String" length="20" />
<member name="domain" field="domain" value-type="String" length="20" nullable="false" />
<member name="period" field="period" value-type="Date" nullable="false" />
<member name="content" field="content" value-type="String" length="16777215" 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="period_domain_name_type" unique="true" members="period ASC, domain ASC, name ASC, type ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
......@@ -74,27 +76,27 @@
</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="500" nullable="false" />
<member name="total-count" field="TotalCount" value-type="int" length="10" nullable="false" />
<member name="failures" field="Failures" value-type="int" length="10" nullable="false" />
<member name="long-sqls" field="LongSqls" value-type="int" length="10" nullable="false" />
<member name="min-value" field="MinValue" value-type="double" length="22" nullable="false" />
<member name="max-value" field="MaxValue" value-type="double" length="22" nullable="false" />
<member name="avg2-value" field="Avg2Value" value-type="double" length="22" nullable="false" />
<member name="sum-value" field="SumValue" value-type="double" length="22" nullable="false" />
<member name="sum2-value" field="Sum2Value" value-type="double" length="22" nullable="false" />
<member name="sample-link" field="SampleLink" value-type="String" length="64" nullable="false" />
<member name="transaction-date" field="TransactionDate" value-type="Date" nullable="false" />
<member name="creation-date" field="CreationDate" value-type="Date" nullable="false" />
<member name="duration-distribution" field="DurationDistribution" value-type="String" length="500" nullable="false" />
<member name="hits-over-time" field="HitsOverTime" value-type="String" length="500" nullable="false" />
<member name="duration-over-time" field="DurationOverTime" value-type="String" length="500" nullable="false" />
<member name="failure-over-time" field="FailureOverTime" value-type="String" length="500" nullable="false" />
<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="500" 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" />
<primary-key name="PRIMARY" members="id" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
......
cat-job/src/main/resources/META-INF/dal/jdbc/dal-report.xml
浏览文件 @ 0819827d
......@@ -42,6 +42,14 @@
WHERE <FIELD name='message-id'/> <IN> ${message-ids} </IN>
]]></statement>
</query>
<query name="find-by-message-id" type="SELECT" multiple="false">
<param name="message-id" />
<statement><![CDATA[
SELECT <FIELDS/>
FROM <TABLE/>
WHERE <FIELD name='message-id'/> = ${message-id} </IN>
]]></statement>
</query>
</query-defs>
</entity>
<entity name="report" table="report" alias="r">
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或