fix(controller): fix bug of reverting version - add version_order field for version history

server/controller/src/main/java/ai/starwhale/mlops/api/RuntimeController.java

@@ -26,8 +26,8 @@
 import ai.starwhale.mlops.api.protocol.runtime.RuntimeVersionVO;
 import ai.starwhale.mlops.common.PageParams;
 import ai.starwhale.mlops.common.TagAction;
-import ai.starwhale.mlops.domain.runtime.bo.RuntimeQuery;
 import ai.starwhale.mlops.domain.runtime.RuntimeService;
+import ai.starwhale.mlops.domain.runtime.bo.RuntimeQuery;
 import ai.starwhale.mlops.domain.runtime.bo.RuntimeVersion;
 import ai.starwhale.mlops.domain.runtime.bo.RuntimeVersionQuery;
 import ai.starwhale.mlops.exception.SWProcessException;
@@ -36,7 +36,6 @@
 import ai.starwhale.mlops.exception.SWValidationException.ValidSubject;
 import ai.starwhale.mlops.exception.api.StarWhaleApiException;
 import com.github.pagehelper.PageInfo;
-import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;

server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/RuntimeService.java

@@ -353,14 +353,16 @@ public void upload(MultipartFile dsFile, ClientRuntimeRequest uploadRequest){
                 throw new StarWhaleApiException(new SWProcessException(ErrorType.SYSTEM),
                     HttpStatus.INTERNAL_SERVER_ERROR);
             }
-            runtimeVersionMapper.addNewVersion(RuntimeVersionEntity.builder()
+            RuntimeVersionEntity version = RuntimeVersionEntity.builder()
                 .ownerId(userService.currentUserDetail().getId())
                 .storagePath(runtimePath)
                 .runtimeId(entity.getId())
                 .versionName(uploadRequest.version())
                 .versionMeta(runtimeManifest)
                 .image(null == runtimeManifestObj? null : runtimeManifestObj.getBaseImage())
-                .build());
+                .build();
+            runtimeVersionMapper.addNewVersion(version);
+            runtimeVersionMapper.revertTo(version.getRuntimeId(), version.getId());
         }
     }
 

server/controller/src/main/java/ai/starwhale/mlops/domain/swds/mapper/SWDatasetMapper.java

