This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new a6e32ad2a Datasource code optimization (#4419)
a6e32ad2a is described below
commit a6e32ad2ab91d3cc8f34252e65377ef0f8655173
Author: ChengJie1053 <[email protected]>
AuthorDate: Sun Apr 2 00:31:48 2023 +0800
Datasource code optimization (#4419)
---
.../query/common/cache/CacheConfiguration.java | 2 +-
.../metadata/query/service/HiveMetaService.java | 1 -
.../query/service/clickhouse/SqlConnection.java | 9 +++---
.../metadata/query/service/db2/SqlConnection.java | 16 ++--------
.../metadata/query/service/dm/SqlConnection.java | 9 +-----
.../query/service/greenplum/SqlConnection.java | 15 ++--------
.../query/service/kingbase/SqlConnection.java | 34 +---------------------
.../query/service/mysql/SqlConnection.java | 9 +++---
.../query/service/oracle/SqlConnection.java | 6 ++--
.../query/service/postgres/SqlConnection.java | 14 ++-------
.../query/service/sqlserver/SqlConnection.java | 16 +++-------
.../metadata/query/service/KafkaMetaService.java | 5 ----
.../linkis/metadata/ddl/ImportDDLCreator.scala | 1 -
13 files changed, 24 insertions(+), 113 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
index 35d817dc6..e3510537a 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
@@ -34,5 +34,5 @@ public class CacheConfiguration {
public static final CommonVars<String> MYSQL_RELATIONSHIP_LIST =
CommonVars.apply(
"wds.linkis.server.mdq.mysql.relationship",
-
"mysql,oracle,kingbase,postgresql,sqlserver,db2,greenplum,dm,mysql,doris,clickhouse");
+
"mysql,oracle,kingbase,postgresql,sqlserver,db2,greenplum,dm,doris,clickhouse");
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
index 73c4e86f7..97040ec43 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
@@ -165,7 +165,6 @@ public class HiveMetaService extends
AbstractDbMetaService<HiveConnection> {
Map<String, MetaPartitionInfo.PartitionNode> pMap = new HashMap<>(20);
MetaPartitionInfo.PartitionNode root = new
MetaPartitionInfo.PartitionNode();
info.setRoot(root);
- long t = System.currentTimeMillis();
for (Partition p : partitions) {
try {
List<String> values = p.getValues();
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/clickhouse/SqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/clickhouse/SqlConnection.java
index 0ec7ce9a6..81cbe029b 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/clickhouse/SqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/clickhouse/SqlConnection.java
@@ -107,7 +107,7 @@ public class SqlConnection implements Closeable {
ResultSet rs = null;
ResultSetMetaData meta = null;
try {
- List<String> primaryKeys =
getPrimaryKeys(getDBConnection(connectMessage, database), table);
+ List<String> primaryKeys = getPrimaryKeys(table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
meta = rs.getMetaData();
@@ -131,16 +131,15 @@ public class SqlConnection implements Closeable {
/**
* Get primary keys
*
- * @param connection connection
* @param table table name
* @return
* @throws SQLException
*/
- private List<String> getPrimaryKeys(Connection connection, String table)
throws SQLException {
+ private List<String> getPrimaryKeys(String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
try {
- DatabaseMetaData dbMeta = connection.getMetaData();
+ DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
@@ -148,7 +147,7 @@ public class SqlConnection implements Closeable {
return primaryKeys;
} finally {
if (null != rs) {
- closeResource(connection, null, rs);
+ rs.close();
}
}
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java
index 561e935d5..14bd8b5ad 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java
@@ -73,8 +73,6 @@ public class SqlConnection implements Closeable {
try {
stmt = conn.createStatement();
rs = stmt.executeQuery("list database directory");
- // rs = stmt.executeQuery("SELECT * FROM SYSIBMADM.APPLICATIONS WITH
UR");
- // rs = stmt.executeQuery("select * from syscat.tables");
while (rs.next()) {
dataBaseName.add(rs.getString(1));
}
@@ -107,16 +105,12 @@ public class SqlConnection implements Closeable {
public List<MetaColumnInfo> getColumns(String schemaname, String table)
throws SQLException, ClassNotFoundException {
List<MetaColumnInfo> columns = new ArrayList<>();
- // String columnSql = "SELECT * FROM syscat.columns WHERE TABSCHEMA
= '" + schemaname
- // + "' AND TABNAME = '" + table + "'";
String columnSql = "SELECT * FROM " + schemaname + "." + table + " WHERE 1
= 2";
PreparedStatement ps = null;
ResultSet rs = null;
ResultSetMetaData meta = null;
try {
- // List<String> primaryKeys =
getPrimaryKeys(getDBConnection(connectMessage,
- // schemaname), table);
- List<String> primaryKeys = getPrimaryKeys(conn, table);
+ List<String> primaryKeys = getPrimaryKeys(table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
meta = rs.getMetaData();
@@ -140,16 +134,15 @@ public class SqlConnection implements Closeable {
/**
* Get primary keys
*
- * @param connection connection
* @param table table name
* @return
* @throws SQLException
*/
- private List<String> getPrimaryKeys(Connection connection, String table)
throws SQLException {
+ private List<String> getPrimaryKeys(String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
try {
- DatabaseMetaData dbMeta = connection.getMetaData();
+ DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
@@ -159,9 +152,6 @@ public class SqlConnection implements Closeable {
if (null != rs) {
rs.close();
}
- // if(null != rs){
- // closeResource(connection, null, rs);
- // }
}
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/dm/SqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/dm/SqlConnection.java
index 27e953728..e19dda991 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/dm/SqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/dm/SqlConnection.java
@@ -131,22 +131,15 @@ public class SqlConnection implements Closeable {
return columns;
}
- private List<String> getPrimaryKeys(
- /*Connection connection, */ String schema, String table) throws
SQLException {
+ private List<String> getPrimaryKeys(String schema, String table) throws
SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
- // try {
DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, schema, table);
while (rs.next()) {
primaryKeys.add(rs.getString("COLUMN_NAME"));
}
return primaryKeys;
- /*}finally{
- if(null != rs){
- closeResource(connection, null, rs);
- }
- }*/
}
/**
* Get Column Comment
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/greenplum/SqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/greenplum/SqlConnection.java
index 4ea091077..4685b0679 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/greenplum/SqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/greenplum/SqlConnection.java
@@ -92,8 +92,6 @@ public class SqlConnection implements Closeable {
rs =
stmt.executeQuery(
"SELECT tablename FROM pg_tables where schemaname = '" +
schemaname + "'");
- // rs = stmt.executeQuery("SELECT table_name FROM
- // information_schema.tables");
while (rs.next()) {
tableNames.add(rs.getString(1));
}
@@ -111,8 +109,7 @@ public class SqlConnection implements Closeable {
ResultSet rs = null;
ResultSetMetaData meta;
try {
- List<String> primaryKeys =
- getPrimaryKeys(/*getDBConnection(connectMessage, schemaname), */
table);
+ List<String> primaryKeys = getPrimaryKeys(table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
meta = rs.getMetaData();
@@ -136,27 +133,19 @@ public class SqlConnection implements Closeable {
/**
* Get primary keys
*
- * @param connection connection
* @param table table name
* @return
* @throws SQLException
*/
- private List<String> getPrimaryKeys(
- /*Connection connection, */ String table) throws SQLException {
+ private List<String> getPrimaryKeys(String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
- // try {
DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
}
return primaryKeys;
- /*}finally{
- if(null != rs){
- closeResource(connection, null, rs);
- }
- }*/
}
/**
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/kingbase/SqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/kingbase/SqlConnection.java
index 74379ab15..6eba1fe3b 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/kingbase/SqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/kingbase/SqlConnection.java
@@ -130,47 +130,15 @@ public class SqlConnection implements Closeable {
return columns;
}
- // /**
- // * Get primary keys
- // * @param connection connection
- // * @param table table name
- // * @return
- // * @throws SQLException
- // */
- // private List<String> getPrimaryKeys(Connection connection, String
table) throws
- // SQLException {
- // ResultSet rs = null;
- // List<String> primaryKeys = new ArrayList<>();
- // try {
- // DatabaseMetaData dbMeta = connection.getMetaData();
- // rs = dbMeta.getPrimaryKeys(null, null, table);
- // while(rs.next()){
- // primaryKeys.add(rs.getString("column_name"));
- // }
- // return primaryKeys;
- // }finally{
- // if(null != rs){
- // closeResource(connection, null, rs);
- // }
- // }
- // }
-
- private List<String> getPrimaryKeys(
- /*Connection connection, */ String table) throws SQLException {
+ private List<String> getPrimaryKeys(String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
- // try {
DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
}
return primaryKeys;
- /*}finally{
- if(null != rs){
- closeResource(connection, null, rs);
- }
- }*/
}
/**
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java
index bab34059e..8c081e61f 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java
@@ -112,7 +112,7 @@ public class SqlConnection implements Closeable {
ResultSet rs = null;
ResultSetMetaData meta = null;
try {
- List<String> primaryKeys =
getPrimaryKeys(getDBConnection(connectMessage, database), table);
+ List<String> primaryKeys = getPrimaryKeys(table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
meta = rs.getMetaData();
@@ -136,16 +136,15 @@ public class SqlConnection implements Closeable {
/**
* Get primary keys
*
- * @param connection connection
* @param table table name
* @return
* @throws SQLException
*/
- private List<String> getPrimaryKeys(Connection connection, String table)
throws SQLException {
+ private List<String> getPrimaryKeys(String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
try {
- DatabaseMetaData dbMeta = connection.getMetaData();
+ DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
@@ -153,7 +152,7 @@ public class SqlConnection implements Closeable {
return primaryKeys;
} finally {
if (null != rs) {
- closeResource(connection, null, rs);
+ rs.close();
}
}
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/oracle/SqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/oracle/SqlConnection.java
index 890659adc..6a99a043e 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/oracle/SqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/oracle/SqlConnection.java
@@ -110,8 +110,7 @@ public class SqlConnection implements Closeable {
ResultSet rs = null;
ResultSetMetaData meta;
try {
- List<String> primaryKeys =
- getPrimaryKeys(/*getDBConnection(connectMessage, schemaname), */
table);
+ List<String> primaryKeys = getPrimaryKeys(table);
Map<String, String> columnCommentMap = getColumnComment(schemaname,
table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
@@ -148,8 +147,7 @@ public class SqlConnection implements Closeable {
* @return
* @throws SQLException
*/
- private List<String> getPrimaryKeys(
- /*Connection connection, */ String table) throws SQLException {
+ private List<String> getPrimaryKeys(String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
DatabaseMetaData dbMeta = conn.getMetaData();
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/postgres/SqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/postgres/SqlConnection.java
index 659ca741c..3ac2e638b 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/postgres/SqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/postgres/SqlConnection.java
@@ -89,8 +89,6 @@ public class SqlConnection implements Closeable {
rs =
stmt.executeQuery(
"SELECT tablename FROM pg_tables where schemaname = '" +
schemaname + "'");
- // rs = stmt.executeQuery("SELECT table_name FROM
- // information_schema.tables");
while (rs.next()) {
tableNames.add(rs.getString(1));
}
@@ -108,8 +106,7 @@ public class SqlConnection implements Closeable {
ResultSet rs = null;
ResultSetMetaData meta;
try {
- List<String> primaryKeys =
- getPrimaryKeys(/*getDBConnection(connectMessage, schemaname), */
table);
+ List<String> primaryKeys = getPrimaryKeys(table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
meta = rs.getMetaData();
@@ -137,22 +134,15 @@ public class SqlConnection implements Closeable {
* @return
* @throws SQLException
*/
- private List<String> getPrimaryKeys(
- /*Connection connection, */ String table) throws SQLException {
+ private List<String> getPrimaryKeys(String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
- // try {
DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
}
return primaryKeys;
- /*}finally{
- if(null != rs){
- closeResource(connection, null, rs);
- }
- }*/
}
/**
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/sqlserver/SqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/sqlserver/SqlConnection.java
index b349cb7e3..0d3597380 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/sqlserver/SqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/sqlserver/SqlConnection.java
@@ -110,17 +110,12 @@ public class SqlConnection implements Closeable {
public List<MetaColumnInfo> getColumns(String database, String table)
throws SQLException, ClassNotFoundException {
List<MetaColumnInfo> columns = new ArrayList<>();
- // String columnSql = "SELECT a.name FieldName, b.name [Type],
a.isnullable,
- // ISNULL(g.[value], '') AS FieldRemark FROM SysColumns a LEFT JOIN
systypes b on a.xtype =
- // b.xusertype INNER JOIN sysobjects d ON a.id = d.id AND d.xtype = 'U'
AND d.name IN
- // ('"+table+"') LEFT JOIN syscomments e ON a.cdefault = e.id LEFT JOIN
- // sys.extended_properties g ON a.id = g.major_id AND a.colid =
g.minor_id";
String columnSql = "SELECT * FROM " + database + ".dbo." + table + " WHERE
1 = 2";
PreparedStatement ps = null;
ResultSet rs = null;
ResultSetMetaData meta;
try {
- List<String> primaryKeys =
getPrimaryKeys(getDBConnection(connectMessage, database), table);
+ List<String> primaryKeys = getPrimaryKeys(table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
meta = rs.getMetaData();
@@ -144,16 +139,15 @@ public class SqlConnection implements Closeable {
/**
* Get primary keys
*
- * @param connection connection
* @param table table name
* @return
* @throws SQLException
*/
- private List<String> getPrimaryKeys(Connection connection, String table)
throws SQLException {
+ private List<String> getPrimaryKeys(String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
try {
- DatabaseMetaData dbMeta = connection.getMetaData();
+ DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
@@ -161,7 +155,7 @@ public class SqlConnection implements Closeable {
return primaryKeys;
} finally {
if (null != rs) {
- closeResource(connection, null, rs);
+ closeResource(null, null, rs);
}
}
}
@@ -210,8 +204,6 @@ public class SqlConnection implements Closeable {
String url =
String.format(
SQL_CONNECT_URL.getValue(), connectMessage.host,
connectMessage.port, database);
- // String url = String.format(SQL_CONNECT_URL.getValue(),
connectMessage.host,
- // database);
if (!connectMessage.extraParams.isEmpty()) {
url += "?" + extraParamString;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaMetaService.java
index f0d0092af..cc77d581d 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaMetaService.java
@@ -29,9 +29,6 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -59,8 +56,6 @@ public class KafkaMetaService extends
AbstractDbMetaService<KafkaConnection> {
public MetadataConnection<KafkaConnection> getConnection(
String operator, Map<String, Object> params) throws Exception {
FileUtils.forceMkdir(new File(TMP_FILE_STORE_LOCATION.getValue()));
- Resource resource =
- new
PathMatchingResourcePatternResolver().getResource(TMP_FILE_STORE_LOCATION.getValue());
String brokers =
String.valueOf(params.getOrDefault(KafkaParamsMapper.PARAM_KAFKA_BROKERS.getValue(),
""));
String principle =
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ImportDDLCreator.scala
b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ImportDDLCreator.scala
index 7e7d464b0..cdd1c236f 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ImportDDLCreator.scala
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ImportDDLCreator.scala
@@ -72,7 +72,6 @@ object FileImportDDLHelper extends ImportHelper with Logging {
)
var createTableCode = new StringBuilder
val importInfo = mdqTableBO.getImportInfo
- val args = importInfo.getArgs
val _source =
if (StringUtils.isEmpty(importInfo.getSource)) {
throw MdqIllegalParamException(IMPORT_HIVE_SOURCE_IS_NULL.getErrorDesc)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
