Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
ba301b40
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ba301b40
编写于
10月 09, 2012
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
ssh://192.168.8.22:58422/cat
上级
f0011a95
0143f428
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
24 deletion
+19
-24
cat-consumer/src/main/java/com/dianping/cat/consumer/build/CatDatabaseConfigurator.java
.../dianping/cat/consumer/build/CatDatabaseConfigurator.java
+2
-2
cat-consumer/src/main/resources/META-INF/plexus/components.xml
...onsumer/src/main/resources/META-INF/plexus/components.xml
+3
-3
cat-consumer/src/test/java/com/dianping/cat/consumer/AllTests.java
...mer/src/test/java/com/dianping/cat/consumer/AllTests.java
+11
-14
cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/TransactionReportMessageAnalyzerTest.java
...mer/transaction/TransactionReportMessageAnalyzerTest.java
+0
-3
cat-home/src/main/resources/META-INF/dal/jdbc/alarm-dal.xml
cat-home/src/main/resources/META-INF/dal/jdbc/alarm-dal.xml
+3
-2
未找到文件。
cat-consumer/src/main/java/com/dianping/cat/consumer/build/CatDatabaseConfigurator.java
浏览文件 @
ba301b40
...
...
@@ -11,8 +11,8 @@ final class CatDatabaseConfigurator extends AbstractJdbcResourceConfigurator {
public
List
<
Component
>
defineComponents
()
{
List
<
Component
>
all
=
new
ArrayList
<
Component
>();
//
all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://192.168.7.43:3306/cat", "dpcom_cat", "password", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
all
.
add
(
defineJdbcDataSourceComponent
(
"cat"
,
"com.mysql.jdbc.Driver"
,
"jdbc:mysql://127.0.0.1:3306/cat"
,
"root"
,
""
,
"<![CDATA[useUnicode=true&autoReconnect=true]]>"
));
all
.
add
(
defineJdbcDataSourceComponent
(
"cat"
,
"com.mysql.jdbc.Driver"
,
"jdbc:mysql://192.168.7.43:3306/cat"
,
"dpcom_cat"
,
"password"
,
"<![CDATA[useUnicode=true&autoReconnect=true]]>"
));
//
all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://127.0.0.1:3306/cat", "root", "", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
defineSimpleTableProviderComponents
(
all
,
"cat"
,
com
.
dainping
.
cat
.
consumer
.
dal
.
report
.
_INDEX
.
getEntityClasses
());
defineDaoComponents
(
all
,
com
.
dainping
.
cat
.
consumer
.
dal
.
report
.
_INDEX
.
getDaoClasses
());
...
...
cat-consumer/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
ba301b40
...
...
@@ -292,9 +292,9 @@
<statement-cache-size>
1000
</statement-cache-size>
<properties>
<driver>
com.mysql.jdbc.Driver
</driver>
<URL>
jdbc:mysql://1
27.0.0.1
:3306/cat
</URL>
<user>
roo
t
</user>
<password></password>
<URL>
jdbc:mysql://1
92.168.7.43
:3306/cat
</URL>
<user>
dpcom_ca
t
</user>
<password>
password
</password>
<connectionProperties>
<![CDATA[useUnicode=true&autoReconnect=true]]>
</connectionProperties>
</properties>
</configuration>
...
...
cat-consumer/src/test/java/com/dianping/cat/consumer/AllTests.java
浏览文件 @
ba301b40
...
...
@@ -11,10 +11,7 @@ import com.dianping.cat.consumer.problem.model.ProblemReportTest;
import
com.dianping.cat.consumer.transaction.FormatTest
;
import
com.dianping.cat.consumer.transaction.GsonTest
;
import
com.dianping.cat.consumer.transaction.NumberFormatTest
;
import
com.dianping.cat.consumer.transaction.TransactionAnalyzerTest
;
import
com.dianping.cat.consumer.transaction.TransactionReportFilterTest
;
import
com.dianping.cat.consumer.transaction.TransactionReportMessageAnalyzerTest
;
import
com.dianping.cat.consumer.transaction.TransactionReportTest
;
@RunWith
(
Suite
.
class
)
@SuiteClasses
({
...
...
@@ -22,28 +19,28 @@ import com.dianping.cat.consumer.transaction.TransactionReportTest;
/* .ip */
IpReportTest
.
class
,
TransactionAnalyzerTest
.
class
,
//
TransactionAnalyzerTest.class,
TransactionReportMessageAnalyzerTest
.
class
,
//
TransactionReportMessageAnalyzerTest.class,
TransactionReportTest
.
class
,
//
TransactionReportTest.class,
// ManyAnalyzerTest.class,
// OneAnalyzerTwoDurationTest.class,
// OneAnalyzerTwoDurationTest.class,
ProblemReportTest
.
class
,
ProblemReportTest
.
class
,
FormatTest
.
class
,
GsonTest
.
class
,
FormatTest
.
class
,
GsonTest
.
class
,
NumberFormatTest
.
class
,
NumberFormatTest
.
class
,
MatrixReportFilterTest
.
class
,
MatrixReportFilterTest
.
class
,
TransactionReportFilterTest
.
class
,
TransactionReportFilterTest
.
class
,
/* cross analyzer */
ParseCrossInfoTest
.
class
})
/* cross analyzer */
ParseCrossInfoTest
.
class
})
public
class
AllTests
{
}
cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/TransactionReportMessageAnalyzerTest.java
浏览文件 @
ba301b40
...
...
@@ -91,9 +91,6 @@ public class TransactionReportMessageAnalyzerTest extends ComponentTestCase {
assertEquals
(
1000.0
,
n2
.
getMax
());
assertEquals
(
500.5
,
n2
.
getAvg
());
assertEquals
(
500500.0
,
n2
.
getSum
());
// System.out.println(new DefaultJsonBuilder().buildJson(report));
// System.out.println(report.toString());
}
}
cat-home/src/main/resources/META-INF/dal/jdbc/alarm-dal.xml
浏览文件 @
ba301b40
...
...
@@ -43,7 +43,7 @@
<query
name=
"find-all-alarm-rule"
type=
"SELECT"
multiple=
"true"
>
<statement>
<![CDATA[
SELECT <FIELDS/>
FROM
<TABLE/>
FROM
<TABLE/>
ORDER BY
<FIELD
name=
'domain'
/>
ASC
]]>
</statement>
</query>
<query
name=
"find-all-alarm-rule-by-template-id"
type=
"SELECT"
...
...
@@ -52,7 +52,7 @@
<statement>
<![CDATA[
SELECT <FIELDS/>
FROM
<TABLE/>
WHERE
<FIELD
name=
'template-id'
/>
= ${template-id}
WHERE
<FIELD
name=
'template-id'
/>
= ${template-id}
ORDER BY
<FIELD
name=
'domain'
/>
ASC
]]>
</statement>
</query>
</query-defs>
...
...
@@ -114,6 +114,7 @@
<statement>
<![CDATA[
SELECT <FIELDS/>
FROM
<TABLE/>
ORDER BY
<FIELD
name=
'domain'
/>
ASC
]]>
</statement>
</query>
</query-defs>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录