database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[improvement](jdbc catalog) Optimize the Close logic of JDBC client (#30236)

Browse Source 
Optimize the Close logic of the JDBC client so that the Jdbc Catalog can correctly cancel the running query when the query is cancelled.
This commit is contained in:
zy-kkk
2024-01-23 11:52:20 +08:00
committed by yiguolei
parent d964f873d5
commit bc03354be8
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java
View File

@ -34,6 +34,7 @@ import com.clickhouse.data.value.UnsignedInteger;
import com.clickhouse.data.value.UnsignedLong;
import com.clickhouse.data.value.UnsignedShort;
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.MoreExecutors;
import com.vesoft.nebula.client.graph.data.ValueWrapper;
import org.apache.log4j.Logger;
import org.apache.thrift.TDeserializer;
@ -124,25 +125,42 @@ public class JdbcExecutor {
}
public void close() throws Exception {
if (resultSet != null) {
resultSet.close();
try {
if (stmt != null) {
stmt.cancel();
}
if (conn != null && resultSet != null) {
abortReadConnection(conn, resultSet, tableType);
}
if (config.getMinIdleSize() == 0) {
// it can be immediately closed if there is no need to maintain the cache of datasource
druidDataSource.close();
JdbcDataSource.getDataSource().getSourcesMap().clear();
druidDataSource = null;
}
} finally {
if (stmt != null) {
stmt.close();
}
if (resultSet != null) {
resultSet.close();
}
if (conn != null) {
conn.close();
}
resultSet = null;
stmt = null;
conn = null;
}
if (stmt != null) {
stmt.cancel();
stmt.close();
}
public void abortReadConnection(Connection connection, ResultSet resultSet, TOdbcTableType tableType)
throws SQLException {
if (!resultSet.isAfterLast() && (tableType == TOdbcTableType.MYSQL || tableType == TOdbcTableType.SQLSERVER)) {
// Abort connection before closing. Without this, the MySQL driver
// attempts to drain the connection by reading all the results.
connection.abort(MoreExecutors.directExecutor());
}
if (conn != null) {
conn.close();
}
if (config.getMinIdleSize() == 0) {
// it can be immediately closed if there is no need to maintain the cache of datasource
druidDataSource.close();
JdbcDataSource.getDataSource().getSourcesMap().clear();
druidDataSource = null;
}
resultSet = null;
stmt = null;
conn = null;
}
public int read() throws UdfRuntimeException {