fix

apache · Nov 2, 2023 · c735f77 · c735f77
1 parent 64c3a0c
commit c735f77
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 21 deletions.
diff --git a/...ger-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongClusterEntityMapper.java b/...ger-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongClusterEntityMapper.java
@@ -64,6 +64,4 @@ List<InlongClusterEntity> selectByKey(@Param("clusterTag") String clusterTag, @P
 
     int deleteByPrimaryKey(Integer id);
 
-    List<InlongClusterEntity> selectSortClusterByType(@Param("sinkType") String sinkType);
-
 }
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml
@@ -189,15 +189,6 @@
         from inlong_cluster
         where is_deleted = 0
     </select>
-    <select id="selectSortClusterByType" resultType="org.apache.inlong.manager.dao.entity.InlongClusterEntity">
-        select
-        <include refid="Base_Column_List"/>
-        from inlong_cluster
-        <where>
-            type = #{sinkType, jdbcType=VARCHAR}
-            and is_deleted = 0
-        </where>
-    </select>
 
     <update id="updateById" parameterType="org.apache.inlong.manager.dao.entity.InlongClusterEntity">
         update inlong_cluster

diff --git a/...er/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/BaseSortClusterDTO.java b/...er/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/BaseSortClusterDTO.java
@@ -40,15 +40,6 @@
 @ApiModel("Base sort cluster info")
 public class BaseSortClusterDTO {
 
-    @ApiModelProperty("backup data path")
-    private String backupDataPath;
-
-    @ApiModelProperty("backup hadoop proxy user")
-    private String backupHadoopProxyUser;
-
-    @ApiModelProperty("application name")
-    private String applicationName;
-
     /**
      * Get the dto instance from the request
      */

diff --git a/...g/apache/inlong/manager/service/resource/sink/AbstractStandaloneSinkResourceOperator.java b/...g/apache/inlong/manager/service/resource/sink/AbstractStandaloneSinkResourceOperator.java
@@ -81,7 +81,7 @@ private String assignFromRelated(String sinkType, String groupId) {
         InlongGroupEntity group = groupEntityMapper.selectByGroupId(groupId);
         String sortClusterType = SORT_PREFIX.concat(sinkType);
         List<InlongClusterEntity> clusters = clusterEntityMapper
-                .selectSortClusterByType(sortClusterType).stream()
+                .selectByKey(null, null, sortClusterType).stream()
                 .filter(cluster -> checkCluster(cluster.getClusterTags(), group.getInlongClusterTag()))
                 .collect(Collectors.toList());
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,6 +64,4 @@ List<InlongClusterEntity> selectByKey(@Param("clusterTag") String clusterTag, @P

		int deleteByPrimaryKey(Integer id);

		List<InlongClusterEntity> selectSortClusterByType(@Param("sinkType") String sinkType);

		}