feature: add type and config id

flowerfine · Jan 11, 2025 · 5352d1f · 5352d1f
1 parent 6fc0a04
commit 5352d1f
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 1 deletion.
diff --git a/...src/main/java/cn/sliew/carp/framework/dag/repository/entity/orca/CarpDagOrcaPipeline.java b/...src/main/java/cn/sliew/carp/framework/dag/repository/entity/orca/CarpDagOrcaPipeline.java
@@ -36,6 +36,12 @@ public class CarpDagOrcaPipeline extends BaseAuditDO {
     @TableField("namespace")
     private String namespace;
 
+    @TableField("`type`")
+    private String type;
+
+    @TableField("config_id")
+    private String configId;
+
     @TableField("`name`")
     private String name;
 

diff --git a/...ag/src/main/java/cn/sliew/carp/framework/dag/service/dto/orca/CarpDagOrcaPipelineDTO.java b/...ag/src/main/java/cn/sliew/carp/framework/dag/service/dto/orca/CarpDagOrcaPipelineDTO.java
@@ -37,6 +37,12 @@ public class CarpDagOrcaPipelineDTO extends BaseDTO {
     @Schema(description = "namespace")
     private String namespace;
 
+    @Schema(description = "type")
+    private String type;
+
+    @Schema(description = "pipeline config id. only for pipeline")
+    private String configId;
+
     @Schema(description = "name")
     private String name;
 

diff --git a/...rc/main/java/cn/sliew/carp/framework/dag/service/impl/CarpDagOrcaPipelineServiceImpl.java b/...rc/main/java/cn/sliew/carp/framework/dag/service/impl/CarpDagOrcaPipelineServiceImpl.java
@@ -59,6 +59,8 @@ public PageResult<CarpDagOrcaPipelineDTO> page(CarpDagOrcaPipelinePageParam para
         Page<CarpDagOrcaPipeline> page = PageUtil.buildPageParam(param);
         LambdaQueryWrapper<CarpDagOrcaPipeline> queryChainWrapper = Wrappers.lambdaQuery(CarpDagOrcaPipeline.class)
                 .eq(CarpDagOrcaPipeline::getNamespace, param.getNamespace())
+                .eq(StringUtils.hasText(param.getType()), CarpDagOrcaPipeline::getType, param.getType())
+                .eq(StringUtils.hasText(param.getConfigId()), CarpDagOrcaPipeline::getConfigId, param.getConfigId())
                 .like(StringUtils.hasText(param.getName()), CarpDagOrcaPipeline::getName, param.getName())
                 .eq(StringUtils.hasText(param.getStatus()), CarpDagOrcaPipeline::getStatus, param.getStatus());
 
@@ -72,6 +74,8 @@ public PageResult<CarpDagOrcaPipelineDTO> page(CarpDagOrcaPipelinePageParam para
     public List<CarpDagOrcaPipelineDTO> listAll(CarpDagOrcaPipelinePageParam param) {
         LambdaQueryWrapper<CarpDagOrcaPipeline> queryChainWrapper = Wrappers.lambdaQuery(CarpDagOrcaPipeline.class)
                 .eq(CarpDagOrcaPipeline::getNamespace, param.getNamespace())
+                .eq(StringUtils.hasText(param.getType()), CarpDagOrcaPipeline::getType, param.getType())
+                .eq(StringUtils.hasText(param.getConfigId()), CarpDagOrcaPipeline::getConfigId, param.getConfigId())
                 .like(StringUtils.hasText(param.getName()), CarpDagOrcaPipeline::getName, param.getName())
                 .eq(StringUtils.hasText(param.getStatus()), CarpDagOrcaPipeline::getStatus, param.getStatus());
 

diff --git a/...main/java/cn/sliew/carp/framework/dag/service/param/orca/CarpDagOrcaPipelineAddParam.java b/...main/java/cn/sliew/carp/framework/dag/service/param/orca/CarpDagOrcaPipelineAddParam.java
@@ -30,6 +30,13 @@ public class CarpDagOrcaPipelineAddParam {
     @Schema(description = "namespace")
     private String namespace;
 
+    @NotBlank
+    @Schema(description = "type")
+    private String type;
+
+    @Schema(description = "pipeline config id. only for pipeline")
+    private String configId;
+
     @NotBlank
     @Schema(description = "name")
     private String name;

diff --git a/...ain/java/cn/sliew/carp/framework/dag/service/param/orca/CarpDagOrcaPipelinePageParam.java b/...ain/java/cn/sliew/carp/framework/dag/service/param/orca/CarpDagOrcaPipelinePageParam.java
@@ -29,6 +29,12 @@ public class CarpDagOrcaPipelinePageParam extends PageParam {
     @Schema(description = "namespace")
     private String namespace;
 
+    @Schema(description = "type")
+    private String type;
+
+    @Schema(description = "pipeline config id")
+    private String configId;
+
     @Schema(description = "name")
     private String name;
 

diff --git a/...n/java/cn/sliew/carp/framework/dag/service/param/orca/CarpDagOrcaPipelineUpdateParam.java b/...n/java/cn/sliew/carp/framework/dag/service/param/orca/CarpDagOrcaPipelineUpdateParam.java
@@ -34,6 +34,13 @@ public class CarpDagOrcaPipelineUpdateParam {
     @Schema(description = "namespace")
     private String namespace;
 
+    @NotBlank
+    @Schema(description = "type")
+    private String type;
+
+    @Schema(description = "pipeline config id. only for pipeline")
+    private String configId;
+
     @NotBlank
     @Schema(description = "name")
     private String name;

diff --git a/...esources/cn/sliew/carp/framework/dag/repository/mapper/orca/CarpDagOrcaPipelineMapper.xml b/...esources/cn/sliew/carp/framework/dag/repository/mapper/orca/CarpDagOrcaPipelineMapper.xml
@@ -26,6 +26,8 @@
         <result column="editor" property="editor"/>
         <result column="update_time" property="updateTime"/>
         <result column="namespace" property="namespace"/>
+        <result column="type" property="type"/>
+        <result column="config_id" property="configId"/>
         <result column="name" property="name"/>
         <result column="status" property="status"/>
         <result column="build_time" property="buildTime"/>
@@ -48,6 +50,6 @@
         create_time,
         editor,
         update_time,
-        namespace, `name`, `status`, build_time, start_time, end_time, canceled, body, remark
+        namespace, `type`, config_id, `name`, `status`, build_time, start_time, end_time, canceled, body, remark
     </sql>
 </mapper>
diff --git a/tools/docker/mysql/init.d/carp-dag.sql b/tools/docker/mysql/init.d/carp-dag.sql
@@ -396,6 +396,8 @@ create table `carp_dag_orca_pipeline`
 (
     `id`          bigint       not null auto_increment comment '自增主键',
     `namespace`   varchar(255) not null,
+    `type`        varchar(32)  not null comment 'pipeline or orchestration.',
+    `config_id`   varchar(32) comment 'config id. only for pipeline',
     `name`        varchar(255) not null,
     `status`      enum('NOT_STARTED','BUFFERED','RUNNING','PAUSED','SUSPENDED','SUCCEEDED','FAILED_CONTINUE','TERMINAL','CANCELED','REDIRECT','STOPPED','SKIPPED') not null default 'NOT_STARTED',
     `build_time`  bigint       not null,