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

improve LogFilter

Browse Source
This commit is contained in:
wenshao
2012-11-27 13:22:05 +08:00
parent 619c007db9
commit 5a0740fcc8
3 changed files with 78 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/logging/LogFilter.java
+8 -8
View File
@@ -382,8 +382,8 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM
protected void statementExecuteAfter(StatementProxy statement, String sql, boolean firstResult) {
if (statementExecuteAfterLogEnable && isStatementLogEnabled()) {
statement.setLastExecuteTimeNano();
long nanos = statement.getLastExecuteTimeNano();
long millis = nanos / (1000 * 1000);
double nanos = statement.getLastExecuteTimeNano();
double millis = nanos / (1000 * 1000);
statementLog("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) + "} executed. "
+ sql + " (" + millis + " milliseconds)");
@@ -399,8 +399,8 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM
protected void statementExecuteBatchAfter(StatementProxy statement, int[] result) {
if (statementExecuteBatchAfterLogEnable && isStatementLogEnabled()) {
statement.setLastExecuteTimeNano();
long nanos = statement.getLastExecuteTimeNano();
long millis = nanos / (1000 * 1000);
double nanos = statement.getLastExecuteTimeNano();
double millis = nanos / (1000 * 1000);
String sql;
if (statement instanceof PreparedStatementProxy) {
@@ -426,8 +426,8 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM
protected void statementExecuteQueryAfter(StatementProxy statement, String sql, ResultSetProxy resultSet) {
if (statementExecuteQueryAfterLogEnable && isStatementLogEnabled()) {
statement.setLastExecuteTimeNano();
long nanos = statement.getLastExecuteTimeNano();
long millis = nanos / (1000 * 1000);
double nanos = statement.getLastExecuteTimeNano();
double millis = nanos / (1000 * 1000);
statementLog("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) + ", rs-"
+ resultSet.getId() + "} query executed. " + sql + " (" + millis + " milliseconds)");
@@ -446,8 +446,8 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM
protected void statementExecuteUpdateAfter(StatementProxy statement, String sql, int updateCount) {
if (statementExecuteUpdateAfterLogEnable && isStatementLogEnabled()) {
statement.setLastExecuteTimeNano();
long nanos = statement.getLastExecuteTimeNano();
long millis = nanos / (1000 * 1000);
double nanos = statement.getLastExecuteTimeNano();
double millis = nanos / (1000 * 1000);
statementLog("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement)
+ "} update executed. effort " + updateCount + ". " + sql + " (" + millis + " milliseconds)");
src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java
+30 -1
View File
@@ -109,7 +109,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
updateCount = null;
lastExecuteSql = sql;
lastExecuteType = StatementExecuteType.Execute;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
firstResultSet = createChain().statement_execute(this, sql);
return firstResultSet;
}
@@ -119,6 +121,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
updateCount = null;
lastExecuteSql = sql;
lastExecuteType = StatementExecuteType.Execute;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
firstResultSet = createChain().statement_execute(this, sql, autoGeneratedKeys);
return firstResultSet;
}
@@ -128,6 +133,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
updateCount = null;
lastExecuteSql = sql;
lastExecuteType = StatementExecuteType.Execute;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
firstResultSet = createChain().statement_execute(this, sql, columnIndexes);
return firstResultSet;
}
@@ -137,6 +145,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
updateCount = null;
lastExecuteSql = sql;
lastExecuteType = StatementExecuteType.Execute;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
firstResultSet = createChain().statement_execute(this, sql, columnNames);
return firstResultSet;
}
@@ -145,6 +156,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
public int[] executeBatch() throws SQLException {
firstResultSet = false;
lastExecuteType = StatementExecuteType.ExecuteBatch;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
int[] updateCounts = createChain().statement_executeBatch(this);
if (updateCounts != null && updateCounts.length == 1) {
@@ -160,6 +174,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
updateCount = null;
lastExecuteSql = sql;
lastExecuteType = StatementExecuteType.ExecuteQuery;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
return createChain().statement_executeQuery(this, sql);
}
@@ -168,6 +185,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
firstResultSet = false;
lastExecuteSql = sql;
lastExecuteType = StatementExecuteType.ExecuteUpdate;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
updateCount = createChain().statement_executeUpdate(this, sql);
return updateCount;
}
@@ -177,6 +197,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
firstResultSet = false;
lastExecuteSql = sql;
lastExecuteType = StatementExecuteType.ExecuteUpdate;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
updateCount = createChain().statement_executeUpdate(this, sql, autoGeneratedKeys);
return updateCount;
}
@@ -186,6 +209,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
firstResultSet = false;
lastExecuteSql = sql;
lastExecuteType = StatementExecuteType.ExecuteUpdate;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
updateCount = createChain().statement_executeUpdate(this, sql, columnIndexes);
return updateCount;
}
@@ -195,6 +221,9 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro
firstResultSet = false;
lastExecuteSql = sql;
lastExecuteType = StatementExecuteType.ExecuteUpdate;
lastExecuteStartNano = -1L;
lastExecuteTimeNano = -1L;
updateCount = createChain().statement_executeUpdate(this, sql, columnNames);
return updateCount;
}
src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest.java
+40
View File
@@ -0,0 +1,40 @@
package com.alibaba.druid.bvt.filter.log;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
import junit.framework.TestCase;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.util.JdbcUtils;
public class LogFilterTest extends TestCase {
private DruidDataSource dataSource;
protected void setUp() throws Exception {
dataSource = new DruidDataSource();
dataSource.setUrl("jdbc:derby:classpath:petstore-db");
dataSource.setFilters("log4j");
}
public void test_select() throws Exception {
Connection conn = dataSource.getConnection();
Statement stmt = conn.createStatement();
for (int i = 0; i < 10; ++i) {
ResultSet rs = stmt.executeQuery("SELECT * FROM ITEM WHERE LISTPRICE > 10");
rs.close();
}
stmt.close();
conn.close();
}
protected void tearDown() throws Exception {
JdbcUtils.close(dataSource);
}
}