@@ -18,8 +18,10 @@
 
 import ai.starwhale.mlops.domain.swds.po.SWDatasetEntity;
 import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+@Mapper
 public interface SWDatasetMapper {
 
     List<SWDatasetEntity> listDatasets(@Param("projectId") Long projectId, @Param("namePrefix")String namePrefix);

server/controller/src/main/java/ai/starwhale/mlops/domain/swds/mapper/SWDatasetVersionMapper.java

@@ -18,8 +18,10 @@
 
 import ai.starwhale.mlops.domain.swds.po.SWDatasetVersionEntity;
 import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+@Mapper
 public interface SWDatasetVersionMapper {
 
     List<SWDatasetVersionEntity> listVersions(@Param("datasetId")Long datasetId,

server/controller/src/main/java/ai/starwhale/mlops/domain/swds/upload/SwdsUploader.java

@@ -244,6 +244,7 @@ public String create(String yamlContent,String fileName, UploadRequest uploadReq
             //create
             swDatasetVersionEntity = from(projectEntity.getProjectName(),swDatasetEntity,manifest);
             swdsVersionMapper.addNewVersion(swDatasetVersionEntity);
+            swdsVersionMapper.revertTo(swDatasetVersionEntity.getDatasetId(), swDatasetVersionEntity.getId());
             uploadManifest(swDatasetVersionEntity,fileName,yamlContent.getBytes(StandardCharsets.UTF_8));
         }else{
             //swds version create dup

server/controller/src/main/java/ai/starwhale/mlops/domain/swmp/SWModelPackageService.java

@@ -372,6 +372,7 @@ public void upload(MultipartFile dsFile,
                 .evalJobs(jobContent)
                 .build();
             swmpVersionMapper.addNewVersion(swModelPackageVersionEntity);
+            swmpVersionMapper.revertTo(swModelPackageVersionEntity.getSwmpId(), swModelPackageVersionEntity.getId());
         }
 
     }

server/controller/src/main/resources/db/migration/V00017__Add_version_field.sql

@@ -0,0 +1,20 @@
+alter table swmp_version
+    add version_order bigint default 0 null after id;
+update swmp_version set version_order = id;
+create index idx_version_order
+    on swmp_version (version_order);
+
+alter table dataset_version
+    add version_order bigint default 0 not null after id;
+update dataset_version set version_order = id;
+create index idx_version_order
+    on dataset_version (version_order);
+
+alter table runtime_version
+    add version_order bigint default 0 not null after id;
+update runtime_version set version_order = id;
+create index idx_version_order
+    on runtime_version (version_order);
+
+
+

server/controller/src/main/resources/mapper/RuntimeVersionMapper.xml

@@ -46,7 +46,7 @@
         <if test="tag != null and tag != ''">
             and FIND_IN_SET(#{tag}, version_tag)
         </if>
-        order by rv.id desc
+        order by rv.version_order desc
     </select>
 
     <select id="findVersionById" resultMap="runtimeVersionResultMap" >
@@ -73,14 +73,13 @@
     <select id="getLatestVersion" resultMap="runtimeVersionResultMap" >
         <include refid="select_runtime_version" />
         and runtime_id = #{runtimeId}
-        order by rv.id desc
+        order by rv.version_order desc
         limit 1
     </select>
 
     <insert id="revertTo">
-        replace into runtime_version (runtime_id, owner_id, version_name, version_tag, version_meta, storage_path, image)
-        select runtime_id, owner_id, version_name, version_tag, version_meta, storage_path, image
-        from runtime_version
+        update runtime_version
+        set version_order = (select max(version_order) from runtime_version) + 1
         where id = #{rtVersionId}
     </insert>
 

server/controller/src/main/resources/mapper/SWDatasetVersionMapper.xml

@@ -42,7 +42,7 @@
         <if test="tag != null and tag != ''">
             and FIND_IN_SET(#{tag}, version_tag)
         </if>
-        order by dsv.id desc
+        order by dsv.version_order desc
     </select>
 
     <select id="findByDSIdAndVersionNameForUpdate" resultMap="dsVersionResultMap" >
@@ -89,14 +89,13 @@
     <select id="getLatestVersion" resultMap="dsVersionResultMap" >
         <include refid="select_swds_version" />
         and dataset_id = #{datasetId}
-        order by dsv.id desc
+        order by dsv.version_order desc
         limit 1
     </select>
 
     <insert id="revertTo">
-        replace into dataset_version (dataset_id, owner_id, version_name, size, index_table, version_tag, version_meta, files_uploaded, storage_path, status)
-        select dataset_id, owner_id, version_name, size, index_table, version_tag, version_meta, files_uploaded, storage_path, status
-        from dataset_version
+        update dataset_version
+        set version_order = (select max(version_order) from dataset_version) + 1
         where id = #{dsVersionId}
     </insert>
 

server/controller/src/main/resources/mapper/SWModelPackageVersionMapper.xml

@@ -39,7 +39,7 @@
         <if test="tag != null and tag != ''">
             and FIND_IN_SET(#{tag}, version_tag)
         </if>
-        order by mv.id desc
+        order by mv.version_order desc
     </select>
 
     <select id="findVersionById" resultMap="swmpVersionResultMap" >
@@ -66,14 +66,13 @@
     <select id="getLatestVersion" resultMap="swmpVersionResultMap" >
         <include refid="select_swmp_version" />
         and swmp_id = #{swmpId}
-        order by mv.id desc
+        order by mv.version_order desc
         limit 1
     </select>
 
     <insert id="revertTo">
-        replace into swmp_version (swmp_id, owner_id, version_name, version_tag, version_meta, storage_path, manifest, eval_jobs)
-        select swmp_id, owner_id, version_name, version_tag, version_meta, storage_path, manifest, eval_jobs
-        from swmp_version
+        update swmp_version
+        set version_order = (select max(version_order) from swmp_version) + 1
         where id = #{swmpVersionId}
     </insert>