You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/10/18 02:13:59 UTC
[incubator-linkis] branch dev-1.3.1 updated: [ResourceManagerMapper ]The sql annotation form is optimized to XML (#3618)
This is an automated email from the ASF dual-hosted git repository.
casion 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 fc26775c0 [ResourceManagerMapper ]The sql annotation form is optimized to XML (#3618)
fc26775c0 is described below
commit fc26775c037d39780e4c969c3968ae2b7d067bf4
Author: 成彬彬 <10...@users.noreply.github.com>
AuthorDate: Tue Oct 18 10:13:53 2022 +0800
[ResourceManagerMapper ]The sql annotation form is optimized to XML (#3618)
---
.../linkis/manager/dao/ResourceManagerMapper.java | 42 +--------------
.../manager/dao/impl/ResourceManagerMapper.xml | 60 ++++++++++++++++++++++
.../core/dao/DataSourceVersionDaoTest.java | 3 +-
3 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/ResourceManagerMapper.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/ResourceManagerMapper.java
index 1681ad25a..ea52a66d2 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/ResourceManagerMapper.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/ResourceManagerMapper.java
@@ -25,75 +25,35 @@ import org.apache.ibatis.annotations.*;
import java.util.List;
public interface ResourceManagerMapper {
- @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
- // @SelectKey(statement = "select last_insert_id() AS id", keyProperty = "id", before = false,
- // resultType = int.class)
- @Insert(
- "INSERT INTO linkis_cg_manager_linkis_resources VALUES"
- + "(#{id},#{maxResource},#{minResource},#{usedResource},#{leftResource},#{expectedResource},#{lockedResource},#{resourceType},#{ticketId},now(),now(),#{updator},#{creator})")
+
void registerResource(PersistenceResource persistenceResource);
- @Update({
- "update linkis_cg_manager_linkis_resources set max_resource = #{persistenceResource.maxResource},min_resource = #{persistenceResource.minResource}, "
- + "used_resource=#{persistenceResource.usedResource},left_resource=#{persistenceResource.leftResource},expected_resource=#{persistenceResource.expectedResource},"
- + "locked_resource=#{persistenceResource.lockedResource},"
- + "update_time=#{persistenceResource.updateTime} where ticketId = #{ticketId}"
- })
void nodeResourceUpdate(
@Param("ticketId") String ticketId,
@Param("persistenceResource") PersistenceResource persistenceResource);
- @Update({
- "update linkis_cg_manager_linkis_resources set max_resource = #{persistenceResource.maxResource},min_resource = #{persistenceResource.minResource},"
- + "used_resource=#{persistenceResource.usedResource},left_resource=#{persistenceResource.leftResource},expected_resource=#{persistenceResource.expectedResource},"
- + "locked_resource=#{persistenceResource.lockedResource},"
- + "update_time=#{persistenceResource.updateTime} where id = #{resourceId}"
- })
void nodeResourceUpdateByResourceId(
@Param("resourceId") int resourceId,
@Param("persistenceResource") PersistenceResource persistenceResource);
- @Select(
- "select id from linkis_cg_manager_linkis_resources where ticketId is null and id in ( select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_service_instance B on A.label_id=B.label_id and B.service_instance=#{instance})")
Integer getNodeResourceUpdateResourceId(@Param("instance") String instance);
- @Delete(
- "delete from linkis_cg_manager_label_resource where label_id in (select label_id from linkis_cg_manager_label_service_instance where service_instance=#{instance})")
void deleteResourceAndLabelId(@Param("instance") String instance);
- @Delete(
- "delete from linkis_cg_manager_linkis_resources where id in "
- + "(select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_service_instance B on A.label_id=B.label_id and B.service_instance = #{instance} )")
void deleteResourceByInstance(@Param("instance") String instance);
@Delete("delete from linkis_cg_manager_linkis_resources where ticketId = #{ticketId}")
void deleteResourceByTicketId(@Param("ticketId") String ticketId);
- // @Select("select * from linkis_cg_manager_linkis_resources where id = #{id} adn
- // resourceType = #{resourceType}")
- // PersistenceResource getResourceByIdAndType(@Param("id") int id,@Param("resourceType")
- // String resourceType);
-
- @Select(
- "select * from linkis_cg_manager_linkis_resources where resourceType = #{resourceType} and"
- + " id in (select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_service_instance B on A.label_id = B.label_id and B.service_instance=#{instance})")
List<PersistenceResource> getResourceByInstanceAndResourceType(
@Param("instance") String instance, @Param("resourceType") String resourceType);
- @Select(
- "select * from linkis_cg_manager_linkis_resources where id in "
- + "(select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_service_instance B on A.label_id = B.label_id and B.service_instance= #{instance})")
List<PersistenceResource> getResourceByServiceInstance(@Param("instance") String instance);
- @Select("select * from linkis_cg_manager_linkis_resources where ticketId = #{ticketId}")
PersistenceResource getNodeResourceByTicketId(@Param("ticketId") String ticketId);
- @Select(
- "select * from linkis_cg_manager_linkis_resources where id in (select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_user B on A.label_id=B.label_id AND B.username=#{userName})")
List<PersistenceResource> getResourceByUserName(@Param("userName") String userName);
- @Select(
- "select * from linkis_cg_manager_label where id in (select label_id from linkis_cg_manager_label_resource A join linkis_cg_manager_linkis_resources B on A.resource_id=B.id and B.ticketId=#{ticketId})")
List<PersistenceLabel> getLabelsByTicketId(@Param("ticketId") String ticketId);
void deleteResourceById(@Param("ids") List<Integer> ids);
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml
index fa76113d0..c5b3a6d9e 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml
@@ -38,4 +38,64 @@
SELECT * FROM linkis_cg_manager_linkis_resources WHERE id = #{id}
</select>
+ <insert id="registerResource" parameterType="org.apache.linkis.manager.common.entity.persistence.PersistenceResource" useGeneratedKeys="true" keyProperty = "id" keyColumn = "id">
+ INSERT INTO linkis_cg_manager_linkis_resources VALUES
+ (#{id},#{maxResource},#{minResource},#{usedResource},#{leftResource},#{expectedResource},#{lockedResource},#{resourceType},#{ticketId},now(),now(),#{updator},#{creator})
+ </insert>
+
+ <update id="nodeResourceUpdate">
+ update linkis_cg_manager_linkis_resources set max_resource = #{persistenceResource.maxResource},min_resource = #{persistenceResource.minResource},
+ used_resource=#{persistenceResource.usedResource},left_resource=#{persistenceResource.leftResource},expected_resource=#{persistenceResource.expectedResource},
+ locked_resource=#{persistenceResource.lockedResource},
+ update_time=#{persistenceResource.updateTime} where ticketId = #{ticketId}
+ </update>
+
+ <update id="nodeResourceUpdateByResourceId">
+ update linkis_cg_manager_linkis_resources set max_resource = #{persistenceResource.maxResource},min_resource = #{persistenceResource.minResource},
+ used_resource=#{persistenceResource.usedResource},left_resource=#{persistenceResource.leftResource},expected_resource=#{persistenceResource.expectedResource},
+ locked_resource=#{persistenceResource.lockedResource},
+ update_time=#{persistenceResource.updateTime} where id = #{resourceId}
+ </update>
+
+ <select id="getNodeResourceUpdateResourceId" resultType="java.lang.Integer">
+ select id from linkis_cg_manager_linkis_resources where ticketId is null and id in
+ ( select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_service_instance B on A.label_id=B.label_id and B.service_instance=#{instance})
+ </select>
+
+ <delete id="deleteResourceAndLabelId">
+ delete from linkis_cg_manager_label_resource where label_id in
+ (select label_id from linkis_cg_manager_label_service_instance where service_instance=#{instance})
+ </delete>
+
+ <delete id="deleteResourceByInstance">
+ delete from linkis_cg_manager_linkis_resources where id in
+ (select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_service_instance B on A.label_id=B.label_id and B.service_instance = #{instance} )
+ </delete>
+ <delete id="deleteResourceByTicketId">
+ select * from linkis_cg_manager_linkis_resources where resourceType = #{resourceType} and
+ id in (select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_service_instance B on A.label_id = B.label_id and B.service_instance=#{instance})
+ </delete>
+
+ <select id="getResourceByServiceInstance" resultType="org.apache.linkis.manager.common.entity.persistence.PersistenceResource">
+ select * from linkis_cg_manager_linkis_resources where id in
+ (select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_service_instance B on A.label_id = B.label_id and B.service_instance= #{instance})
+ </select>
+ <select id="getResourceByServiceInstance" resultType="org.apache.linkis.manager.common.entity.persistence.PersistenceResource" >
+ select * from linkis_cg_manager_linkis_resources where id in
+ (select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_service_instance B on A.label_id = B.label_id and B.service_instance= #{instance})
+ </select>
+
+ <select id="getNodeResourceByTicketId" resultType="org.apache.linkis.manager.common.entity.persistence.PersistenceResource">
+ select * from linkis_cg_manager_linkis_resources where ticketId = #{ticketId}
+ </select>
+
+ <select id="getResourceByUserName" resultType="org.apache.linkis.manager.common.entity.persistence.PersistenceResource">
+ select * from linkis_cg_manager_linkis_resources where id in
+ (select resource_id from linkis_cg_manager_label_resource A join linkis_cg_manager_label_user B on A.label_id=B.label_id AND B.username=#{userName})
+ </select>
+
+ <select id="getLabelsByTicketId" resultType="org.apache.linkis.manager.common.entity.persistence.PersistenceLabel">
+ select * from linkis_cg_manager_label where id in
+ (select label_id from linkis_cg_manager_label_resource A join linkis_cg_manager_linkis_resources B on A.resource_id=B.id and B.ticketId=#{ticketId})
+ </select>
</mapper>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceVersionDaoTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceVersionDaoTest.java
index 973ffdb0e..1a9ea139c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceVersionDaoTest.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceVersionDaoTest.java
@@ -23,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
-import jdk.nashorn.internal.ir.annotations.Ignore;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
@@ -33,7 +32,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@Ignore
+@Disabled
class DataSourceVersionDaoTest extends BaseDaoTest {
private static final Logger logger = LoggerFactory.getLogger(DataSourceVersionDaoTest.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org