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 f7ced9ee6 [LockManagerMapper]The sql annotation form is optimized to
XML (#3656)
f7ced9ee6 is described below
commit f7ced9ee65e540c0f5aa891ee768b67597baf77e
Author: 成彬彬 <[email protected]>
AuthorDate: Tue Oct 18 09:51:34 2022 +0800
[LockManagerMapper]The sql annotation form is optimized to XML (#3656)
---
.../linkis/manager/dao/LockManagerMapper.java | 23 +++++++---------------
.../linkis/manager/dao/impl/LockManagerMapper.xml | 14 +++++++++++++
.../linkis/manager/dao/LockManagerMapperTest.java | 2 ++
3 files changed, 23 insertions(+), 16 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/LockManagerMapper.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/LockManagerMapper.java
index 7bad8b4ef..023822f4e 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/LockManagerMapper.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/LockManagerMapper.java
@@ -25,21 +25,12 @@ import java.util.List;
@Mapper
public interface LockManagerMapper {
- @Insert(
- "insert into linkis_cg_manager_lock (lock_object, time_out, update_time,
create_time)"
- + "values(#{jsonObject}, #{timeOut}, now(), now())")
- void lock(@Param("jsonObject") String jsonObject, @Param("timeOut") Long
timeOut);
-
- @Delete("delete from linkis_cg_manager_lock where id = #{id}")
- void unlock(Integer id);
-
- @Select("select * from linkis_cg_manager_lock where lock_object =
#{jsonObject}")
- List<PersistenceLock> getLockersByLockObject(String jsonObject);
-
- @Select("select * from linkis_cg_manager_lock")
- @Results({
- @Result(property = "updateTime", column = "update_time"),
- @Result(property = "createTime", column = "create_time")
- })
+
+ void lock(@Param("lockObject") String lockObject, @Param("timeOut") Long
timeOut);
+
+ void unlock(@Param("id") Integer id);
+
+ List<PersistenceLock> getLockersByLockObject(@Param("lockObject") String
lockObject);
+
List<PersistenceLock> getAll();
}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/LockManagerMapper.xml
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/LockManagerMapper.xml
index bdcc15c4e..7814ee77a 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/LockManagerMapper.xml
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/LockManagerMapper.xml
@@ -69,7 +69,21 @@
<!-- SELECT id FROM linkis_cg_manager_service_instance where instance
= #{instance} and name = #{name}-->
<!-- </select>-->
+ <insert id="lock">
+ insert into linkis_cg_manager_lock (lock_object, time_out,
update_time, create_time)
+ values(#{lockObject}, #{timeOut}, now(), now())
+ </insert>
+ <delete id="unlock">
+ delete from linkis_cg_manager_lock where id = #{id}
+ </delete>
+ <select id="getLockersByLockObject"
resultType="org.apache.linkis.manager.common.entity.persistence.PersistenceLock">
+ select * from linkis_cg_manager_lock where lock_object = #{lockObject}
+ </select>
+
+ <select id="getAll"
resultType="org.apache.linkis.manager.common.entity.persistence.PersistenceLock">
+ select * from linkis_cg_manager_lock
+ </select>
</mapper>
\ No newline at end of file
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/LockManagerMapperTest.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/LockManagerMapperTest.java
index 1573bbea2..df7f8591b 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/LockManagerMapperTest.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/LockManagerMapperTest.java
@@ -34,6 +34,8 @@ class LockManagerMapperTest extends BaseDaoTest {
@Test
void lock() {
lockManagerMapper.lock("testjson", 1L);
+ List<PersistenceLock> list =
lockManagerMapper.getLockersByLockObject("testjson");
+ assertTrue(list.size() >= 1);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
