Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

StatFilter mergeSql support tddl

Browse Source
This commit is contained in:
wenshao
2013-04-30 02:34:59 +08:00
parent b45031a787
commit 1b2ffe9d80
8 changed files with 230 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+23 -1
View File
@@ -130,6 +130,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
private JdbcDataSourceStat dataSourceStat;
private boolean useGloalDataSourceStat = false;
public DruidDataSource(){
this(false);
}
@@ -149,6 +151,22 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.setValidationQuery(property);
}
}
{
String property = System.getProperty("druid.useGloalDataSourceStat");
if ("true".equals(property)) {
this.setUseGloalDataSourceStat(true);
} else if ("false".equals(property)) {
this.setUseGloalDataSourceStat(false);
}
}
}
public boolean isUseGloalDataSourceStat() {
return useGloalDataSourceStat;
}
public void setUseGloalDataSourceStat(boolean useGloalDataSourceStat) {
this.useGloalDataSourceStat = useGloalDataSourceStat;
}
public String getInitStackTrace() {
@@ -435,7 +453,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
}
dataSourceStat = new JdbcDataSourceStat(this.name, this.jdbcUrl, this.dbType);
if (useGloalDataSourceStat) {
dataSourceStat = JdbcDataSourceStat.getGlobal();
} else {
dataSourceStat = new JdbcDataSourceStat(this.name, this.jdbcUrl, this.dbType);
}
connections = new DruidConnectionHolder[maxActive];
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java
+28 -1
View File
@@ -17,17 +17,20 @@ package com.alibaba.druid.sql.dialect.mysql.visitor;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
import com.alibaba.druid.sql.ast.expr.SQLNCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLNullExpr;
import com.alibaba.druid.sql.ast.expr.SQLNumberExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement;
import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils;
public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor {
public MySqlParameterizedOutputVisitor() {
public MySqlParameterizedOutputVisitor(){
this(new StringBuilder());
}
@@ -39,6 +42,30 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor {
return ParameterizedOutputVisitorUtils.visit(this, x);
}
public boolean visit(SQLIdentifierExpr x) {
String name = x.getName();
if (x.getParent() instanceof SQLExprTableSource || x.getParent() instanceof SQLPropertyExpr) {
int pos = name.lastIndexOf('_');
if (pos != -1 && pos != name.length()) {
boolean isNumber = true;
for (int i = pos + 1; i < name.length(); ++i) {
char ch = name.charAt(i);
if (ch < '0' || ch > '9') {
isNumber = false;
break;
}
}
if (isNumber) {
String realName = name.substring(0, pos);
print(realName);
return false;
}
}
}
print(name);
return false;
}
public boolean visit(SQLBinaryOpExpr x) {
x = ParameterizedOutputVisitorUtils.merge(x);
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+2 -2
View File
@@ -458,8 +458,8 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter {
return false;
}
public boolean visit(SQLIdentifierExpr astNode) {
print(astNode.getName());
public boolean visit(SQLIdentifierExpr x) {
print(x.getName());
return false;
}
src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java
+12
View File
@@ -70,6 +70,18 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean {
private final AtomicLong blobOpenCount = new AtomicLong();
private static JdbcDataSourceStat global = new JdbcDataSourceStat(
"global",
"global");
public static JdbcDataSourceStat getGlobal() {
return global;
}
public static void setGlobal(JdbcDataSourceStat value) {
global = value;
}
public JdbcDataSourceStat(String name, String url){
this(name, url, null);
}
src/main/java/com/alibaba/druid/stat/JdbcStatManager.java
+39 -13
View File
@@ -36,17 +36,17 @@ import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl;
public final class JdbcStatManager implements JdbcStatManagerMBean {
private final AtomicLong sqlIdSeed = new AtomicLong(1000);
private final AtomicLong sqlIdSeed = new AtomicLong(1000);
private final static JdbcStatManager instance = new JdbcStatManager();
private final static JdbcStatManager instance = new JdbcStatManager();
private final JdbcConnectionStat connectionStat = new JdbcConnectionStat();
private final JdbcResultSetStat resultSetStat = new JdbcResultSetStat();
private final JdbcStatementStat statementStat = new JdbcStatementStat();
private final JdbcConnectionStat connectionStat = new JdbcConnectionStat();
private final JdbcResultSetStat resultSetStat = new JdbcResultSetStat();
private final JdbcStatementStat statementStat = new JdbcStatementStat();
private final AtomicLong resetCount = new AtomicLong();
private final AtomicLong resetCount = new AtomicLong();
public final ThreadLocal<JdbcStatContext> contextLocal = new ThreadLocal<JdbcStatContext>();
public final ThreadLocal<JdbcStatContext> contextLocal = new ThreadLocal<JdbcStatContext>();
private JdbcStatManager(){
@@ -296,26 +296,52 @@ public final class JdbcStatManager implements JdbcStatManagerMBean {
TabularType tabularType = new TabularType("SqlListStatistic", "SqlListStatistic", rowType, indexNames);
TabularData data = new TabularDataSupport(tabularType);
for (DataSourceProxyImpl dataSource : DruidDriver.getProxyDataSources().values()) {
Map<String, JdbcSqlStat> statMap = dataSource.getDataSourceStat().getSqlStatMap();
JdbcDataSourceStat globalStat = JdbcDataSourceStat.getGlobal();
{
Map<String, JdbcSqlStat> statMap = globalStat.getSqlStatMap();
for (Map.Entry<String, JdbcSqlStat> entry : statMap.entrySet()) {
if (entry.getValue().getExecuteCount() == 0 && entry.getValue().getRunningCount() == 0) {
continue;
}
Map<String, Object> map = entry.getValue().getData();
map.put("URL", globalStat.getUrl());
data.put(new CompositeDataSupport(JdbcSqlStat.getCompositeType(), map));
}
}
for (DataSourceProxyImpl dataSource : DruidDriver.getProxyDataSources().values()) {
JdbcDataSourceStat druidDataSourceStat = dataSource.getDataSourceStat();
if (druidDataSourceStat == globalStat) {
continue;
}
Map<String, JdbcSqlStat> statMap = druidDataSourceStat.getSqlStatMap();
for (Map.Entry<String, JdbcSqlStat> entry : statMap.entrySet()) {
if (entry.getValue().getExecuteCount() == 0 && entry.getValue().getRunningCount() == 0) {
continue;
}
Map<String, Object> map = entry.getValue().getData();
map.put("URL", dataSource.getUrl());
data.put(new CompositeDataSupport(JdbcSqlStat.getCompositeType(), map));
}
}
for (DruidDataSource dataSource : DruidDataSourceStatManager.getDruidDataSourceInstances()) {
Map<String, JdbcSqlStat> statMap = dataSource.getDataSourceStat().getSqlStatMap();
JdbcDataSourceStat druidDataSourceStat = dataSource.getDataSourceStat();
if (druidDataSourceStat == globalStat) {
continue;
}
Map<String, JdbcSqlStat> statMap = druidDataSourceStat.getSqlStatMap();
for (Map.Entry<String, JdbcSqlStat> entry : statMap.entrySet()) {
if (entry.getValue().getExecuteCount() == 0 && entry.getValue().getRunningCount() == 0) {
continue;
}
Map<String, Object> map = entry.getValue().getData();
map.put("URL", dataSource.getUrl());
data.put(new CompositeDataSupport(JdbcSqlStat.getCompositeType(), map));