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

refactor & add testcase

Browse Source
This commit is contained in:
wenshao
2012-07-20 07:44:06 +08:00
parent 88ebf7d3db
commit 342b6af58b
6 changed files with 82 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
-4
View File
@@ -766,10 +766,6 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
return "DataSource-" + System.identityHashCode(this);
}
public String getNameInternal() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+3 -1
View File
@@ -30,6 +30,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import javax.management.ObjectName;
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.Referenceable;
@@ -377,7 +378,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
initedLatch.await();
createdTime = new Date();
DruidDataSourceStatManager.add(this);
ObjectName objectName = DruidDataSourceStatManager.add(this, this.name);
this.setObjectName(objectName);
if (connectError != null && poolingCount == 0) {
throw connectError;
src/main/java/com/alibaba/druid/sql/SQLUtils.java
+30
View File
@@ -7,15 +7,20 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerOutputVisitor;
import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor;
import com.alibaba.druid.sql.parser.ParserException;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.SQLParserUtils;
import com.alibaba.druid.sql.parser.SQLStatementParser;
import com.alibaba.druid.sql.parser.Token;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.util.JdbcUtils;
public class SQLUtils {
@@ -148,6 +153,31 @@ public class SQLUtils {
return new SQLASTOutputVisitor(out);
}
public static SchemaStatVisitor createSchemaStatVisitor(Appendable out, List<SQLStatement> statementList,
String dbType) {
if (JdbcUtils.ORACLE.equals(dbType)) {
if (statementList.size() == 1) {
return new OracleSchemaStatVisitor();
} else {
return new OracleSchemaStatVisitor();
}
}
if (JdbcUtils.MYSQL.equals(dbType)) {
return new MySqlSchemaStatVisitor();
}
if (JdbcUtils.POSTGRESQL.equals(dbType)) {
return new PGSchemaStatVisitor();
}
if (JdbcUtils.SQL_SERVER.equals(dbType)) {
return new SQLServerSchemaStatVisitor();
}
return new SchemaStatVisitor();
}
public static List<SQLStatement> parseStatements(String sql, String dbType) {
SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType);
src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
+4 -4
View File
@@ -55,7 +55,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
return instance;
}
public synchronized static void add(DruidDataSource dataSource) {
public synchronized static ObjectName add(DruidDataSource dataSource, String name) {
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
if (dataSources.size() == 0) {
try {
@@ -70,9 +70,9 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
}
ObjectName objectName = null;
if (dataSource.getNameInternal() != null) {
if (name != null) {
try {
objectName = new ObjectName("com.alibaba.druid:type=DruidDataSource,id=" + dataSource.getNameInternal());
objectName = new ObjectName("com.alibaba.druid:type=DruidDataSource,id=" + name);
mbeanServer.registerMBean(dataSource, objectName);
} catch (JMException ex) {
LOG.error("register mbean error", ex);
@@ -92,7 +92,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
}
dataSources.put(dataSource, objectName);
dataSource.setObjectName(objectName);
return objectName;
}
public synchronized static void remove(DruidDataSource dataSource) {