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

refactored code, use public field instead of public getter.

Browse Source
This commit is contained in:
wenshao
2016-09-13 10:39:12 +08:00
parent c73573ac8c
commit 49d7884c96
7 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+1 -1
View File
@@ -1700,7 +1700,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
decrementCachedPreparedStatementCount();
incrementCachedPreparedStatementDeleteCount();
JdbcUtils.close(stmtHolder.getStatement());
JdbcUtils.close(stmtHolder.statement);
}
protected void cloneTo(DruidAbstractDataSource to) {
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+1 -1
View File
@@ -2492,7 +2492,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
for (PreparedStatementHolder stmtHolder : stmtPool.getMap().values()) {
Map<String, Object> stmtInfo = new LinkedHashMap<String, Object>();
stmtInfo.put("sql", stmtHolder.getKey().getSql());
stmtInfo.put("sql", stmtHolder.key.getSql());
stmtInfo.put("defaultRowPretch", stmtHolder.getDefaultRowPrefetch());
stmtInfo.put("rowPrefetch", stmtHolder.getRowPrefetch());
stmtInfo.put("hitCount", stmtHolder.getHitCount());
src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class DruidPooledCallableStatement extends DruidPooledPreparedStatement i
public DruidPooledCallableStatement(DruidPooledConnection conn, PreparedStatementHolder holder) throws SQLException{
super(conn, holder);
this.stmt = (CallableStatement) holder.getStatement();
this.stmt = (CallableStatement) holder.statement;
}
public CallableStatement getCallableStatementRaw() {
src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
+1 -1
View File
@@ -346,7 +346,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
private void initStatement(PreparedStatementHolder stmtHolder) throws SQLException {
stmtHolder.incrementInUseCount();
holder.getDataSource().initStatement(this, stmtHolder.getStatement());
holder.getDataSource().initStatement(this, stmtHolder.statement);
}
@Override
src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java
+6 -6
View File
@@ -67,10 +67,10 @@ public class DruidPooledPreparedStatement extends DruidPooledStatement implement
private boolean pooled = false;
public DruidPooledPreparedStatement(DruidPooledConnection conn, PreparedStatementHolder holder) throws SQLException{
super(conn, holder.getStatement());
this.stmt = holder.getStatement();
super(conn, holder.statement);
this.stmt = holder.statement;
this.holder = holder;
this.sql = holder.getKey().sql;
this.sql = holder.key.sql;
pooled = conn.getConnectionHolder().isPoolPreparedStatements();
// Remember the defaults
@@ -152,7 +152,7 @@ public class DruidPooledPreparedStatement extends DruidPooledStatement implement
}
public PreparedStatementKey getKey() {
return holder.getKey();
return holder.key;
}
public PreparedStatement getRawPreparedStatement() {
@@ -907,8 +907,8 @@ public class DruidPooledPreparedStatement extends DruidPooledStatement implement
public static class PreparedStatementKey {
private final String sql;
private final String catalog;
protected final String sql;
protected final String catalog;
protected final MethodType methodType;
src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java
+9 -17
View File
@@ -24,19 +24,19 @@ import java.sql.PreparedStatement;
*/
public final class PreparedStatementHolder {
private final PreparedStatementKey key;
private final PreparedStatement statement;
private int hitCount = 0;
public final PreparedStatementKey key;
public final PreparedStatement statement;
private int hitCount = 0;
private int fetchRowPeak = -1;
private int fetchRowPeak = -1;
private int defaultRowPrefetch = -1;
private int rowPrefetch = -1;
private int defaultRowPrefetch = -1;
private int rowPrefetch = -1;
private boolean enterOracleImplicitCache = false;
private boolean enterOracleImplicitCache = false;
private int inUseCount = 0;
private boolean pooling = false;
private int inUseCount = 0;
private boolean pooling = false;
public PreparedStatementHolder(PreparedStatementKey key, PreparedStatement stmt){
this.key = key;
@@ -77,14 +77,6 @@ public final class PreparedStatementHolder {
}
}
public PreparedStatement getStatement() {
return statement;
}
public PreparedStatementKey getKey() {
return key;
}
public void incrementHitCount() {
hitCount++;
}
src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java
+8 -10
View File
@@ -63,7 +63,7 @@ public class PreparedStatementPool {
holder.incrementHitCount();
dataSource.incrementCachedPreparedStatementHitCount();
if (holder.isEnterOracleImplicitCache()) {
OracleUtils.exitImplicitCacheToActive(holder.getStatement());
OracleUtils.exitImplicitCacheToActive(holder.statement);
}
} else {
dataSource.incrementCachedPreparedStatementMissCount();
@@ -73,7 +73,7 @@ public class PreparedStatementPool {
}
public void put(PreparedStatementHolder stmtHolder) throws SQLException {
PreparedStatement stmt = stmtHolder.getStatement();
PreparedStatement stmt = stmtHolder.statement;
if (stmt == null) {
return;
@@ -86,9 +86,7 @@ public class PreparedStatementPool {
stmtHolder.setEnterOracleImplicitCache(false);
}
PreparedStatementKey key = stmtHolder.getKey();
PreparedStatementHolder oldStmtHolder = map.put(key, stmtHolder);
PreparedStatementHolder oldStmtHolder = map.put(stmtHolder.key, stmtHolder);
if (oldStmtHolder == stmtHolder) {
return;
@@ -107,8 +105,8 @@ public class PreparedStatementPool {
if (LOG.isDebugEnabled()) {
String message = null;
if (stmtHolder.getStatement() instanceof PreparedStatementProxy) {
PreparedStatementProxy stmtProxy = (PreparedStatementProxy) stmtHolder.getStatement();
if (stmtHolder.statement instanceof PreparedStatementProxy) {
PreparedStatementProxy stmtProxy = (PreparedStatementProxy) stmtHolder.statement;
if (stmtProxy instanceof CallableStatementProxy) {
message = "{conn-" + stmtProxy.getConnectionProxy().getId() + ", cstmt-" + stmtProxy.getId()
+ "} enter cache";
@@ -138,8 +136,8 @@ public class PreparedStatementPool {
public void closeRemovedStatement(PreparedStatementHolder holder) {
if (LOG.isDebugEnabled()) {
String message = null;
if (holder.getStatement() instanceof PreparedStatementProxy) {
PreparedStatementProxy stmtProxy = (PreparedStatementProxy) holder.getStatement();
if (holder.statement instanceof PreparedStatementProxy) {
PreparedStatementProxy stmtProxy = (PreparedStatementProxy) holder.statement;
if (stmtProxy instanceof CallableStatementProxy) {
message = "{conn-" + stmtProxy.getConnectionProxy().getId() + ", cstmt-" + stmtProxy.getId()
+ "} exit cache";
@@ -161,7 +159,7 @@ public class PreparedStatementPool {
if (holder.isEnterOracleImplicitCache()) {
try {
OracleUtils.exitImplicitCacheToClose(holder.getStatement());
OracleUtils.exitImplicitCacheToClose(holder.statement);
} catch (Exception ex) {
LOG.error("exitImplicitCacheToClose error", ex);
}