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 d55437474 Generate sql code optimization (#4594)
d55437474 is described below
commit d55437474e000422fd7f9b2ac78ff73252d2b98f
Author: ChengJie1053 <[email protected]>
AuthorDate: Fri Jun 2 14:43:50 2023 +0800
Generate sql code optimization (#4594)
---
...dlSQlTemplate.java => GenerateSqlTemplate.java} | 6 ++---
.../service/impl/MetadataQueryServiceImpl.java | 26 +++++++++++-----------
.../query/service/AbstractSqlConnection.java | 9 ++++----
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/SparkDdlSQlTemplate.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/GenerateSqlTemplate.java
similarity index 93%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/SparkDdlSQlTemplate.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/GenerateSqlTemplate.java
index 0b3ee7bc4..c2fb4f218 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/SparkDdlSQlTemplate.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/GenerateSqlTemplate.java
@@ -17,7 +17,7 @@
package org.apache.linkis.metadata.query.common.service;
-public class SparkDdlSQlTemplate {
+public class GenerateSqlTemplate {
public static final String ES_DDL_SQL_TEMPLATE =
"CREATE TEMPORARY TABLE %s "
@@ -59,10 +59,10 @@ public class SparkDdlSQlTemplate {
public static final String DQL_SQL_TEMPLATE = "SELECT %s FROM %s";
public static String generateDqlSql(String columns, String table) {
- return String.format(SparkDdlSQlTemplate.DQL_SQL_TEMPLATE, columns, table);
+ return String.format(GenerateSqlTemplate.DQL_SQL_TEMPLATE, columns, table);
}
public static String generateDmlSql(String table) {
- return String.format(SparkDdlSQlTemplate.DML_SQL_TEMPLATE, table);
+ return String.format(GenerateSqlTemplate.DML_SQL_TEMPLATE, table);
}
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
index 5a1608dcb..904ab4d94 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
@@ -32,8 +32,8 @@ import
org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
import
org.apache.linkis.metadata.query.common.exception.MetaMethodInvokeException;
import org.apache.linkis.metadata.query.common.exception.MetaRuntimeException;
+import org.apache.linkis.metadata.query.common.service.GenerateSqlTemplate;
import org.apache.linkis.metadata.query.common.service.MetadataConnection;
-import org.apache.linkis.metadata.query.common.service.SparkDdlSQlTemplate;
import org.apache.linkis.metadata.query.server.loader.MetaClassLoaderManager;
import org.apache.linkis.metadata.query.server.service.MetadataQueryService;
import org.apache.linkis.rpc.Sender;
@@ -452,21 +452,21 @@ public class MetadataQueryServiceImpl implements
MetadataQueryService {
HttpHost httpHost = HttpHost.create(endPoints[0]);
String ddl =
String.format(
- SparkDdlSQlTemplate.ES_DDL_SQL_TEMPLATE,
+ GenerateSqlTemplate.ES_DDL_SQL_TEMPLATE,
table,
httpHost.getHostName(),
httpHost.getPort(),
table);
generateSqlInfo.setDdl(ddl);
- generateSqlInfo.setDml(SparkDdlSQlTemplate.generateDmlSql(table));
+ generateSqlInfo.setDml(GenerateSqlTemplate.generateDmlSql(table));
String columnStr = "*";
if (CollectionUtils.isNotEmpty(columns)) {
columnStr = columns.stream().map(column ->
column.getName()).collect(Collectors.joining(","));
}
- generateSqlInfo.setDql(SparkDdlSQlTemplate.generateDqlSql(columnStr,
table));
+ generateSqlInfo.setDql(GenerateSqlTemplate.generateDqlSql(columnStr,
table));
return generateSqlInfo;
}
@@ -479,10 +479,10 @@ public class MetadataQueryServiceImpl implements
MetadataQueryService {
params.getOrDefault("host", ""), params.getOrDefault("port", ""),
database);
String ddl =
- String.format(SparkDdlSQlTemplate.MONGO_DDL_SQL_TEMPLATE, table, url,
database, table);
+ String.format(GenerateSqlTemplate.MONGO_DDL_SQL_TEMPLATE, table, url,
database, table);
generateSqlInfo.setDdl(ddl);
- generateSqlInfo.setDml(SparkDdlSQlTemplate.generateDmlSql(table));
+ generateSqlInfo.setDml(GenerateSqlTemplate.generateDmlSql(table));
String columnStr = "*";
if (CollectionUtils.isNotEmpty(columns)) {
@@ -493,7 +493,7 @@ public class MetadataQueryServiceImpl implements
MetadataQueryService {
.collect(Collectors.joining(","));
}
- generateSqlInfo.setDql(SparkDdlSQlTemplate.generateDqlSql(columnStr,
table));
+ generateSqlInfo.setDql(GenerateSqlTemplate.generateDqlSql(columnStr,
table));
return generateSqlInfo;
}
@@ -501,12 +501,12 @@ public class MetadataQueryServiceImpl implements
MetadataQueryService {
GenerateSqlInfo generateSqlInfo = new GenerateSqlInfo();
String kafkaServers = String.valueOf(params.getOrDefault("uris",
"localhost:9092"));
String ddl =
- String.format(SparkDdlSQlTemplate.KAFKA_DDL_SQL_TEMPLATE, table,
kafkaServers, table);
+ String.format(GenerateSqlTemplate.KAFKA_DDL_SQL_TEMPLATE, table,
kafkaServers, table);
generateSqlInfo.setDdl(ddl);
- generateSqlInfo.setDml(SparkDdlSQlTemplate.generateDmlSql(table));
+ generateSqlInfo.setDml(GenerateSqlTemplate.generateDmlSql(table));
- generateSqlInfo.setDql(SparkDdlSQlTemplate.generateDqlSql("CAST(value AS
STRING)", table));
+ generateSqlInfo.setDql(GenerateSqlTemplate.generateDqlSql("CAST(value AS
STRING)", table));
return generateSqlInfo;
}
@@ -527,7 +527,7 @@ public class MetadataQueryServiceImpl implements
MetadataQueryService {
database);
String ddl =
String.format(
- SparkDdlSQlTemplate.JDBC_DDL_SQL_TEMPLATE,
+ GenerateSqlTemplate.JDBC_DDL_SQL_TEMPLATE,
sparkTableName,
url,
table,
@@ -535,14 +535,14 @@ public class MetadataQueryServiceImpl implements
MetadataQueryService {
params.getOrDefault("password", ""));
generateSqlInfo.setDdl(ddl);
- generateSqlInfo.setDml(SparkDdlSQlTemplate.generateDmlSql(table));
+ generateSqlInfo.setDml(GenerateSqlTemplate.generateDmlSql(table));
String columnStr = "*";
if (CollectionUtils.isNotEmpty(columns)) {
columnStr = columns.stream().map(column ->
column.getName()).collect(Collectors.joining(","));
}
- generateSqlInfo.setDql(SparkDdlSQlTemplate.generateDqlSql(columnStr,
table));
+ generateSqlInfo.setDql(GenerateSqlTemplate.generateDqlSql(columnStr,
table));
return generateSqlInfo;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
index 8261f99dd..0b7dd26e7 100755
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
@@ -19,7 +19,7 @@ package org.apache.linkis.metadata.query.service;
import org.apache.linkis.metadata.query.common.domain.GenerateSqlInfo;
import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadata.query.common.service.SparkDdlSQlTemplate;
+import org.apache.linkis.metadata.query.common.service.GenerateSqlTemplate;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -121,8 +121,7 @@ public abstract class AbstractSqlConnection implements
Closeable {
String ddl = generateJdbcDdlSql(database, table);
generateSqlInfo.setDdl(ddl);
- String dml = String.format(SparkDdlSQlTemplate.DML_SQL_TEMPLATE, table);
- generateSqlInfo.setDml(dml);
+ generateSqlInfo.setDml(GenerateSqlTemplate.generateDmlSql(table));
String columnStr = "*";
try {
@@ -134,8 +133,8 @@ public abstract class AbstractSqlConnection implements
Closeable {
} catch (Exception e) {
LOG.warn("Fail to get Sql columns(获取字段列表失败)", e);
}
- String dql = String.format(SparkDdlSQlTemplate.DQL_SQL_TEMPLATE,
columnStr, table);
- generateSqlInfo.setDql(dql);
+ generateSqlInfo.setDql(GenerateSqlTemplate.generateDqlSql(columnStr,
table));
+
return generateSqlInfo;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
