You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/09/17 14:02:46 UTC
[incubator-linkis] branch dev-1.3.1 updated: feat: update error sql and eliminate redundant methods (#3438)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 07393d948 feat: update error sql and eliminate redundant methods (#3438)
07393d948 is described below
commit 07393d9489ccc93c48784d33cbdb6d60e6943a0f
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Sat Sep 17 22:02:41 2022 +0800
feat: update error sql and eliminate redundant methods (#3438)
---
.../src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java | 2 --
.../src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml | 5 +++--
.../main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java | 1 -
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
index 2cb9332d8..e63b6424e 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
@@ -756,8 +756,6 @@ public class UDFRestfulApi {
}
String udfName = jsonNode.get("udfName") == null ? null : jsonNode.get("udfName").textValue();
String udfType = jsonNode.get("udfType").textValue();
- String createUser =
- jsonNode.get("createUser") == null ? null : jsonNode.get("createUser").textValue();
int curPage = jsonNode.get("curPage").intValue();
int pageSize = jsonNode.get("pageSize").intValue();
Collection<Integer> udfTypes = null;
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml
index 61a064ed9..6c11405f7 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml
@@ -178,7 +178,8 @@
</select>
<select id="getSameSysCount" resultType="java.lang.Long">
- select count(1) linkis_ps_udf_baseinfo where user_name="sys" and udf_name=#{arg0}
+ select count(1) from linkis_ps_udf_baseinfo where udf_name=#{arg0}
+ and tree_id in (select id from linkis_ps_udf_tree where user_name = 'sys')
</select>
<select id="getSameLoadCount" resultType="java.lang.Long">
@@ -347,7 +348,7 @@
on a.id=b.udf_id
</select>
- <select id="getSharedUDFIdsByUser">
+ <select id="getSharedUDFIdsByUser" resultType="java.lang.Long">
select udf_id from linkis_ps_udf_shared_info where user_name=#{userName}
</select>
</mapper>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
index 31baeac79..25cb38c6a 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
@@ -441,7 +441,6 @@ public class UDFServiceImpl implements UDFService {
public void handoverUdf(Long udfId, String handoverUser) throws UDFException {
logger.info("begin to handover udf, udfId: " + udfId);
UDFInfo udfInfo = udfDao.getUDFById(udfId);
- List<UDFVersion> udfVersionList = udfVersionDao.getAllVersions(udfId);
UDFVersion latestVersion = udfVersionDao.selectLatestByUdfId(udfId);
long count = udfDao.getSameNameCountByUser(udfInfo.getUdfName(), handoverUser);
long sharedCount =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org