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:00:23 UTC
[incubator-linkis] branch dev-1.3.1 updated: [VersionDao]The sql annotation form is optimized to XML (#3645)
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 91c5ac52a [VersionDao]The sql annotation form is optimized to XML (#3645)
91c5ac52a is described below
commit 91c5ac52ae2791c07ac2e81d4b73fe2d508f075e
Author: 成彬彬 <10...@users.noreply.github.com>
AuthorDate: Tue Oct 18 10:00:17 2022 +0800
[VersionDao]The sql annotation form is optimized to XML (#3645)
---
.../java/org/apache/linkis/bml/dao/VersionDao.java | 16 -------------
.../apache/linkis/bml/dao/impl/VersionMapper.xml | 27 ++++++++++++++++++++++
.../org/apache/linkis/bml/dao/VersionDaoTest.java | 9 +++++---
3 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
index 71c1c6f10..49cda9506 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
@@ -21,8 +21,6 @@ import org.apache.linkis.bml.entity.ResourceVersion;
import org.apache.linkis.bml.entity.Version;
import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
@@ -51,17 +49,11 @@ public interface VersionDao {
String getNewestVersion(@Param("resourceId") String resourceId);
- @Select(
- "select start_byte from linkis_ps_bml_resources_version where resource_id = #{resourceId} and version = #{version}")
long getStartByteForResource(
@Param("resourceId") String resourceId, @Param("version") String version);
- @Select(
- "select end_byte from linkis_ps_bml_resources_version where resource_id = #{resourceId} and version = #{version}")
long getEndByte(@Param("resourceId") String resourceId, @Param("version") String version);
- @Select(
- "select * from linkis_ps_bml_resources_version where resource_id=#{resourceId} and version = #{version} and enable_flag = 1")
ResourceVersion findResourceVersion(
@Param("resourceId") String resourceId, @Param("version") String version);
@@ -71,12 +63,8 @@ public interface VersionDao {
List<ResourceVersion> selectResourcesViaSystemByPage(
@Param("system") String system, @Param("user") String user);
- @Select(
- "select exists(select * from `linkis_ps_bml_resources_version` where resource_id=#{resourceId} and version=#{version} and enable_flag = 1)")
int checkVersion(@Param("resourceId") String resourceId, @Param("version") String version);
- @Select(
- "select enable_flag from `linkis_ps_bml_resources_version` where resource_id = #{resourceId} and version = #{version}")
int selectResourceVersionEnbleFlag(
@Param("resourceId") String resourceId, @Param("version") String version);
@@ -85,8 +73,6 @@ public interface VersionDao {
*
* @param resourceId resourceId
*/
- @Update(
- "update `linkis_ps_bml_resources_version` set enable_flag = 0 where resource_id = #{resourceId}")
void deleteResource(@Param("resourceId") String resourceId);
void batchDeleteResources(@Param("resourceIds") List<String> resourceIds);
@@ -96,7 +82,5 @@ public interface VersionDao {
List<Version> selectVersionByPage(@Param("resourceId") String resourceId);
- @Select(
- "select * from linkis_ps_bml_resources_version where resource_id=#{resourceId} and enable_flag = 1")
List<ResourceVersion> getResourceVersionsByResourceId(@Param("resourceId") String resourceId);
}
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml
index 320c88d45..0600bd433 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml
@@ -163,5 +163,32 @@
select * from linkis_ps_bml_resources_version where resource_id = #{resourceId} and version = #{version} and enable_flag = 1
</select>
+ <select id="getStartByteForResource" resultType="Long">
+ select start_byte from linkis_ps_bml_resources_version where resource_id = #{resourceId} and version = #{version}
+ </select>
+
+ <select id="getEndByte" resultType="Long">
+ select end_byte from linkis_ps_bml_resources_version where resource_id = #{resourceId} and version = #{version}
+ </select>
+
+ <select id="findResourceVersion" resultMap="ResourceVersion">
+ select * from linkis_ps_bml_resources_version where resource_id=#{resourceId} and version = #{version} and enable_flag = 1
+ </select>
+
+ <select id="checkVersion" resultType="java.lang.Integer">
+ select exists(select * from `linkis_ps_bml_resources_version` where resource_id=#{resourceId} and version=#{version} and enable_flag = 1)
+ </select>
+
+ <select id="selectResourceVersionEnbleFlag" resultType="java.lang.Integer">
+ select enable_flag from `linkis_ps_bml_resources_version` where resource_id = #{resourceId} and version = #{version}
+ </select>
+
+ <update id="deleteResource" >
+ update `linkis_ps_bml_resources_version` set enable_flag = 0 where resource_id = #{resourceId}
+ </update>
+
+ <select id="getResourceVersionsByResourceId" resultMap="ResourceVersion">
+ select * from linkis_ps_bml_resources_version where resource_id=#{resourceId} and enable_flag = 1
+ </select>
</mapper>
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
index 9f9ab9241..0e5362521 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
@@ -18,6 +18,7 @@
package org.apache.linkis.bml.dao;
import org.apache.linkis.bml.entity.ResourceVersion;
+import org.apache.linkis.bml.entity.Version;
import org.springframework.beans.factory.annotation.Autowired;
@@ -100,7 +101,7 @@ class VersionDaoTest extends BaseDaoTest {
resourceVersion.setEndTime(new Date());
resourceVersion.setClientIp("132.145.36");
resourceVersion.setUpdator("testUp");
- resourceVersion.setEnableFlag(false);
+ resourceVersion.setEnableFlag(true);
versionDao.insertNewVersion(resourceVersion);
}
@@ -184,12 +185,14 @@ class VersionDaoTest extends BaseDaoTest {
@Test
void selectVersionByPage() {
insertNewVersion();
- versionDao.selectVersionByPage(resourceId);
+ List<Version> list = versionDao.selectVersionByPage(resourceId);
+ assertTrue(list.size() >= 1);
}
@Test
void getResourceVersionsByResourceId() {
insertNewVersion();
- versionDao.getResourceVersionsByResourceId(resourceId);
+ List<ResourceVersion> list = versionDao.getResourceVersionsByResourceId(resourceId);
+ assertTrue(list.size() >= 1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org