From 7a7f77182b496da7bc853db441b629633662cce6 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 14 Aug 2013 19:37:25 +0800 Subject: [PATCH] bug fixed --- doc/druid-monitor-sql.sql | 34 +++++++++++++++++-- .../mysql/visitor/MySqlOutputVisitor.java | 2 +- .../alibaba/druid/stat/JdbcSqlStatValue.java | 4 +-- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/doc/druid-monitor-sql.sql b/doc/druid-monitor-sql.sql index 255d32e516..ac78b07b03 100644 --- a/doc/druid-monitor-sql.sql +++ b/doc/druid-monitor-sql.sql @@ -1,3 +1,31 @@ +INSERT INTO druid_sql (domain, app, cluster, host, pid + , collectTime, sqlHash, dataSource, lastStartTime, batchTotal + , batchToMax, execSuccessCount, execNanoTotal, execNanoMax, running + , concurrentMax, rsHoldTime, execRsHoldTime, name, file + , dbType, execNanoMaxOccurTime, errorCount, errorLastMsg, errorLastClass + , errorLastStackTrace, errorLastTime, updateCount, updateCountMax, fetchRowCount + , fetchRowCountMax, inTxnCount, lastSlowParameters, clobOpenCount, blobOpenCount + , readStringLength, readBytesLength, inputStreamOpenCount, readerOpenCount, h1 + , h10, h100, h1000, h10000, h100000 + , h1000000, hmore, eh1, eh10, eh100 + , eh1000, eh10000, eh100000, eh1000000, ehmore + , f1, f10, f100, f1000, f10000 + , fmore, u1, u10, u100, u1000 + , u10000, umore) +VALUES (?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?, ?, ?, ? + , ?, ?) CREATE TABLE druid_sql ( id bigint(20) NOT NULL, domain varchar(45), @@ -16,8 +44,8 @@ CREATE TABLE druid_sql ( execNanoMax bigint(20), running int(10), concurrentMax int(10), - running bigint(20), - executeAndResultSetHoldTime bigint(20), + rsHoldTime bigint(20), + execRsHoldTime bigint(20), name varchar(256), file varchar(256), dbType varchar(256), @@ -67,5 +95,5 @@ CREATE TABLE druid_sql ( u1000 int(10), u10000 int(10), umore int(10), - PRIAMRY KEY (id) + PRIMARY KEY (id) ) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index fbe629c75e..b3940652e1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -541,7 +541,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print(' '); } - print("PRIAMRY KEY"); + print("PRIMARY KEY"); if (x.getIndexType() != null) { print(" USING "); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStatValue.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStatValue.java index 4cca7750c9..a37a33cd78 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStatValue.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStatValue.java @@ -63,10 +63,10 @@ public class JdbcSqlStatValue { @MField protected int concurrentMax; - @MField(name = "running") + @MField(name = "rsHoldTime") protected long resultSetHoldTimeNano; - @MField + @MField(name = "execRsHoldTime") protected long executeAndResultSetHoldTime; @MField