From 49d7884c96b0404e0ff096c82e270dfd7ab856c5 Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 13 Sep 2016 10:39:12 +0800 Subject: [PATCH] refactored code, use public field instead of public getter. --- .../druid/pool/DruidAbstractDataSource.java | 2 +- .../alibaba/druid/pool/DruidDataSource.java | 2 +- .../pool/DruidPooledCallableStatement.java | 2 +- .../druid/pool/DruidPooledConnection.java | 2 +- .../pool/DruidPooledPreparedStatement.java | 12 ++++----- .../druid/pool/PreparedStatementHolder.java | 26 +++++++------------ .../druid/pool/PreparedStatementPool.java | 18 ++++++------- 7 files changed, 27 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 19204252d9..43dc983800 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -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) { diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 6935d05902..7b9e285303 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -2492,7 +2492,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat for (PreparedStatementHolder stmtHolder : stmtPool.getMap().values()) { Map stmtInfo = new LinkedHashMap(); - 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()); diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java index 97f01b96a4..cf559a6024 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java @@ -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() { diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java index cbe3ae58ea..c7c591d7d7 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java @@ -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 diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java index d49413ee2d..a112239206 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java @@ -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; diff --git a/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java b/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java index 191486d075..0e1edb0e1d 100644 --- a/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java +++ b/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java @@ -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++; } diff --git a/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java b/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java index 2c3b8e746f..d6f64ebc18 100644 --- a/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java +++ b/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java @@ -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); }