refactor DruidDataSource

This commit is contained in:
wenshao
2012-08-17 10:19:12 +08:00
parent 7e08dff801
commit 22ac97180c
3 changed files with 142 additions and 147 deletions
@@ -72,22 +72,22 @@ import com.alibaba.druid.util.JdbcUtils;
*/
public abstract class DruidAbstractDataSource extends WrapperAdapter implements DruidAbstractDataSourceMBean, DataSource, DataSourceProxy, Serializable {
private final static Log LOG = LogFactory.getLog(DruidAbstractDataSource.class);
private final static Log LOG = LogFactory.getLog(DruidAbstractDataSource.class);
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
public final static int DEFAULT_INITIAL_SIZE = 0;
public final static int DEFAULT_MAX_ACTIVE_SIZE = 8;
public final static int DEFAULT_MAX_IDLE = 8;
public final static int DEFAULT_MIN_IDLE = 0;
public final static int DEFAULT_MAX_WAIT = -1;
public final static String DEFAULT_VALIDATION_QUERY = null; //
public final static boolean DEFAULT_TEST_ON_BORROW = true;
public final static boolean DEFAULT_TEST_ON_RETURN = false;
public final static boolean DEFAULT_WHILE_IDLE = false;
public static final long DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS = -1L;
public static final long DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS = 30 * 1000;
public static final int DEFAULT_NUM_TESTS_PER_EVICTION_RUN = 3;
public final static int DEFAULT_INITIAL_SIZE = 0;
public final static int DEFAULT_MAX_ACTIVE_SIZE = 8;
public final static int DEFAULT_MAX_IDLE = 8;
public final static int DEFAULT_MIN_IDLE = 0;
public final static int DEFAULT_MAX_WAIT = -1;
public final static String DEFAULT_VALIDATION_QUERY = null; //
public final static boolean DEFAULT_TEST_ON_BORROW = true;
public final static boolean DEFAULT_TEST_ON_RETURN = false;
public final static boolean DEFAULT_WHILE_IDLE = false;
public static final long DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS = -1L;
public static final long DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS = 30 * 1000;
public static final int DEFAULT_NUM_TESTS_PER_EVICTION_RUN = 3;
/**
* The default value for {@link #getMinEvictableIdleTimeMillis}.
@@ -95,135 +95,134 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
* @see #getMinEvictableIdleTimeMillis
* @see #setMinEvictableIdleTimeMillis
*/
public static final long DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS = 1000L * 60L * 30L;
public static final long DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS = 1000L * 60L * 30L;
protected volatile boolean defaultAutoCommit = true;
protected volatile Boolean defaultReadOnly;
protected volatile Integer defaultTransactionIsolation;
protected volatile String defaultCatalog = null;
protected volatile boolean defaultAutoCommit = true;
protected volatile Boolean defaultReadOnly;
protected volatile Integer defaultTransactionIsolation;
protected volatile String defaultCatalog = null;
protected String name;
protected String name;
protected volatile String username;
protected volatile String password;
protected volatile String jdbcUrl;
protected volatile String driverClass;
protected volatile Properties connectProperties = new Properties();
protected volatile String username;
protected volatile String password;
protected volatile String jdbcUrl;
protected volatile String driverClass;
protected volatile Properties connectProperties = new Properties();
protected volatile PasswordCallback passwordCallback;
protected volatile NameCallback userCallback;
protected volatile PasswordCallback passwordCallback;
protected volatile NameCallback userCallback;
protected volatile int initialSize = DEFAULT_INITIAL_SIZE;
protected volatile int maxActive = DEFAULT_MAX_ACTIVE_SIZE;
protected volatile int minIdle = DEFAULT_MIN_IDLE;
protected volatile int maxIdle = DEFAULT_MAX_IDLE;
protected volatile long maxWait = DEFAULT_MAX_WAIT;
protected volatile int initialSize = DEFAULT_INITIAL_SIZE;
protected volatile int maxActive = DEFAULT_MAX_ACTIVE_SIZE;
protected volatile int minIdle = DEFAULT_MIN_IDLE;
protected volatile int maxIdle = DEFAULT_MAX_IDLE;
protected volatile long maxWait = DEFAULT_MAX_WAIT;
protected volatile String validationQuery = DEFAULT_VALIDATION_QUERY;
protected volatile int validationQueryTimeout = -1;
private volatile boolean testOnBorrow = DEFAULT_TEST_ON_BORROW;
private volatile boolean testOnReturn = DEFAULT_TEST_ON_RETURN;
private volatile boolean testWhileIdle = DEFAULT_WHILE_IDLE;
protected volatile boolean poolPreparedStatements = false;
protected volatile boolean sharePreparedStatements = false;
protected volatile int maxPoolPreparedStatementPerConnectionSize = 10;
protected volatile String validationQuery = DEFAULT_VALIDATION_QUERY;
protected volatile int validationQueryTimeout = -1;
private volatile boolean testOnBorrow = DEFAULT_TEST_ON_BORROW;
private volatile boolean testOnReturn = DEFAULT_TEST_ON_RETURN;
private volatile boolean testWhileIdle = DEFAULT_WHILE_IDLE;
protected volatile boolean poolPreparedStatements = false;
protected volatile boolean sharePreparedStatements = false;
protected volatile int maxPoolPreparedStatementPerConnectionSize = 10;
protected volatile boolean inited = false;
protected volatile boolean inited = false;
protected PrintWriter logWriter = new PrintWriter(
System.out);
protected PrintWriter logWriter = new PrintWriter(System.out);
protected List<Filter> filters = new CopyOnWriteArrayList<Filter>();
protected volatile ExceptionSorter exceptionSorter = null;
protected List<Filter> filters = new CopyOnWriteArrayList<Filter>();
protected volatile ExceptionSorter exceptionSorter = null;
protected Driver driver;
protected Driver driver;
protected volatile int queryTimeout;
protected volatile int transactionQueryTimeout;
protected volatile int queryTimeout;
protected volatile int transactionQueryTimeout;
protected long createErrorCount;
protected long createErrorCount;
protected long createTimespan;
protected long createTimespan;
protected volatile int maxWaitThreadCount = -1;
protected volatile int maxWaitThreadCount = -1;
protected volatile boolean accessToUnderlyingConnectionAllowed = true;
protected volatile boolean accessToUnderlyingConnectionAllowed = true;
protected volatile long timeBetweenEvictionRunsMillis = DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
protected volatile long timeBetweenEvictionRunsMillis = DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
protected volatile int numTestsPerEvictionRun = DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
protected volatile int numTestsPerEvictionRun = DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
protected volatile long minEvictableIdleTimeMillis = DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
protected volatile long minEvictableIdleTimeMillis = DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
protected volatile boolean removeAbandoned;
protected volatile boolean removeAbandoned;
protected volatile long removeAbandonedTimeoutMillis = 300 * 1000;
protected volatile long removeAbandonedTimeoutMillis = 300 * 1000;
protected volatile boolean logAbandoned;
protected volatile boolean logAbandoned;
protected volatile int maxOpenPreparedStatements = -1;
protected volatile int maxOpenPreparedStatements = -1;
protected volatile List<String> connectionInitSqls;
protected volatile List<String> connectionInitSqls;
protected volatile String dbType;
protected volatile String dbType;
protected volatile long timeBetweenConnectErrorMillis = DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS;
protected volatile long timeBetweenConnectErrorMillis = DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS;
protected volatile ValidConnectionChecker validConnectionChecker = null;
protected volatile ValidConnectionChecker validConnectionChecker = null;
protected final AtomicLong errorCount = new AtomicLong();
protected final AtomicLong dupCloseCount = new AtomicLong();
protected final AtomicLong errorCount = new AtomicLong();
protected final AtomicLong dupCloseCount = new AtomicLong();
protected final ConcurrentIdentityHashMap<DruidPooledConnection, ActiveConnectionTraceInfo> activeConnections = new ConcurrentIdentityHashMap<DruidPooledConnection, ActiveConnectionTraceInfo>();
protected final ActiveConnectionTraceInfoMap activeConnections = new ActiveConnectionTraceInfoMap();
protected long id;
protected long id;
protected final Date createdTime = new Date();
protected Date initedTime;
protected final Date createdTime = new Date();
protected Date initedTime;
protected int connectionErrorRetryAttempts = 30;
protected int connectionErrorRetryAttempts = 30;
protected boolean breakAfterAcquireFailure = false;
protected boolean breakAfterAcquireFailure = false;
protected long transactionThresholdMillis = 0L;
protected long transactionThresholdMillis = 0L;
protected final AtomicLong commitCount = new AtomicLong();
protected final AtomicLong startTransactionCount = new AtomicLong();
protected final AtomicLong rollbackCount = new AtomicLong();
protected final AtomicLong cachedPreparedStatementHitCount = new AtomicLong();
protected final AtomicLong preparedStatementCount = new AtomicLong();
protected final AtomicLong closedPreparedStatementCount = new AtomicLong();
protected final AtomicLong cachedPreparedStatementCount = new AtomicLong();
protected final AtomicLong cachedPreparedStatementDeleteCount = new AtomicLong();
protected final AtomicLong cachedPreparedStatementMissCount = new AtomicLong();
protected final AtomicLong commitCount = new AtomicLong();
protected final AtomicLong startTransactionCount = new AtomicLong();
protected final AtomicLong rollbackCount = new AtomicLong();
protected final AtomicLong cachedPreparedStatementHitCount = new AtomicLong();
protected final AtomicLong preparedStatementCount = new AtomicLong();
protected final AtomicLong closedPreparedStatementCount = new AtomicLong();
protected final AtomicLong cachedPreparedStatementCount = new AtomicLong();
protected final AtomicLong cachedPreparedStatementDeleteCount = new AtomicLong();
protected final AtomicLong cachedPreparedStatementMissCount = new AtomicLong();
protected final Histogram transactionHistogram = new Histogram(
10,
100,
1000,
10 * 1000,
100 * 1000);
protected final Histogram transactionHistogram = new Histogram(10, 100,
1000,
10 * 1000,
100 * 1000);
private boolean dupCloseLogEnable = false;
private boolean dupCloseLogEnable = false;
private ObjectName objectName;
private ObjectName objectName;
private final AtomicLong executeCount = new AtomicLong();
private final AtomicLong executeCount = new AtomicLong();
protected Throwable createError;
protected Throwable lastError;
protected long lastErrorTimeMillis;
protected Throwable lastCreateError;
protected long lastCreateErrorTimeMillis;
protected Throwable createError;
protected Throwable lastError;
protected long lastErrorTimeMillis;
protected Throwable lastCreateError;
protected long lastCreateErrorTimeMillis;
protected boolean isOracle = false;
protected boolean isOracle = false;
protected boolean useOracleImplicitCache = true;
protected boolean useOracleImplicitCache = true;
protected final ReentrantLock lock = new ReentrantLock(
true);
protected final ReentrantLock lock = new ReentrantLock(true);
protected int modCount = 0;
protected int modCount = 0;
protected AtomicLong createCount = new AtomicLong();
protected AtomicLong destroyCount = new AtomicLong();
public boolean isOracle() {
return isOracle;
@@ -884,9 +883,9 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
public Properties getConnectProperties() {
return connectProperties;
}
public abstract void setConnectProperties(Properties properties);
public void setConnectionProperties(String connectionProperties) {
if (connectionProperties == null || connectionProperties.trim().length() == 0) {
setConnectProperties(null);
@@ -909,7 +908,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
}
}
}
setConnectProperties(properties);
}
@@ -1208,21 +1207,23 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
protected abstract void recycle(DruidPooledConnection pooledConnection) throws SQLException;
abstract void incrementCreateCount();
public Connection createPhysicalConnection(String url, Properties info) throws SQLException {
Connection conn;
if (getProxyFilters().size() == 0) {
return getDriver().connect(url, info);
conn = getDriver().connect(url, info);
} else {
conn = new FilterChainImpl(this).connection_connect(info);
}
return new FilterChainImpl(this).connection_connect(info);
createCount.incrementAndGet();
return conn;
}
public Connection createConnection() throws SQLException {
public Connection createPhysicalConnection() throws SQLException {
String url = this.getUrl();
Properties info;
Properties connectProperty = getConnectProperties();
Properties properties = getConnectProperties();
String user;
if (getUserCallback() != null) {
user = getUserCallback().getName();
@@ -1237,37 +1238,35 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
DruidPasswordCallback druidPasswordCallback = (DruidPasswordCallback) passwordCallback;
druidPasswordCallback.setUrl(url);
druidPasswordCallback.setProperties(properties);
druidPasswordCallback.setProperties(connectProperty);
char[] chars = passwordCallback.getPassword();
if (chars != null) {
password = new String(chars);
}
}
info = new Properties(getConnectProperties());
if (properties != null) {
info.putAll(properties);
Properties physicalConnectProperties;
if (connectProperty != null) {
physicalConnectProperties = new Properties(connectProperty);
} else {
physicalConnectProperties = new Properties();
}
if ((!info.contains("user")) && user != null) {
info.put("user", user);
if (user != null && user.length() != 0) {
physicalConnectProperties.put("user", user);
}
if ((!info.contains("password")) && password != null) {
info.put("password", password);
if (password != null && password.length() != 0) {
physicalConnectProperties.put("password", password);
}
Connection conn;
if (passwordCallback != null) {
char[] chars = passwordCallback.getPassword();
if (chars != null) {
String callbackPassword = new String(chars);
info.put("password", callbackPassword);
}
}
long startNano = System.nanoTime();
try {
conn = createPhysicalConnection(url, info);
conn = createPhysicalConnection(url, physicalConnectProperties);
if (conn == null) {
throw new SQLException("connect error, url " + url);
@@ -1297,8 +1296,6 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
createTimespan += nano;
}
incrementCreateCount();
return conn;
}
@@ -1591,4 +1588,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
to.useOracleImplicitCache = this.useOracleImplicitCache;
}
// just for code format
public final static class ActiveConnectionTraceInfoMap extends ConcurrentIdentityHashMap<DruidPooledConnection, ActiveConnectionTraceInfo> {
}
}
@@ -88,8 +88,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
private long closeCount = 0L;
private final AtomicLong connectErrorCount = new AtomicLong();
private long recycleCount = 0L;
private long createConnectionCount = 0L;
private long destroyCount = 0L;
private long removeAbandonedCount = 0L;
private long notEmptyWaitCount = 0L;
private long notEmptySignalCount = 0L;
@@ -167,8 +165,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
closeCount = 0;
discardCount = 0;
recycleCount = 0;
createConnectionCount = 0;
destroyCount = 0;
createCount.set(0);
destroyCount.set(0);
removeAbandonedCount = 0;
notEmptyWaitCount = 0;
notEmptySignalCount = 0L;
@@ -399,7 +397,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
try {
// 初始化连接
for (int i = 0, size = getInitialSize(); i < size; ++i) {
Connection conn = createConnection();
Connection conn = createPhysicalConnection();
if (defaultAutoCommit != conn.getAutoCommit()) {
conn.setAutoCommit(defaultAutoCommit);
}
@@ -794,9 +792,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (!validate) {
JdbcUtils.close(conn);
destroyCount.incrementAndGet();
lock.lockInterruptibly();
try {
destroyCount++;
activeCount--;
closeCount++;
} finally {
@@ -817,7 +816,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
putLast(holder);
recycleCount++;
} else {
destroyCount++;
activeCount--;
closeCount++;
neadDestory = true;
@@ -827,6 +825,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
if (neadDestory) {
destroyCount.incrementAndGet();
JdbcUtils.close(conn);
}
} catch (Throwable e) {
@@ -894,7 +893,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
JdbcUtils.close(connHolder.getConnection());
connections[i] = null;
destroyCount++;
destroyCount.incrementAndGet();
} catch (Exception ex) {
LOG.warn("close connection error", ex);
}
@@ -921,10 +920,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
}
void incrementCreateCount() {
createConnectionCount++;
}
void putLast(ConnectionHolder e) throws SQLException {
if (!enable) {
discardConnection(e.getConnection());
@@ -1036,11 +1031,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
public long getCreateCount() {
return createConnectionCount;
return createCount.get();
}
public long getDestroyCount() {
return destroyCount;
return destroyCount.get();
}
public long getConnectCount() {
@@ -1144,7 +1139,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
Connection connection = null;
try {
connection = createConnection();
connection = createPhysicalConnection();
} catch (SQLException e) {
LOG.error("create connection error", e);
@@ -1403,7 +1398,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
for (ConnectionHolder item : evictList) {
Connection connection = item.getConnection();
JdbcUtils.close(connection);
destroyCount++;
destroyCount.incrementAndGet();
}
}
@@ -26,7 +26,7 @@ import java.util.concurrent.locks.ReentrantLock;
* @param <K> the type of keys maintained by this map
* @param <V> the type of mapped values
*/
public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> {
public class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> {
/**
* The default initial capacity for this table, used when not otherwise specified in a constructor.