Skip to content

Commit

Permalink
support monitor
Browse files Browse the repository at this point in the history
  • Loading branch information
@wenshao
wenshao committed Aug 14, 2013
1 parent 5aa3d51 commit a72da37
Show file tree
Hide file tree
Showing 41 changed files with 701 additions and 284 deletions.
6 changes: 6 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,5 +545,11 @@
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions src/main/java/com/alibaba/druid/filter/FilterManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.Utils;

public class FilterManager {

Expand Down Expand Up @@ -99,7 +99,7 @@ public static void loadFilter(List<Filter> filters, String filterName) throws SQ
continue;
}

Class<?> filterClass = IOUtils.loadClass(filterClassName);
Class<?> filterClass = Utils.loadClass(filterClassName);

if (filterClass == null) {
LOG.error("load filter error, filter not found : " + filterClassName);
Expand All @@ -126,7 +126,7 @@ public static void loadFilter(List<Filter> filters, String filterName) throws SQ
return;
}

Class<?> filterClass = IOUtils.loadClass(filterName);
Class<?> filterClass = Utils.loadClass(filterName);
if (filterClass == null) {
LOG.error("load filter error, filter not found : " + filterName);
return;
Expand Down
34 changes: 17 additions & 17 deletions src/main/java/com/alibaba/druid/filter/encoding/EncodingConvertFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy;
import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
import com.alibaba.druid.proxy.jdbc.StatementProxy;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;

/**
* @author wenshao<szujobs@hotmail.com>
Expand Down Expand Up @@ -196,7 +196,7 @@ public Object decodeObject(ConnectionProxy connection, Object object) throws SQL

if (object instanceof Reader) {
Reader reader = (Reader) object;
String text = IOUtils.read(reader);
String text = Utils.read(reader);
return new StringReader(decode(connection, text));
}

Expand All @@ -210,7 +210,7 @@ public Object decodeObject(CallableStatementProxy stmt, Object object) throws SQ

if (object instanceof Reader) {
Reader reader = (Reader) object;
String text = IOUtils.read(reader);
String text = Utils.read(reader);
return new StringReader(decode(stmt.getConnectionProxy(), text));
}

Expand Down Expand Up @@ -382,7 +382,7 @@ public void preparedStatement_setString(FilterChain chain, PreparedStatementProx
@Override
public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement,
int parameterIndex, java.io.Reader reader) throws SQLException {
String text = IOUtils.read(reader);
String text = Utils.read(reader);
String encodedText = encode(statement.getConnectionProxy(), text);
super.preparedStatement_setCharacterStream(chain, statement, parameterIndex, new StringReader(encodedText));
}
Expand All @@ -391,7 +391,7 @@ public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStat
public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement,
int parameterIndex, java.io.Reader reader, int length)
throws SQLException {
String text = IOUtils.read(reader, length);
String text = Utils.read(reader, length);
String encodedText = encode(statement.getConnectionProxy(), text);
super.preparedStatement_setCharacterStream(chain, statement, parameterIndex, new StringReader(encodedText),
encodedText.length());
Expand All @@ -401,7 +401,7 @@ public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStat
public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement,
int parameterIndex, java.io.Reader reader, long length)
throws SQLException {
String text = IOUtils.read(reader, (int) length);
String text = Utils.read(reader, (int) length);
String encodedText = encode(statement.getConnectionProxy(), text);
super.preparedStatement_setCharacterStream(chain, statement, parameterIndex, new StringReader(encodedText),
encodedText.length());
Expand All @@ -414,7 +414,7 @@ public void preparedStatement_setObject(FilterChain chain, PreparedStatementProx
String encodedText = encode(statement.getConnectionProxy(), (String) x);
super.preparedStatement_setObject(chain, statement, parameterIndex, encodedText);
} else if (x instanceof Reader) {
String text = IOUtils.read((Reader) x);
String text = Utils.read((Reader) x);
String encodedText = encode(statement.getConnectionProxy(), text);
super.preparedStatement_setObject(chain, statement, parameterIndex, new StringReader(encodedText));
} else {
Expand All @@ -429,7 +429,7 @@ public void preparedStatement_setObject(FilterChain chain, PreparedStatementProx
String encodedText = encode(statement.getConnectionProxy(), (String) x);
super.preparedStatement_setObject(chain, statement, parameterIndex, encodedText, targetSqlType);
} else if (x instanceof Reader) {
String text = IOUtils.read((Reader) x);
String text = Utils.read((Reader) x);
String encodedText = encode(statement.getConnectionProxy(), text);
super.preparedStatement_setObject(chain, statement, parameterIndex, new StringReader(encodedText),
targetSqlType);
Expand All @@ -446,7 +446,7 @@ public void preparedStatement_setObject(FilterChain chain, PreparedStatementProx
super.preparedStatement_setObject(chain, statement, parameterIndex, encodedText, targetSqlType,
scaleOrLength);
} else if (x instanceof Reader) {
String text = IOUtils.read((Reader) x);
String text = Utils.read((Reader) x);
String encodedText = encode(statement.getConnectionProxy(), text);
super.preparedStatement_setObject(chain, statement, parameterIndex, new StringReader(encodedText),
targetSqlType, scaleOrLength);
Expand All @@ -471,15 +471,15 @@ public String clob_getSubString(FilterChain chain, ClobProxy wrapper, long pos,
@Override
public java.io.Reader clob_getCharacterStream(FilterChain chain, ClobProxy wrapper) throws SQLException {
Reader reader = super.clob_getCharacterStream(chain, wrapper);
String text = IOUtils.read(reader);
String text = Utils.read(reader);
return new StringReader(decode(wrapper.getConnectionWrapper(), text));
}

@Override
public Reader clob_getCharacterStream(FilterChain chain, ClobProxy wrapper, long pos, long length)
throws SQLException {
Reader reader = super.clob_getCharacterStream(chain, wrapper, pos, length);
String text = IOUtils.read(reader);
String text = Utils.read(reader);
return new StringReader(decode(wrapper.getConnectionWrapper(), text));
}

Expand All @@ -499,7 +499,7 @@ public int clob_setString(FilterChain chain, ClobProxy wrapper, long pos, String
@Override
public void callableStatement_setCharacterStream(FilterChain chain, CallableStatementProxy statement,
String parameterName, java.io.Reader reader) throws SQLException {
String text = IOUtils.read(reader);
String text = Utils.read(reader);
Reader encodeReader = new StringReader(encode(statement.getConnectionProxy(), text));
super.callableStatement_setCharacterStream(chain, statement, parameterName, encodeReader);
}
Expand All @@ -508,7 +508,7 @@ public void callableStatement_setCharacterStream(FilterChain chain, CallableStat
public void callableStatement_setCharacterStream(FilterChain chain, CallableStatementProxy statement,
String parameterName, java.io.Reader reader, int length)
throws SQLException {
String text = IOUtils.read(reader, length);
String text = Utils.read(reader, length);
String encodeText = encode(statement.getConnectionProxy(), text);
Reader encodeReader = new StringReader(encodeText);
super.callableStatement_setCharacterStream(chain, statement, parameterName, encodeReader, encodeText.length());
Expand All @@ -518,7 +518,7 @@ public void callableStatement_setCharacterStream(FilterChain chain, CallableStat
public void callableStatement_setCharacterStream(FilterChain chain, CallableStatementProxy statement,
String parameterName, java.io.Reader reader, long length)
throws SQLException {
String text = IOUtils.read(reader, (int) length);
String text = Utils.read(reader, (int) length);
String encodeText = encode(statement.getConnectionProxy(), text);
Reader encodeReader = new StringReader(encodeText);
super.callableStatement_setCharacterStream(chain, statement, parameterName, encodeReader,
Expand All @@ -538,7 +538,7 @@ public void callableStatement_setObject(FilterChain chain, CallableStatementProx
String encodedText = encode(statement.getConnectionProxy(), (String) x);
super.callableStatement_setObject(chain, statement, parameterName, encodedText);
} else if (x instanceof Reader) {
String text = IOUtils.read((Reader) x);
String text = Utils.read((Reader) x);
String encodedText = encode(statement.getConnectionProxy(), text);
super.callableStatement_setObject(chain, statement, parameterName, new StringReader(encodedText));
} else {
Expand All @@ -553,7 +553,7 @@ public void callableStatement_setObject(FilterChain chain, CallableStatementProx
String encodedText = encode(statement.getConnectionProxy(), (String) x);
super.callableStatement_setObject(chain, statement, parameterName, encodedText, targetSqlType);
} else if (x instanceof Reader) {
String text = IOUtils.read((Reader) x);
String text = Utils.read((Reader) x);
String encodedText = encode(statement.getConnectionProxy(), text);
super.callableStatement_setObject(chain, statement, parameterName, new StringReader(encodedText),
targetSqlType);
Expand All @@ -569,7 +569,7 @@ public void callableStatement_setObject(FilterChain chain, CallableStatementProx
String encodedText = encode(statement.getConnectionProxy(), (String) x);
super.callableStatement_setObject(chain, statement, parameterName, encodedText, targetSqlType, scale);
} else if (x instanceof Reader) {
String text = IOUtils.read((Reader) x);
String text = Utils.read((Reader) x);
String encodedText = encode(statement.getConnectionProxy(), text);
super.callableStatement_setObject(chain, statement, parameterName, new StringReader(encodedText),
targetSqlType, scale);
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.DruidPasswordCallback;
import com.alibaba.druid.util.Histogram;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.StringUtils;

Expand Down Expand Up @@ -563,7 +563,7 @@ public String getValidConnectionCheckerClassName() {
}

public void setValidConnectionCheckerClassName(String validConnectionCheckerClass) throws Exception {
Class<?> clazz = IOUtils.loadClass(validConnectionCheckerClass);
Class<?> clazz = Utils.loadClass(validConnectionCheckerClass);
ValidConnectionChecker validConnectionChecker = null;
if (clazz != null) {
validConnectionChecker = (ValidConnectionChecker) clazz.newInstance();
Expand Down Expand Up @@ -798,7 +798,7 @@ public void setPasswordCallback(PasswordCallback passwordCallback) {
}

public void setPasswordCallbackClassName(String passwordCallbackClassName) throws Exception {
Class<?> clazz = IOUtils.loadClass(passwordCallbackClassName);
Class<?> clazz = Utils.loadClass(passwordCallbackClassName);
if (clazz != null) {
this.passwordCallback = (PasswordCallback) clazz.newInstance();
} else {
Expand Down Expand Up @@ -1130,7 +1130,7 @@ public void setExceptionSorter(String exceptionSorter) throws SQLException {
return;
}

Class<?> clazz = IOUtils.loadClass(exceptionSorter);
Class<?> clazz = Utils.loadClass(exceptionSorter);
if (clazz == null) {
LOG.error("load exceptionSorter error : " + exceptionSorter);
} else {
Expand Down Expand Up @@ -1286,7 +1286,7 @@ public List<String> getActiveConnectionStackTrace() {
List<String> list = new ArrayList<String>();

for (DruidPooledConnection conn : this.getActiveConnections()) {
list.add(IOUtils.toString(conn.getConnectStackTrace()));
list.add(Utils.toString(conn.getConnectStackTrace()));
}

return list;
Expand Down Expand Up @@ -1515,7 +1515,7 @@ public CompositeDataSupport getCompositeData() throws JMException {
if (createError != null) {
map.put("ConnectionConnectErrorLastTime", getLastCreateErrorTime());
map.put("ConnectionConnectErrorLastMessage", createError.getMessage());
map.put("ConnectionConnectErrorLastStackTrace", IOUtils.getStackTrace(createError));
map.put("ConnectionConnectErrorLastStackTrace", Utils.getStackTrace(createError));
} else {
map.put("ConnectionConnectErrorLastTime", null);
map.put("ConnectionConnectErrorLastMessage", null);
Expand Down Expand Up @@ -1561,7 +1561,7 @@ public CompositeDataSupport getCompositeData() throws JMException {
map.put("ConnectionConnectCount", this.getConnectCount());
if (createError != null) {
map.put("ConnectionErrorLastMessage", createError.getMessage());
map.put("ConnectionErrorLastStackTrace", IOUtils.getStackTrace(createError));
map.put("ConnectionErrorLastStackTrace", Utils.getStackTrace(createError));
} else {
map.put("ConnectionErrorLastMessage", null);
map.put("ConnectionErrorLastStackTrace", null);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcConstants;

/**
Expand Down Expand Up @@ -251,14 +251,14 @@ public String toString() {
buf.append("{ID:");
buf.append(System.identityHashCode(conn));
buf.append(", ConnectTime:\"");
buf.append(IOUtils.toString(new Date(this.connecttimeMillis)));
buf.append(Utils.toString(new Date(this.connecttimeMillis)));

buf.append("\", UseCount:");
buf.append(useCount);

if (lastActiveTimeMillis > 0) {
buf.append(", LastActiveTime:\"");
buf.append(IOUtils.toString(new Date(this.lastActiveTimeMillis)));
buf.append(Utils.toString(new Date(this.lastActiveTimeMillis)));
buf.append("\"");
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/alibaba/druid/pool/DruidDataSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.alibaba.druid.pool;

import static com.alibaba.druid.util.IOUtils.getBoolean;
import static com.alibaba.druid.util.Utils.getBoolean;

import java.io.Closeable;
import java.security.AccessController;
Expand Down Expand Up @@ -82,7 +82,7 @@
import com.alibaba.druid.stat.JdbcSqlStatValue;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JMXUtils;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
Expand Down Expand Up @@ -492,7 +492,7 @@ public void init() throws SQLException {

init = true;

initStackTrace = IOUtils.toString(Thread.currentThread().getStackTrace());
initStackTrace = Utils.toString(Thread.currentThread().getStackTrace());

this.id = DruidDriver.createDataSourceId();
if (this.id > 1) {
Expand Down Expand Up @@ -1995,7 +1995,7 @@ public String toString() {
buf.append("{");

buf.append("\n\tCreateTime:\"");
buf.append(IOUtils.toString(getCreatedTime()));
buf.append(Utils.toString(getCreatedTime()));
buf.append("\"");

buf.append(",\n\tActiveCount:");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.Utils;

public class MySqlValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable {

Expand All @@ -44,7 +44,7 @@ public class MySqlValidConnectionChecker extends ValidConnectionCheckerAdapter i

public MySqlValidConnectionChecker(){
try {
clazz = IOUtils.loadClass("com.mysql.jdbc.Connection");
clazz = Utils.loadClass("com.mysql.jdbc.Connection");
ping = clazz.getMethod("ping");
if (ping != null) {
usePingMethod = true;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.Utils;

public class OracleValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable {

Expand All @@ -44,7 +44,7 @@ public class OracleValidConnectionChecker extends ValidConnectionCheckerAdapter

public OracleValidConnectionChecker(){
try {
clazz = IOUtils.loadClass("oracle.jdbc.driver.OracleConnection");
clazz = Utils.loadClass("oracle.jdbc.driver.OracleConnection");
if (clazz != null) {
ping = clazz.getMethod("pingDatabase", new Class[] { Integer.TYPE });
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/alibaba/druid/proxy/DruidDriver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import com.alibaba.druid.stat.JdbcStatManager;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JMXUtils;
import com.alibaba.druid.util.JdbcUtils;

Expand Down Expand Up @@ -256,7 +256,7 @@ public static DataSourceProxyConfig parseConfig(String url, Properties info) thr
}

public Driver createDriver(String className) throws SQLException {
Class<?> rawDriverClass = IOUtils.loadClass(className);
Class<?> rawDriverClass = Utils.loadClass(className);

if (rawDriverClass == null) {
throw new SQLException("jdbc-driver's class not found. '" + className + "'");
Expand Down
Loading

0 comments on commit a72da37

Please sign in to comment.