Skip to content

D
dataease
提交 436fc108 authored 作者: taojinlong's avatar taojinlong
浏览文件
操作

fix: 指定 parent classloader;

上级 627f91b1
显示空白字符变更
内嵌 并排
正在显示 包含 37 行增加 和 187 行删除
backend/src/main/java/io/dataease/datasource/provider/ExtendedJdbcClassLoader.java
浏览文件 @ 436fc108
...@@ -7,8 +7,8 @@ import java.net.URL; ...@@ -7,8 +7,8 @@ import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
public class ExtendedJdbcClassLoader extends URLClassLoader { public class ExtendedJdbcClassLoader extends URLClassLoader {
public ExtendedJdbcClassLoader(URL[] urls) { public ExtendedJdbcClassLoader(URL[] urls, ClassLoader parent) {
super(urls); super(urls, parent);
} }
@Override @Override
...@@ -88,10 +88,4 @@ public class ExtendedJdbcClassLoader extends URLClassLoader { ...@@ -88,10 +88,4 @@ public class ExtendedJdbcClassLoader extends URLClassLoader {
throw new IOException("Error, could not add URL to system classloader"); throw new IOException("Error, could not add URL to system classloader");
} }
} }
public static synchronized ExtendedJdbcClassLoader getExtJdbcClassLoader(String path) throws Exception{
File file = new File(path);
ExtendedJdbcClassLoader extendedJdbcClassLoader = new ExtendedJdbcClassLoader(new URL[]{file.toURI().toURL()});
return extendedJdbcClassLoader;
}
} }
\ No newline at end of file
backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
浏览文件 @ 436fc108
...@@ -21,16 +21,14 @@ import java.util.*; ...@@ -21,16 +21,14 @@ import java.util.*;
@Service("jdbc") @Service("jdbc")
public class JdbcProvider extends DatasourceProvider { public class JdbcProvider extends DatasourceProvider {
private static Map<String, DruidDataSource> jdbcConnection = new HashMap<>(); private static Map<String, DruidDataSource> jdbcConnection = new HashMap<>();
private static Map<String, ExtendedJdbcClassLoader> extendedJdbcClassLoaderHashMap = new HashMap<>(); public ExtendedJdbcClassLoader extendedJdbcClassLoader;
private static int initPoolSize = 5;
private static int maxConnections = 200;
private ExtendedJdbcClassLoader extendedJdbcClassLoader;
static private String FILE_PATH = "/opt/dataease/drivers"; static private String FILE_PATH = "/opt/dataease/drivers";
@PostConstruct @PostConstruct
public void init() throws Exception{ public void init() throws Exception{
extendedJdbcClassLoader = new ExtendedJdbcClassLoader(new URL[]{new File(FILE_PATH).toURI().toURL()}); ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
extendedJdbcClassLoader = new ExtendedJdbcClassLoader(new URL[]{new File(FILE_PATH).toURI().toURL()}, classLoader);
File file = new File(FILE_PATH); File file = new File(FILE_PATH);
File[] array = file.listFiles(); File[] array = file.listFiles();
Optional.ofNullable(array).ifPresent(files -> { Optional.ofNullable(array).ifPresent(files -> {
...@@ -64,13 +62,8 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -64,13 +62,8 @@ public class JdbcProvider extends DatasourceProvider {
@Override @Override
public List<String[]> getData(DatasourceRequest dsr) throws Exception { public List<String[]> getData(DatasourceRequest dsr) throws Exception {
List<String[]> list = new LinkedList<>(); List<String[]> list = new LinkedList<>();
Connection connection = null; try (Connection connection = getConnectionFromPool(dsr); Statement stat = connection.createStatement(); ResultSet rs = stat.executeQuery(dsr.getQuery())){
try {
connection = getConnection(dsr);
Statement stat = connection.createStatement();
ResultSet rs = stat.executeQuery(dsr.getQuery());
list = fetchResult(rs); list = fetchResult(rs);
if(dsr.isPageable() && dsr.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name())){ if(dsr.isPageable() && dsr.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name())){
Integer realSize = dsr.getPage() * dsr.getPageSize() < list.size() ? dsr.getPage() * dsr.getPageSize(): list.size(); Integer realSize = dsr.getPage() * dsr.getPageSize() < list.size() ? dsr.getPage() * dsr.getPageSize(): list.size();
list = list.subList((dsr.getPage() - 1) * dsr.getPageSize(), realSize); list = list.subList((dsr.getPage() - 1) * dsr.getPageSize(), realSize);
...@@ -80,49 +73,28 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -80,49 +73,28 @@ public class JdbcProvider extends DatasourceProvider {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} catch (Exception e) { } catch (Exception e) {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} finally {
if(connection != null){
connection.close();
}
} }
return list; return list;
} }
public void exec(DatasourceRequest datasourceRequest) throws Exception { public void exec(DatasourceRequest datasourceRequest) throws Exception {
Connection connection = null; try (Connection connection = getConnectionFromPool(datasourceRequest); Statement stat = connection.createStatement()){
try {
connection = getConnectionFromPool(datasourceRequest);
Statement stat = connection.createStatement();
Boolean result = stat.execute(datasourceRequest.getQuery()); Boolean result = stat.execute(datasourceRequest.getQuery());
stat.close();
} catch (SQLException e) { } catch (SQLException e) {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} catch (Exception e) { } catch (Exception e) {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} finally {
if(connection != null){
connection.close();
}
} }
} }
@Override @Override
public List<String[]> fetchResult(DatasourceRequest datasourceRequest) throws Exception { public List<String[]> fetchResult(DatasourceRequest datasourceRequest) throws Exception {
ResultSet rs; try (Connection connection = getConnectionFromPool(datasourceRequest); Statement stat = connection.createStatement(); ResultSet rs = stat.executeQuery(datasourceRequest.getQuery())){
Connection connection = null;
try {
connection = getConnectionFromPool(datasourceRequest);
Statement stat = connection.createStatement();
rs = stat.executeQuery(datasourceRequest.getQuery());
return fetchResult(rs); return fetchResult(rs);
} catch (SQLException e) { } catch (SQLException e) {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} catch (Exception e) { } catch (Exception e) {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} finally {
if(connection != null){
connection.close();
}
} }
return new ArrayList<>(); return new ArrayList<>();
} }
...@@ -153,36 +125,22 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -153,36 +125,22 @@ public class JdbcProvider extends DatasourceProvider {
@Override @Override
public List<TableFiled> fetchResultField(DatasourceRequest datasourceRequest) throws Exception { public List<TableFiled> fetchResultField(DatasourceRequest datasourceRequest) throws Exception {
ResultSet rs; try (Connection connection = getConnectionFromPool(datasourceRequest); Statement stat = connection.createStatement(); ResultSet rs = stat.executeQuery(datasourceRequest.getQuery())){
Connection connection = null;
try {
connection = getConnectionFromPool(datasourceRequest);
Statement stat = connection.createStatement();
rs = stat.executeQuery(datasourceRequest.getQuery());
return fetchResultField(rs, datasourceRequest); return fetchResultField(rs, datasourceRequest);
} catch (SQLException e) { } catch (SQLException e) {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} catch (Exception e) { } catch (Exception e) {
DataEaseException.throwException(Translator.get("i18n_datasource_connect_error") + e.getMessage()); DataEaseException.throwException(Translator.get("i18n_datasource_connect_error") + e.getMessage());
} finally {
if(connection != null){
connection.close();
}
} }
return new ArrayList<>(); return new ArrayList<>();
} }
@Override @Override
public Map<String, List> fetchResultAndField(DatasourceRequest datasourceRequest) throws Exception { public Map<String, List> fetchResultAndField(DatasourceRequest datasourceRequest) throws Exception {
ResultSet rs;
Map<String, List> result = new HashMap<>(); Map<String, List> result = new HashMap<>();
Connection connection = null;
List<String[]> dataList = new LinkedList<>(); List<String[]> dataList = new LinkedList<>();
List<TableFiled> fieldList = new ArrayList<>(); List<TableFiled> fieldList = new ArrayList<>();
try { try (Connection connection = getConnectionFromPool(datasourceRequest); Statement stat = connection.createStatement(); ResultSet rs = stat.executeQuery(datasourceRequest.getQuery())){
connection = getConnectionFromPool(datasourceRequest);
Statement stat = connection.createStatement();
rs = stat.executeQuery(datasourceRequest.getQuery());
dataList = fetchResult(rs); dataList = fetchResult(rs);
fieldList = fetchResultField(rs, datasourceRequest); fieldList = fetchResultField(rs, datasourceRequest);
result.put("dataList", dataList); result.put("dataList", dataList);
...@@ -192,10 +150,6 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -192,10 +150,6 @@ public class JdbcProvider extends DatasourceProvider {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} catch (Exception e) { } catch (Exception e) {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} finally {
if(connection != null){
connection.close();
}
} }
return new HashMap<>(); return new HashMap<>();
} }
...@@ -231,138 +185,52 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -231,138 +185,52 @@ public class JdbcProvider extends DatasourceProvider {
@Override @Override
public List<String> getTables(DatasourceRequest datasourceRequest) throws Exception { public List<String> getTables(DatasourceRequest datasourceRequest) throws Exception {
List<String> tables = new ArrayList<>(); List<String> tables = new ArrayList<>();
Connection con = null;
try {
String queryStr = getTablesSql(datasourceRequest); String queryStr = getTablesSql(datasourceRequest);
con = getConnection(datasourceRequest); try (Connection con = getConnectionFromPool(datasourceRequest); Statement statement = con.createStatement(); ResultSet resultSet = statement.executeQuery(queryStr)){
Statement statement = con.createStatement();
ResultSet resultSet = statement.executeQuery(queryStr);
while (resultSet.next()) { while (resultSet.next()) {
tables.add(resultSet.getString(1)); tables.add(resultSet.getString(1));
} }
resultSet.close(); } catch (Exception e) {
statement.close(); DataEaseException.throwException(e);
}
String queryView = getViewSql(datasourceRequest); String queryView = getViewSql(datasourceRequest);
if(StringUtils.isNotEmpty(queryView)){ try (Connection con = getConnectionFromPool(datasourceRequest); Statement statement = con.createStatement(); ResultSet resultSet = statement.executeQuery(queryView)){
con = getConnection(datasourceRequest);
statement = con.createStatement();
resultSet = statement.executeQuery(queryView);
while (resultSet.next()) { while (resultSet.next()) {
tables.add(resultSet.getString(1)); tables.add(resultSet.getString(1));
} }
resultSet.close();
statement.close();
}
return tables;
} catch (Exception e) { } catch (Exception e) {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} finally {
if(con != null){
con.close();
} }
} return tables;
return new ArrayList<>();
} }
@Override @Override
public List<String> getSchema(DatasourceRequest datasourceRequest) throws Exception { public List<String> getSchema(DatasourceRequest datasourceRequest) throws Exception {
List<String> schemas = new ArrayList<>(); List<String> schemas = new ArrayList<>();
String queryStr = getSchemaSql(datasourceRequest); String queryStr = getSchemaSql(datasourceRequest);
Connection con = null; try (Connection con = getConnection(datasourceRequest); Statement statement = con.createStatement(); ResultSet resultSet = statement.executeQuery(queryStr)){
try {
con = getConnection(datasourceRequest);
Statement statement = con.createStatement();
ResultSet resultSet = statement.executeQuery(queryStr);
while (resultSet.next()) { while (resultSet.next()) {
schemas.add(resultSet.getString(1)); schemas.add(resultSet.getString(1));
} }
resultSet.close();
statement.close();
return schemas; return schemas;
} catch (Exception e) { } catch (Exception e) {
DataEaseException.throwException(e); DataEaseException.throwException(e);
} finally {
if(con != null){
con.close();
}
} }
return new ArrayList<>(); return new ArrayList<>();
} }
private TableFiled getTableFiled(ResultSet resultSet, DatasourceRequest datasourceRequest) throws SQLException {
TableFiled tableFiled = new TableFiled();
String colName = resultSet.getString("COLUMN_NAME");
tableFiled.setFieldName(colName);
String remarks = resultSet.getString("REMARKS");
if (remarks == null || remarks.equals("")) {
remarks = colName;
}
tableFiled.setRemarks(remarks);
String dbType = resultSet.getString("TYPE_NAME").toUpperCase();
tableFiled.setFieldType(dbType);
if(dbType.equalsIgnoreCase("LONG")){tableFiled.setFieldSize(65533);}
if(StringUtils.isNotEmpty(dbType) && dbType.toLowerCase().contains("date") && tableFiled.getFieldSize() < 50 ){
tableFiled.setFieldSize(50);
}
if(datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.ck.name())){
QueryProvider qp = ProviderFactory.getQueryProvider(datasourceRequest.getDatasource().getType());
tableFiled.setFieldSize(qp.transFieldSize(dbType));
}else {
tableFiled.setFieldSize(Integer.valueOf(resultSet.getString("COLUMN_SIZE")));
}
return tableFiled;
}
@Override @Override
public void checkStatus(DatasourceRequest datasourceRequest) throws Exception { public void checkStatus(DatasourceRequest datasourceRequest) throws Exception {
Connection con = null;
try {
con = getConnection(datasourceRequest);
Statement statement = con.createStatement();
String queryStr = getTablesSql(datasourceRequest); String queryStr = getTablesSql(datasourceRequest);
ResultSet resultSet = statement.executeQuery(queryStr); try (Connection con = getConnection(datasourceRequest); Statement statement = con.createStatement(); ResultSet resultSet = statement.executeQuery(queryStr)){
resultSet.close();
statement.close();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
DataEaseException.throwException(e.getMessage()); DataEaseException.throwException(e.getMessage());
} finally {
if(con != null){con.close();}
} }
} }
public Long count(DatasourceRequest datasourceRequest) throws Exception {
Connection con = null;
try {
con = getConnectionFromPool(datasourceRequest);
Statement ps = con.createStatement();
ResultSet resultSet = ps.executeQuery(datasourceRequest.getQuery());
while (resultSet.next()) {
return resultSet.getLong(1);
}
} catch (Exception e) {
DataEaseException.throwException( e);
} finally {
con.close();
}
return 0L;
}
private Connection getConnectionFromPool(DatasourceRequest datasourceRequest) throws Exception {
DruidDataSource dataSource = jdbcConnection.get(datasourceRequest.getDatasource().getId());
if (dataSource == null) {
handleDatasource(datasourceRequest, "add");
}
dataSource = jdbcConnection.get(datasourceRequest.getDatasource().getId());
Connection co = dataSource.getConnection();
return co;
}
@Override @Override
public void handleDatasource(DatasourceRequest datasourceRequest, String type) throws Exception { public void handleDatasource(DatasourceRequest datasourceRequest, String type) throws Exception {
DruidDataSource dataSource = null; DruidDataSource dataSource = null;
...@@ -393,13 +261,14 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -393,13 +261,14 @@ public class JdbcProvider extends DatasourceProvider {
} }
} }
private void addToPool(DatasourceRequest datasourceRequest) throws PropertyVetoException { private Connection getConnectionFromPool(DatasourceRequest datasourceRequest) throws Exception {
DruidDataSource dataSource = new DruidDataSource(); DruidDataSource dataSource = jdbcConnection.get(datasourceRequest.getDatasource().getId());
JdbcConfiguration jdbcConfiguration = setCredential(datasourceRequest, dataSource); if (dataSource == null) {
dataSource.setInitialSize(jdbcConfiguration.getInitialPoolSize());// 初始连接数 handleDatasource(datasourceRequest, "add");
dataSource.setMinIdle(jdbcConfiguration.getMinPoolSize()); // 最小连接数 }
dataSource.setMaxActive(jdbcConfiguration.getMaxPoolSize()); // 最大连接数 dataSource = jdbcConnection.get(datasourceRequest.getDatasource().getId());
jdbcConnection.put(datasourceRequest.getDatasource().getId(), dataSource); Connection co = dataSource.getConnection();
return co;
} }
private Connection getConnection(DatasourceRequest datasourceRequest) throws Exception { private Connection getConnection(DatasourceRequest datasourceRequest) throws Exception {
...@@ -463,6 +332,15 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -463,6 +332,15 @@ public class JdbcProvider extends DatasourceProvider {
return conn; return conn;
} }
private void addToPool(DatasourceRequest datasourceRequest) throws PropertyVetoException {
DruidDataSource dataSource = new DruidDataSource();
JdbcConfiguration jdbcConfiguration = setCredential(datasourceRequest, dataSource);
dataSource.setInitialSize(jdbcConfiguration.getInitialPoolSize());// 初始连接数
dataSource.setMinIdle(jdbcConfiguration.getMinPoolSize()); // 最小连接数
dataSource.setMaxActive(jdbcConfiguration.getMaxPoolSize()); // 最大连接数
jdbcConnection.put(datasourceRequest.getDatasource().getId(), dataSource);
}
private JdbcConfiguration setCredential(DatasourceRequest datasourceRequest, DruidDataSource dataSource) throws PropertyVetoException { private JdbcConfiguration setCredential(DatasourceRequest datasourceRequest, DruidDataSource dataSource) throws PropertyVetoException {
DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType()); DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType());
...@@ -517,27 +395,6 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -517,27 +395,6 @@ public class JdbcProvider extends DatasourceProvider {
return jdbcConfiguration; return jdbcConfiguration;
} }
private String getDatabase(DatasourceRequest datasourceRequest) {
DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType());
switch (datasourceType) {
case mysql:
case de_doris:
case ds_doris:
case mariadb:
MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfiguration.class);
return mysqlConfiguration.getDataBase();
case sqlServer:
SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfiguration.class);
return sqlServerConfiguration.getDataBase();
case pg:
PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class);
return pgConfiguration.getDataBase();
default:
JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class);
return jdbcConfiguration.getDataBase();
}
}
private String getTablesSql(DatasourceRequest datasourceRequest) throws Exception { private String getTablesSql(DatasourceRequest datasourceRequest) throws Exception {
DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType()); DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType());
switch (datasourceType) { switch (datasourceType) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论