modify the cat jdbc problem

cat-consumer/pom.xml

@@ -30,7 +30,7 @@
 			<plugin>
 				<groupId>com.site.maven.plugins</groupId>
 				<artifactId>maven-codegen-plugin</artifactId>
-				<version>1.0.10</version>
+				<version>1.0.12</version>
 				<executions>
 					<execution>
 						<id>generate problem report model</id>

cat-core/pom.xml

@@ -39,7 +39,7 @@
 			<plugin>
 				<groupId>com.site.maven.plugins</groupId>
 				<artifactId>maven-codegen-plugin</artifactId>
-				<version>1.0.11</version>
+				<version>1.0.12</version>
 				<executions>
 					<execution>
 						<id>default-cli</id>

cat-home/src/main/java/com/dianping/cat/report/page/sql/Handler.java

@@ -60,10 +60,10 @@ public class Handler implements PageHandler<Context> {
 		try {
 			SqlReportRecord record = m_dao.findByPK(id, SqlReportRecordEntity.READSET_FULL);
 			String statement = record.getStatement();
-			String durationDistribution = record.getDurationdistribution();
-			String durationOvertime = record.getDurationovertime();
-			String hitsovOvrtime = record.getHitsovertime();
-			String failureOvertime = record.getFailureovertime();
+			String durationDistribution = record.getDurationDistribution();
+			String durationOvertime = record.getDurationOverTime();
+			String hitsovOvrtime = record.getHitsOverTime();
+			String failureOvertime = record.getFailureOverTime();
 
 			String graph1 = m_builder.build(new SqlGraphPayload(0, "SQL Exeture Time Distribution", "Duration (ms)",
 			      "Count", durationDistribution));

cat-home/src/main/java/com/dianping/cat/report/page/sql/SqlReportModel.java

@@ -11,21 +11,21 @@ public class SqlReportModel {
 	}
 
 	public double getFailurePercent() {
-		return (double)m_record.getFailures() / (double)m_record.getTotalcount();
+		return (double)m_record.getFailures() / (double)m_record.getTotalCount();
 	}
 
 	public double getLongPercent() {
-		return (double)m_record.getLongsqls() / (double)m_record.getTotalcount();
+		return (double)m_record.getLongSqls() / (double)m_record.getTotalCount();
 	}
 
 	public double getAvg() {
-		return (double)m_record.getSumvalue() / (double)m_record.getTotalcount();
+		return (double)m_record.getSumvalue() / (double)m_record.getTotalCount();
 	}
 
 	public double getStd() {
 		double sum2 = m_record.getSum2value();
-		int count = m_record.getTotalcount();
-		double avg = m_record.getSumvalue() / m_record.getTotalcount();
+		int count = m_record.getTotalCount();
+		double avg = m_record.getSumvalue() / m_record.getTotalCount();
 		return Math.sqrt(sum2 / count - avg * avg);
 	}
 

cat-job/src/main/java/com/dianping/cat/job/sql/database/SqlRecordJobReducer.java

@@ -20,9 +20,9 @@ public class SqlRecordJobReducer extends Reducer<Text, Text, Text, Text> {
 			SqlReportRecordDao dao = ContainerBootstrap.INSTANCE.lookup(SqlReportRecordDao.class);
 			SqlReportRecord row = dao.createLocal();
 			row.setDomain(sql.getDomain());
-			row.setTotalcount(sql.getTotalCount());
+			row.setTotalCount(sql.getTotalCount());
 			row.setFailures(sql.getFailureCount());
-			row.setLongsqls(sql.getLongCount());
+			row.setLongSqls(sql.getLongCount());
 			row.setAvg2value(sql.getAvg2());
 			row.setSumvalue(sql.getSum());
 			row.setSum2value(sql.getSum2());
@@ -30,13 +30,13 @@ public class SqlRecordJobReducer extends Reducer<Text, Text, Text, Text> {
 			row.setMinvalue(sql.getMin());
 			row.setStatement(sql.getStatement());
 			row.setName(sql.getName());
-			row.setSamplelink(sql.getSampleLink());
-			row.setTransactiondate(sql.getDate());
-			row.setCreationdate(new Date());
-			row.setDurationdistribution(sql.getDurationDistribution());
-			row.setHitsovertime(sql.getHitsOverTime());
-			row.setDurationovertime(sql.getDurationOverTime());
-			row.setFailureovertime(sql.getFailureOverTime());
+			row.setSampleLink(sql.getSampleLink());
+			row.setTransactionDate(sql.getDate());
+			row.setCreationDate(new Date());
+			row.setDurationDistribution(sql.getDurationDistribution());
+			row.setHitsOverTime(sql.getHitsOverTime());
+			row.setDurationOverTime(sql.getDurationOverTime());
+			row.setFailureOverTime(sql.getFailureOverTime());
 			dao.insert(row);
 		} catch (ComponentLookupException e) {
 			e.printStackTrace();

cat-job/src/main/resources/META-INF/dal/jdbc/codegen.xml

@@ -3,23 +3,23 @@
   <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="totalcount" field="TotalCount" value-type="int" length="10" 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="longsqls" field="LongSqls" value-type="int" length="10" nullable="false" />
-    <member name="minvalue" field="MinValue" value-type="long" length="22" nullable="false" />
-    <member name="maxvalue" field="MaxValue" value-type="long" length="22" nullable="false" />
-    <member name="avg2value" field="Avg2Value" value-type="long" length="22" nullable="false" />
-    <member name="sumvalue" field="SumValue" value-type="long" length="22" nullable="false" />
-    <member name="sum2value" field="Sum2Value" value-type="long" length="22" nullable="false" />
-    <member name="samplelink" field="SampleLink" value-type="String" length="64" nullable="false" />
-    <member name="transactiondate" field="TransactionDate" value-type="Date" nullable="false" />
-    <member name="creationdate" field="CreationDate" value-type="Date" nullable="false" />
-    <member name="name" field="Name" value-type="String" length="100" nullable="false" />
-    <member name="durationdistribution" field="durationDistribution" value-type="String" length="500" nullable="false" />
-    <member name="hitsovertime" field="hitsOverTime" value-type="String" length="500" nullable="false" />
-    <member name="durationovertime" field="durationOverTime" value-type="String" length="500" nullable="false" />
-    <member name="failureovertime" field="failureOverTime" value-type="String" length="500" 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" />
     <var name="key-id" value-type="int" key-member="id" />
     <primary-key name="PRIMARY" members="Id" />
     <readsets>

cat-job/src/main/resources/META-INF/dal/jdbc/dal.xml

@@ -17,19 +17,19 @@
 		<query-defs>
 			<query name="find-all-by-domain-and-date" type="SELECT" multiple="true">
 				<param name="domain" />
-				<param name="transactiondate" />
+				<param name="transaction-date" />
 				<statement><![CDATA[
 				SELECT <FIELDS/> FROM <TABLE/> 
 				WHERE <FIELD name='domain'/> = ${domain} 
-					AND <FIELD name='transactiondate'/> = ${transactiondate}
+					AND <FIELD name='transaction-date'/> = ${transaction-date}
 				]]></statement>
 			</query>
 			
 			<query name="find-all-distinct-by-date" type="SELECT" multiple="true">
-				<param name="transactiondate" />
+				<param name="transaction-date" />
 				<statement><![CDATA[
 				SELECT distinct <FIELDS/> FROM <TABLE/> 
-				WHERE <FIELD name='transactiondate'/> = ${transactiondate} 
+				WHERE <FIELD name='transaction-date'/> = ${transaction-date} 
 				]]></statement>
 			</query>
 		</query-defs>