Skip to content

C
cat

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

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 4b89e460 编写于 作者: Y youyong205
浏览文件
操作

modify the dal

上级 1b968735
隐藏空白更改
内联 并排
Showing with 59 addition and 154 deletion
cat-consumer/src/main/resources/META-INF/dal/jdbc/report-codegen.xml
浏览文件 @ 4b89e460
......@@ -42,84 +42,5 @@
</query>
</query-defs>
</entity>
<entity name="sqltable" table="sqltable" 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" />
<member name="sql-name" field="sql_name" value-type="String" length="100" />
<member name="table-name" field="table_name" value-type="String" length="100" />
<member name="sql-statement" field="sql_statement" value-type="String" length="65535" />
<member name="creation-date" field="creation_date" value-type="Date" />
<member name="modify-date" field="modify_date" value-type="Date" />
<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="user-agent" table="user_agent" alias="ua">
<member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
<member name="user-agent" field="userAgent" value-type="String" length="200" nullable="false" />
<member name="browser" field="browser" value-type="String" length="100" />
<member name="version" field="version" value-type="String" length="100" />
<member name="os" field="os" value-type="String" length="100" />
<var name="key-id" value-type="int" key-member="id" />
<primary-key name="PRIMARY" members="id" />
<index name="userAgent" members="userAgent 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>
</entities>
cat-consumer/src/main/resources/META-INF/dal/jdbc/report-dal.xml
浏览文件 @ 4b89e460
<?xml version="1.0" encoding="UTF-8"?>
<entities do-package="com.dianping.cat.consumer.dal" gen="true">
<entity name="sqltable">
<member name="creation-date" insert-expr="NOW()" />
<member name="modify-date" insert-expr="NOW()" update-expr="NOW()" />
<query-defs>
<query name="find-all-by-domain" type="SELECT" multiple="true">
<param name="domain" />
<statement><![CDATA[SELECT <FIELDS/> FROM <TABLE/> WHERE <FIELD name='domain'/> = ${domain}]]></statement>
</query>
</query-defs>
</entity>
<entity name="business-report" table="businessReport" alias="b">
<member name="creation-date" insert-expr="NOW()" />
<var name="start-date" value-type="Date" />
......@@ -34,14 +24,4 @@
</query>
</query-defs>
</entity>
<entity name="user-agent" table="user_agent" alias="ua">
<query-defs>
<query name="find-all" type="SELECT" multiple="true">
<statement><![CDATA[
SELECT <FIELDS/>
FROM <TABLE/>
]]></statement>
</query>
</query-defs>
</entity>
</entities>
\ No newline at end of file
cat-consumer/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ 4b89e460
......@@ -726,26 +726,6 @@
<data-source-name>cat</data-source-name>
</configuration>
</component>
<component>
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
<role-hint>sqltable</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>sqltable</logical-table-name>
<physical-table-name>sqltable</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
</component>
<component>
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
<role-hint>user-agent</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>user-agent</logical-table-name>
<physical-table-name>user_agent</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
</component>
<component>
<role>com.dianping.cat.consumer.dal.BusinessReportDao</role>
<implementation>com.dianping.cat.consumer.dal.BusinessReportDao</implementation>
......@@ -755,23 +735,5 @@
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.consumer.dal.SqltableDao</role>
<implementation>com.dianping.cat.consumer.dal.SqltableDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.consumer.dal.UserAgentDao</role>
<implementation>com.dianping.cat.consumer.dal.UserAgentDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
</components>
</plexus>
cat-consumer/src/main/resources/META-INF/wizard/jdbc/wizard.xml
浏览文件 @ 4b89e460
......@@ -9,9 +9,7 @@
<properties>useUnicode=true&amp;autoReconnect=true</properties>
</datasource>
<group name="report" package="com.dainping.cat.consumer.dal.report">
<table name="sqltable"/>
<table name="businessReport"/>
<table name="user_agent"/>
</group>
</jdbc>
</wizard>
cat-core/src/main/resources/META-INF/dal/jdbc/report-dal.xml
浏览文件 @ 4b89e460
......@@ -538,6 +538,7 @@
</query-defs>
</entity>
<entity name="monthly-report-content" table="monthly_report_content" alias="mrc">
<member name="creation-date" insert-expr="NOW()" />
<member name="content-length" value-type="double" all="false" select-expr="length(content)/1024/1024" length="19" nullable="false" />
<var name="capacity" value-type="double" />
<var name="start-id" value-type="int" />
......@@ -560,6 +561,7 @@
</query-defs>
</entity>
<entity name="weekly-report-content" table="weekly_report_content" alias="wrc">
<member name="creation-date" insert-expr="NOW()" />
<member name="content-length" value-type="double" all="false" select-expr="length(content)/1024/1024" length="19" nullable="false" />
<var name="capacity" value-type="double" />
<var name="start-id" value-type="int" />
......@@ -582,6 +584,7 @@
</query-defs>
</entity>
<entity name="daily-report-content" table="daily_report_content" alias="drc">
<member name="creation-date" insert-expr="NOW()" />
<member name="content-length" value-type="double" all="false" select-expr="length(content)/1024/1024" length="19" nullable="false" />
<var name="start-id" value-type="int" />
<var name="end-id" value-type="int" />
......
cat-home/src/main/java/com/dianping/cat/report/ReportModule.java
浏览文件 @ 4b89e460
......@@ -4,7 +4,7 @@ import org.unidal.web.mvc.AbstractModule;
import org.unidal.web.mvc.annotation.ModuleMeta;
import org.unidal.web.mvc.annotation.ModulePagesMeta;
@ModuleMeta(name = "r", defaultInboundAction = "top", defaultTransition = "default", defaultErrorAction = "default")
@ModuleMeta(name = "r", defaultInboundAction = "home", defaultTransition = "default", defaultErrorAction = "default")
@ModulePagesMeta({
com.dianping.cat.report.page.home.Handler.class,
......
cat-home/src/test/java/com/dianping/cat/demo/TestMaxMessage.java
浏览文件 @ 4b89e460
package com.dianping.cat.demo;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.junit.Test;
import org.unidal.helper.Threads;
import org.unidal.helper.Threads.Task;
import com.dianping.cat.Cat;
import com.dianping.cat.helper.TimeHelper;
import com.dianping.cat.message.Message;
import com.dianping.cat.message.Transaction;
import com.dianping.cat.message.spi.MessageTree;
......@@ -105,4 +111,52 @@ public class TestMaxMessage {
Thread.sleep(10 * 1000);
}
@Test
public void testThread() throws InterruptedException {
ConcurrentHashMap<String, String> map = new ConcurrentHashMap<String, String>();
Threads.forGroup("f").start(new ThreadTest(map));
Thread.sleep(TimeHelper.ONE_SECOND);
int index = 0;
synchronized (map) {
for (Entry<String, String> entry : map.entrySet()) {
System.out.println("index:" + index + " " + entry.getKey() + " " + entry.getValue());
Thread.sleep(25);
index++;
}
}
}
public class ThreadTest implements Task {
ConcurrentHashMap<String, String> m_map;
public ThreadTest(ConcurrentHashMap<String, String> map) {
m_map = map;
}
@Override
public void run() {
for (int i = 0; i < 1000; i++) {
m_map.put(String.valueOf(i), String.valueOf(i));
try {
Thread.sleep(10);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
@Override
public String getName() {
return "cat";
}
@Override
public void shutdown() {
}
}
}
\ No newline at end of file
script/Cat.sql
浏览文件 @ 4b89e460
......@@ -121,26 +121,13 @@ CREATE TABLE `businessReport` (
`name` varchar(20) NOT NULL COMMENT '报表名称',
`ip` varchar(50) NOT NULL COMMENT '报表来自于哪台机器',
`productLine` varchar(50) NOT NULL COMMENT '指标来源于哪个产品组',
`period` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '报表时间段',
`period` timestamp NOT NULL COMMENT '报表时间段',
`content` longblob COMMENT '用于存放报表的具体内容',
`creation_date` timestamp NOT NULL COMMENT '报表创建时间',
PRIMARY KEY (`id`),
KEY `IX_Period_productLine_name` (`period`,`productLine`,`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPRESSED COMMENT='用于存放业务监控实时报表信息，处理之后的结果';
CREATE TABLE `sqltable` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`domain` varchar(50) DEFAULT NULL COMMENT '这条sql语句的属于项目名',
`sql_name` varchar(100) DEFAULT NULL COMMENT 'sql 语句的简写',
`table_name` varchar(100) DEFAULT NULL COMMENT 'sql语句操作的表名',
`sql_statement` text,
`creation_date` datetime DEFAULT NULL COMMENT '创建时间',
`modify_date` datetime DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`),
KEY `domain` (`domain`),
KEY `sql_name` (`sql_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用于存放SQL和操作的表名的关系';
CREATE TABLE `task` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`producer` varchar(20) NOT NULL COMMENT '任务创建者ip',
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或