Skip to content

branch-2.0: [fix](mem leak) fe non_heap mem leak while use jdbc catalog #45806 #47626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cambyzju merged 2 commits into from
Feb 10, 2025
Merged

branch-2.0: [fix](mem leak) fe non_heap mem leak while use jdbc catalog #45806 #47626

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ca7a1
branch-2.0: [fix](mem leak) fe non_heap mem leak while use jdbc catal…
felixwluo Feb 8, 2025
a581b10
Merge branch 'branch-2.0' into pick-45806
felixwluo Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ public abstract class JdbcClient {
private static final int HTTP_TIMEOUT_MS = 10000;
protected static final int JDBC_DATETIME_SCALE = 6;

private static final Map<URL, ClassLoader> classLoaderMap = new ConcurrentHashMap<>();

private String catalog;
protected String dbType;
protected String jdbcUser;
Expand Down Expand Up @@ -145,11 +147,16 @@ private void initializeDataSource(JdbcClientConfig config) {
}
}

private void initializeClassLoader(JdbcClientConfig config) {
private synchronized void initializeClassLoader(JdbcClientConfig config) {
try {
URL[] urls = {new URL(JdbcResource.getFullDriverUrl(config.getDriverUrl()))};
ClassLoader parent = getClass().getClassLoader();
this.classLoader = URLClassLoader.newInstance(urls, parent);
if (classLoaderMap.containsKey(urls[0])) {
this.classLoader = classLoaderMap.get(urls[0]);
} else {
ClassLoader parent = getClass().getClassLoader();
this.classLoader = URLClassLoader.newInstance(urls, parent);
classLoaderMap.put(urls[0], this.classLoader);
}
} catch (MalformedURLException e) {
throw new RuntimeException("Error loading JDBC driver.", e);
}
Expand Down
Loading