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

compatible for 0.1.18

Browse Source
This commit is contained in:
温少
2012-03-17 03:52:32 +08:00
parent 0e2b1659a5
commit 2df78b18da
4 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
+8 -1
View File
@@ -39,6 +39,7 @@ import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
import com.alibaba.druid.proxy.jdbc.StatementProxy;
import com.alibaba.druid.stat.JdbcConnectionStat;
import com.alibaba.druid.stat.JdbcDataSourceStat;
import com.alibaba.druid.stat.JdbcResultSetStat;
import com.alibaba.druid.stat.JdbcSqlStat;
import com.alibaba.druid.stat.JdbcStatContext;
import com.alibaba.druid.stat.JdbcStatManager;
@@ -53,8 +54,15 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
public final static String ATTR_SQL = "stat.sql";
public final static String ATTR_UPDATE_COUNT = "stat.updteCount";
public final static String ATTR_TRANSACTION = "stat.tx";
protected JdbcDataSourceStat dataSourceStat;
@Deprecated
protected final JdbcStatementStat statementStat = JdbcStatManager.getInstance().getStatementStat();
@Deprecated
protected final JdbcResultSetStat resultSetStat = JdbcStatManager.getInstance().getResultSetStat();
private boolean connectionStackTraceEnable = false;
@@ -630,7 +638,6 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
return (JdbcSqlStat) statement.getAttributes().get(ATTR_SQL);
}
@Deprecated
public JdbcSqlStat getSqlCounter(String sql) {
return getSqlStat(sql);
}
src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java
+2
View File
@@ -38,6 +38,7 @@ import java.util.concurrent.Executor;
import com.alibaba.druid.filter.FilterChain;
import com.alibaba.druid.filter.FilterChainImpl;
import com.alibaba.druid.filter.stat.StatFilter;
/**
* @author wenshao<szujobs@hotmail.com>
@@ -295,6 +296,7 @@ public class ConnectionProxyImpl extends WrapperProxyImpl implements ConnectionP
if (transcationInfo == null) {
long transactionId = this.dataSource.createTransactionId();
transcationInfo = new TransactionInfo(transactionId);
this.getAttributes().put(StatFilter.ATTR_TRANSACTION, transcationInfo); // compatible for druid 0.1.18
}
} else {
transcationInfo = null;
src/main/java/com/alibaba/druid/proxy/jdbc/TransactionInfo.java
+3 -37
View File
@@ -15,45 +15,11 @@
*/
package com.alibaba.druid.proxy.jdbc;
import java.util.ArrayList;
import java.util.List;
public class TransactionInfo {
private final long id;
private final List<String> sqlList = new ArrayList<String>();
private final long startTimeMillis;
private long endTimeMillis;
// compatible for druid 0.1.19
public class TransactionInfo extends com.alibaba.druid.util.TransactionInfo {
public TransactionInfo(long id){
this.id = id;
this.startTimeMillis = System.currentTimeMillis();
}
public long getId() {
return id;
}
public List<String> getSqlList() {
return sqlList;
}
public long getStartTimeMillis() {
return startTimeMillis;
}
public long getEndTimeMillis() {
return endTimeMillis;
}
public void setEndTimeMillis() {
if (endTimeMillis == 0) {
endTimeMillis = System.currentTimeMillis();
}
}
public void setEndTimeMillis(long endTimeMillis) {
this.endTimeMillis = endTimeMillis;
super(id);
}
}
src/main/java/com/alibaba/druid/util/TransactionInfo.java
+37 -3
View File
@@ -1,10 +1,44 @@
package com.alibaba.druid.util;
@Deprecated
public class TransactionInfo extends com.alibaba.druid.proxy.jdbc.TransactionInfo {
import java.util.ArrayList;
import java.util.List;
public class TransactionInfo {
private final long id;
private final List<String> sqlList = new ArrayList<String>();
private final long startTimeMillis;
private long endTimeMillis;
public TransactionInfo(long id){
super(id);
this.id = id;
this.startTimeMillis = System.currentTimeMillis();
}
public long getId() {
return id;
}
public List<String> getSqlList() {
return sqlList;
}
public long getStartTimeMillis() {
return startTimeMillis;
}
public long getEndTimeMillis() {
return endTimeMillis;
}
public void setEndTimeMillis() {
if (endTimeMillis == 0) {
endTimeMillis = System.currentTimeMillis();
}
}
public void setEndTimeMillis(long endTimeMillis) {
this.endTimeMillis = endTimeMillis;
}
}