Browse Source

REPORT-74418 informix等老驱动未实现部分Connection接口导致druid创建线程退出

release/11.0
rinoux 3 years ago
parent
commit
0780ba3213
  1. 71
      fine-druid/src/main/java/com/fr/third/alibaba/druid/pool/DruidConnectionHolder.java

71
fine-druid/src/main/java/com/fr/third/alibaba/druid/pool/DruidConnectionHolder.java

@ -27,12 +27,14 @@ import javax.sql.ConnectionEventListener;
import javax.sql.StatementEventListener; import javax.sql.StatementEventListener;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
@ -41,6 +43,8 @@ import java.util.concurrent.locks.ReentrantLock;
*/ */
public final class DruidConnectionHolder { public final class DruidConnectionHolder {
private final static Log LOG = LogFactory.getLog(DruidConnectionHolder.class); private final static Log LOG = LogFactory.getLog(DruidConnectionHolder.class);
static Set<DbType> holdabilityUnsupportedDbTypes = new HashSet<>(Arrays.asList(DbType.sybase, DbType.db2, DbType.hive, DbType.odps));
public static boolean holdabilityUnsupported = false; public static boolean holdabilityUnsupported = false;
protected final DruidAbstractDataSource dataSource; protected final DruidAbstractDataSource dataSource;
@ -101,53 +105,46 @@ public final class DruidConnectionHolder {
this.lastActiveTimeMillis = connectTimeMillis; this.lastActiveTimeMillis = connectTimeMillis;
this.lastExecTimeMillis = connectTimeMillis; this.lastExecTimeMillis = connectTimeMillis;
this.underlyingAutoCommit = conn.getAutoCommit();
if (conn instanceof WrapperProxy) { if (conn instanceof WrapperProxy) {
this.connectionId = ((WrapperProxy) conn).getId(); this.connectionId = ((WrapperProxy) conn).getId();
} else { } else {
this.connectionId = dataSource.createConnectionId(); this.connectionId = dataSource.createConnectionId();
} }
{
boolean initUnderlyHoldability = !holdabilityUnsupported; // 下面是一些驱动的默认值,reset时用到
DbType dbType = DbType.of(dataSource.dbTypeName);
if (dbType == DbType.sybase // // autoCommit
|| dbType == DbType.db2 // this.underlyingAutoCommit = conn.getAutoCommit();
|| dbType == DbType.hive //
|| dbType == DbType.odps // // holdability
) { DbType dbType = DbType.of(dataSource.dbTypeName);
initUnderlyHoldability = false; boolean initUnderlyingHoldability = !holdabilityUnsupported;
} if (holdabilityUnsupportedDbTypes.contains(dbType)) {
if (initUnderlyHoldability) { initUnderlyingHoldability = false;
try { }
this.underlyingHoldability = conn.getHoldability();
} catch (UnsupportedOperationException | AbstractMethodError | SQLFeatureNotSupportedException e) { if (initUnderlyingHoldability) {
holdabilityUnsupported = true; try {
LOG.warn("getHoldability unsupported", e); this.underlyingHoldability = conn.getHoldability();
} catch (SQLException e) { } catch (Throwable e) {
// bug fixed for hive jdbc-driver holdabilityUnsupported = true;
if ("Method not supported".equals(e.getMessage())) { LOG.warn("getHoldability error", e);
holdabilityUnsupported = true;
}
LOG.warn("getHoldability error", e);
} catch (Throwable e) {
LOG.warn("getHoldability error", e);
}
} }
} }
this.underlyingReadOnly = conn.isReadOnly(); // readOnly
try {
this.underlyingReadOnly = conn.isReadOnly();
} catch (Throwable e) {
LOG.warn("isReadOnly error", e);
}
// transactionIsolation
try { try {
this.underlyingTransactionIsolation = conn.getTransactionIsolation(); this.underlyingTransactionIsolation = conn.getTransactionIsolation();
} catch (SQLException e) { } catch (Throwable e) {
// compartible for alibaba corba LOG.warn("getTransactionIsolation error", e);
if ("HY000".equals(e.getSQLState())
|| "com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException".equals(e.getClass().getName())) {
// skip
} else {
throw e;
}
} }
this.defaultHoldability = underlyingHoldability; this.defaultHoldability = underlyingHoldability;

Loading…
Cancel
Save