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

[fix](jdbc catalog) Fix ClassLoader Scope in JdbcExecutor Initialization (#34620)

Browse Source
This commit is contained in:
zy-kkk
2024-05-10 11:24:39 +08:00
committed by GitHub
parent 22da62a6d5
commit fcbdd77f78
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,13 +308,13 @@ public abstract class BaseJdbcExecutor implements JdbcExecutor {
try {
ClassLoader parent = getClass().getClassLoader();
ClassLoader classLoader = UdfUtils.getClassLoader(config.getJdbcDriverUrl(), parent);
Thread.currentThread().setContextClassLoader(classLoader);
hikariDataSource = JdbcDataSource.getDataSource().getSource(hikariDataSourceKey);
if (hikariDataSource == null) {
synchronized (hikariDataSourceLock) {
hikariDataSource = JdbcDataSource.getDataSource().getSource(hikariDataSourceKey);
if (hikariDataSource == null) {
long start = System.currentTimeMillis();
Thread.currentThread().setContextClassLoader(classLoader);
HikariDataSource ds = new HikariDataSource();
ds.setDriverClassName(config.getJdbcDriverClass());
ds.setJdbcUrl(config.getJdbcUrl());

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

@ -352,13 +352,13 @@ public class DefaultJdbcExecutor {
} else {
ClassLoader parent = getClass().getClassLoader();
ClassLoader classLoader = UdfUtils.getClassLoader(config.getJdbcDriverUrl(), parent);
Thread.currentThread().setContextClassLoader(classLoader);
hikariDataSource = JdbcDataSource.getDataSource().getSource(hikariDataSourceKey);
if (hikariDataSource == null) {
synchronized (hikariDataSourceLock) {
hikariDataSource = JdbcDataSource.getDataSource().getSource(hikariDataSourceKey);
if (hikariDataSource == null) {
long start = System.currentTimeMillis();
Thread.currentThread().setContextClassLoader(classLoader);
HikariDataSource ds = new HikariDataSource();
ds.setDriverClassName(config.getJdbcDriverClass());
ds.setJdbcUrl(config.getJdbcUrl());