From ce68bc1077424a88ea0c03dfdfd7345f46a361e4 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 21 May 2011 12:12:59 +0000 Subject: [PATCH] =?UTF-8?q?SqlStat=E6=B7=BB=E5=8A=A0DbType=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@182 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../com/alibaba/druid/sql/parser/SQLParser.java | 4 +++- .../java/com/alibaba/druid/stat/JdbcSqlStat.java | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java index 20c68e7577..7d4c0ecf9c 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java @@ -112,6 +112,8 @@ public class SQLParser { private int errorEndPos = -1; protected void setErrorEndPos(int errPos) { - if (errPos > errorEndPos) errorEndPos = errPos; + if (errPos > errorEndPos) { + errorEndPos = errPos; + } } } diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java index 38b3e27d74..3f5b97d307 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java @@ -50,6 +50,7 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { private final AtomicLong concurrentMax = new AtomicLong(); private String name; private String file; + private String dbType; private long executeNanoSpanMaxOccurTime; @@ -60,6 +61,14 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { private final AtomicLong updateCount = new AtomicLong(); private final AtomicLong fetchRowCount = new AtomicLong(); + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } + public String getDataSource() { return dataSource; } @@ -310,11 +319,11 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { OpenType[] indexTypes = new OpenType[] { SimpleType.LONG, SimpleType.STRING, SimpleType.STRING, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.DATE, SimpleType.LONG, JMXUtils.getThrowableCompositeType(), SimpleType.LONG, SimpleType.LONG, SimpleType.DATE, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, - SimpleType.STRING, SimpleType.DATE }; + SimpleType.STRING, SimpleType.DATE, SimpleType.STRING }; String[] indexNames = { "ID", "DataSource", "SQL", "ExecuteCount", "ErrorCount", "TotalTime", "LastTime", "MaxTimespan", "LastError", "EffectedRowCount", "FetchRowCount", "MaxTimespanOccurTime", "BatchSizeMax", "BatchSizeTotal", "ConcurrentMax", "RunningCount", "Name", "File", - "LastErrorMessage", "LastErrorClass", "LastErrorStackTrace", "LastErrorTime" }; + "LastErrorMessage", "LastErrorClass", "LastErrorStackTrace", "LastErrorTime", "DbType" }; String[] indexDescriptions = indexNames; COMPOSITE_TYPE = new CompositeType("SqlStatistic", "Sql Statistic", indexNames, indexDescriptions, indexTypes); @@ -366,6 +375,8 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { map.put("LastErrorTime", null); } + map.put("DbType", dbType); + return new CompositeDataSupport(getCompositeType(), map); }