You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/07/08 12:20:55 UTC
[inlong] branch master updated: [INLONG-4940][Manager] Remove unused SortSink-related classes and tables (#4941)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 20641c554 [INLONG-4940][Manager] Remove unused SortSink-related classes and tables (#4941)
20641c554 is described below
commit 20641c5546f5d6c78d5787f6d3fbdfc8f98863a5
Author: healchow <he...@gmail.com>
AuthorDate: Fri Jul 8 20:20:50 2022 +0800
[INLONG-4940][Manager] Remove unused SortSink-related classes and tables (#4941)
---
.../dao/entity/SortClusterConfigEntity.java | 36 ------
.../manager/dao/entity/SortTaskIdParamEntity.java | 39 ------
.../dao/entity/SortTaskSinkParamEntity.java | 40 -------
.../dao/mapper/SortClusterConfgiEntityMapper.java | 41 -------
.../dao/mapper/SortTaskIdParamEntityMapper.java | 40 -------
.../dao/mapper/SortTaskSinkParamEntityMapper.java | 40 -------
.../mappers/SortClusterConfgiEntityMapper.xml | 107 -----------------
.../mappers/SortTaskIdParamEntityMapper.xml | 131 ---------------------
.../mappers/SortTaskSinkParamEntityMapper.xml | 120 -------------------
.../main/resources/h2/apache_inlong_manager.sql | 50 +-------
.../manager-web/sql/apache_inlong_manager.sql | 53 +--------
.../web/controller/openapi/SortControllerTest.java | 117 ------------------
12 files changed, 8 insertions(+), 806 deletions(-)
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortClusterConfigEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortClusterConfigEntity.java
deleted file mode 100644
index a6a983446..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortClusterConfigEntity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.entity;
-
-import lombok.Builder;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * Sort cluster config entity, including cluster name, task name, sink type.
- */
-@Data
-@Builder
-public class SortClusterConfigEntity implements Serializable {
- private Integer id;
- private String clusterName;
- private String taskName;
- private String sinkType;
- private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortTaskIdParamEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortTaskIdParamEntity.java
deleted file mode 100644
index a176f102b..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortTaskIdParamEntity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.entity;
-
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * Sort task id param entity, including task name, group id, etc.
- */
-@Data
-@Builder
-public class SortTaskIdParamEntity {
- private Integer id;
- private String taskName;
- private String groupId;
- private String streamId;
- private String paramKey;
- private String paramValue;
-
- public String getKey() {
- return groupId.concat(streamId);
- }
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortTaskSinkParamEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortTaskSinkParamEntity.java
deleted file mode 100644
index e0ec319e2..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortTaskSinkParamEntity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.entity;
-
-import lombok.Builder;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * Sort task sink param entity, including task name, sink type, etc.
- */
-@Data
-@Builder
-public class SortTaskSinkParamEntity implements Serializable {
- private Integer id;
-
- private String taskName;
-
- private String sinkType;
-
- private String paramKey;
-
- private String paramValue;
-}
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SortClusterConfgiEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SortClusterConfgiEntityMapper.java
deleted file mode 100644
index 0fba6072b..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SortClusterConfgiEntityMapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.mapper;
-
-import org.apache.inlong.manager.dao.entity.SortClusterConfigEntity;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface SortClusterConfgiEntityMapper {
- int deleteByPrimaryKey(Integer id);
-
- int insert(SortClusterConfigEntity record);
-
- int insertSelective(SortClusterConfigEntity record);
-
- SortClusterConfigEntity selectByPrimaryKey(Integer id);
-
- int updateByPrimaryKeySelective(SortClusterConfigEntity record);
-
- int updateByPrimaryKey(SortClusterConfigEntity record);
-
- List<SortClusterConfigEntity> selectTasksByClusterName(String clusterName);
-
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SortTaskIdParamEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SortTaskIdParamEntityMapper.java
deleted file mode 100644
index 309854d62..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SortTaskIdParamEntityMapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.mapper;
-
-import org.apache.inlong.manager.dao.entity.SortTaskIdParamEntity;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface SortTaskIdParamEntityMapper {
- int deleteByPrimaryKey(Integer id);
-
- int insert(SortTaskIdParamEntity record);
-
- int insertSelective(SortTaskIdParamEntity record);
-
- SortTaskIdParamEntity selectByPrimaryKey(Integer id);
-
- int updateByPrimaryKeySelective(SortTaskIdParamEntity record);
-
- int updateByPrimaryKey(SortTaskIdParamEntity record);
-
- List<SortTaskIdParamEntity> selectByTaskName(String taskName);
-}
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SortTaskSinkParamEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SortTaskSinkParamEntityMapper.java
deleted file mode 100644
index 6e80ca05e..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SortTaskSinkParamEntityMapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.mapper;
-
-import org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface SortTaskSinkParamEntityMapper {
- int deleteByPrimaryKey(Integer id);
-
- int insert(SortTaskSinkParamEntity record);
-
- int insertSelective(SortTaskSinkParamEntity record);
-
- SortTaskSinkParamEntity selectByPrimaryKey(Integer id);
-
- int updateByPrimaryKeySelective(SortTaskSinkParamEntity record);
-
- int updateByPrimaryKey(SortTaskSinkParamEntity record);
-
- List<SortTaskSinkParamEntity> selectByTaskNameAndType(String taskName);
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/SortClusterConfgiEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/SortClusterConfgiEntityMapper.xml
deleted file mode 100644
index 5b9c8918a..000000000
--- a/inlong-manager/manager-dao/src/main/resources/mappers/SortClusterConfgiEntityMapper.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.inlong.manager.dao.mapper.SortClusterConfgiEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.SortClusterConfigEntity">
- <id column="id" jdbcType="INTEGER" property="id" />
- <result column="cluster_name" jdbcType="VARCHAR" property="clusterName" />
- <result column="task_name" jdbcType="VARCHAR" property="taskName" />
- <result column="sink_type" jdbcType="VARCHAR" property="sinkType" />
- </resultMap>
- <sql id="Base_Column_List">
- id, cluster_name, task_name, sink_type
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from sort_cluster_config
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete from sort_cluster_config
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <insert id="insert" parameterType="org.apache.inlong.manager.dao.entity.SortClusterConfigEntity">
- insert into sort_cluster_config (id, cluster_name, task_name,
- sink_type)
- values (#{id,jdbcType=INTEGER}, #{clusterName,jdbcType=VARCHAR}, #{taskName,jdbcType=VARCHAR},
- #{sinkType,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" parameterType="org.apache.inlong.manager.dao.entity.SortClusterConfigEntity">
- insert into sort_cluster_config
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="clusterName != null">
- cluster_name,
- </if>
- <if test="taskName != null">
- task_name,
- </if>
- <if test="sinkType != null">
- sink_type,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="clusterName != null">
- #{clusterName,jdbcType=VARCHAR},
- </if>
- <if test="taskName != null">
- #{taskName,jdbcType=VARCHAR},
- </if>
- <if test="sinkType != null">
- #{sinkType,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="org.apache.inlong.manager.dao.entity.SortClusterConfigEntity">
- update sort_cluster_config
- <set>
- <if test="clusterName != null">
- cluster_name = #{clusterName,jdbcType=VARCHAR},
- </if>
- <if test="taskName != null">
- task_name = #{taskName,jdbcType=VARCHAR},
- </if>
- <if test="sinkType != null">
- sink_type = #{sinkType,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="org.apache.inlong.manager.dao.entity.SortClusterConfigEntity">
- update sort_cluster_config
- set cluster_name = #{clusterName,jdbcType=VARCHAR},
- task_name = #{taskName,jdbcType=VARCHAR},
- sink_type = #{sinkType,jdbcType=VARCHAR}
- where id = #{id,jdbcType=INTEGER}
- </update>
- <select id="selectTasksByClusterName" parameterType="java.lang.String" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from sort_cluster_config
- where cluster_name = #{clusterName, jdbcType=VARCHAR}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskIdParamEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskIdParamEntityMapper.xml
deleted file mode 100644
index 824704e6e..000000000
--- a/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskIdParamEntityMapper.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.inlong.manager.dao.mapper.SortTaskIdParamEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.SortTaskIdParamEntity">
- <id column="id" jdbcType="INTEGER" property="id" />
- <result column="task_name" jdbcType="VARCHAR" property="taskName" />
- <result column="group_id" jdbcType="VARCHAR" property="groupId" />
- <result column="stream_id" jdbcType="VARCHAR" property="streamId" />
- <result column="param_key" jdbcType="VARCHAR" property="paramKey" />
- <result column="param_value" jdbcType="VARCHAR" property="paramValue" />
- </resultMap>
- <sql id="Base_Column_List">
- id, task_name, group_id, stream_id, param_key, param_value
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from sort_task_id_param
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete from sort_task_id_param
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <insert id="insert" parameterType="org.apache.inlong.manager.dao.entity.SortTaskIdParamEntity">
- insert into sort_task_id_param (id, task_name, group_id,
- stream_id, param_key, param_value
- )
- values (#{id,jdbcType=INTEGER}, #{taskName,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR},
- #{streamId,jdbcType=VARCHAR}, #{paramKey,jdbcType=VARCHAR}, #{paramValue,jdbcType=VARCHAR}
- )
- </insert>
- <insert id="insertSelective" parameterType="org.apache.inlong.manager.dao.entity.SortTaskIdParamEntity">
- insert into sort_task_id_param
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="taskName != null">
- task_name,
- </if>
- <if test="groupId != null">
- group_id,
- </if>
- <if test="streamId != null">
- stream_id,
- </if>
- <if test="paramKey != null">
- param_key,
- </if>
- <if test="paramValue != null">
- param_value,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="taskName != null">
- #{taskName,jdbcType=VARCHAR},
- </if>
- <if test="groupId != null">
- #{groupId,jdbcType=VARCHAR},
- </if>
- <if test="streamId != null">
- #{streamId,jdbcType=VARCHAR},
- </if>
- <if test="paramKey != null">
- #{paramKey,jdbcType=VARCHAR},
- </if>
- <if test="paramValue != null">
- #{paramValue,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="org.apache.inlong.manager.dao.entity.SortTaskIdParamEntity">
- update sort_task_id_param
- <set>
- <if test="taskName != null">
- task_name = #{taskName,jdbcType=VARCHAR},
- </if>
- <if test="groupId != null">
- group_id = #{groupId,jdbcType=VARCHAR},
- </if>
- <if test="streamId != null">
- stream_id = #{streamId,jdbcType=VARCHAR},
- </if>
- <if test="paramKey != null">
- param_key = #{paramKey,jdbcType=VARCHAR},
- </if>
- <if test="paramValue != null">
- param_value = #{paramValue,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="org.apache.inlong.manager.dao.entity.SortTaskIdParamEntity">
- update sort_task_id_param
- set task_name = #{taskName,jdbcType=VARCHAR},
- group_id = #{groupId,jdbcType=VARCHAR},
- stream_id = #{streamId,jdbcType=VARCHAR},
- param_key = #{paramKey,jdbcType=VARCHAR},
- param_value = #{paramValue,jdbcType=VARCHAR}
- where id = #{id,jdbcType=INTEGER}
- </update>
- <select id="selectByTaskName" parameterType="java.lang.String" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from sort_task_id_param
- where task_name = #{taskName,jdbcType=VARCHAR}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskSinkParamEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskSinkParamEntityMapper.xml
deleted file mode 100644
index 9c0410e52..000000000
--- a/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskSinkParamEntityMapper.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.inlong.manager.dao.mapper.SortTaskSinkParamEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- <id column="id" jdbcType="INTEGER" property="id"/>
- <result column="task_name" jdbcType="VARCHAR" property="taskName"/>
- <result column="sink_type" jdbcType="VARCHAR" property="sinkType"/>
- <result column="param_key" jdbcType="VARCHAR" property="paramKey"/>
- <result column="param_value" jdbcType="VARCHAR" property="paramValue"/>
- </resultMap>
- <sql id="Base_Column_List">
- id, task_name, sink_type, param_key, param_value
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from sort_task_sink_param
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete
- from sort_task_sink_param
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <insert id="insert" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- insert into sort_task_sink_param (id, task_name, sink_type,
- param_key, param_value)
- values (#{id,jdbcType=INTEGER}, #{taskName,jdbcType=VARCHAR}, #{sinkType,jdbcType=VARCHAR},
- #{paramKey,jdbcType=VARCHAR}, #{paramValue,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- insert into sort_task_sink_param
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="taskName != null">
- task_name,
- </if>
- <if test="sinkType != null">
- sink_type,
- </if>
- <if test="paramKey != null">
- param_key,
- </if>
- <if test="paramValue != null">
- param_value,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="taskName != null">
- #{taskName,jdbcType=VARCHAR},
- </if>
- <if test="sinkType != null">
- #{sinkType,jdbcType=VARCHAR},
- </if>
- <if test="paramKey != null">
- #{paramKey,jdbcType=VARCHAR},
- </if>
- <if test="paramValue != null">
- #{paramValue,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective"
- parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- update sort_task_sink_param
- <set>
- <if test="taskName != null">
- task_name = #{taskName,jdbcType=VARCHAR},
- </if>
- <if test="sinkType != null">
- sink_type = #{sinkType,jdbcType=VARCHAR},
- </if>
- <if test="paramKey != null">
- param_key = #{paramKey,jdbcType=VARCHAR},
- </if>
- <if test="paramValue != null">
- param_value = #{paramValue,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- update sort_task_sink_param
- set task_name = #{taskName,jdbcType=VARCHAR},
- sink_type = #{sinkType,jdbcType=VARCHAR},
- param_key = #{paramKey,jdbcType=VARCHAR},
- param_value = #{paramValue,jdbcType=VARCHAR}
- where id = #{id,jdbcType=INTEGER}
- </update>
- <select id="selectByTaskNameAndType" parameterType="java.lang.String" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from sort_task_sink_param
- where task_name = #{taskName,jdbcType=VARCHAR}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
index 9c29c3bc2..64eb3ff03 100644
--- a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
+++ b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
@@ -271,7 +271,7 @@ CREATE TABLE IF NOT EXISTS `inlong_stream_field`
`inlong_group_id` varchar(256) NOT NULL COMMENT 'Owning inlong group id',
`inlong_stream_id` varchar(256) NOT NULL COMMENT 'Owning inlong stream id',
`is_predefined_field` tinyint(1) DEFAULT '0' COMMENT 'Whether it is a predefined field, 0: no, 1: yes',
- `field_name` varchar(120) NOT NULL COMMENT 'field name',
+ `field_name` varchar(120) NOT NULL COMMENT 'field name',
`field_value` varchar(128) DEFAULT NULL COMMENT 'Field value, required if it is a predefined field',
`pre_expression` varchar(256) DEFAULT NULL COMMENT 'Pre-defined field value expression',
`field_type` varchar(20) NOT NULL COMMENT 'field type',
@@ -488,7 +488,7 @@ CREATE TABLE IF NOT EXISTS `stream_source_field`
`inlong_stream_id` varchar(256) NOT NULL COMMENT 'Inlong stream id',
`source_id` int(11) NOT NULL COMMENT 'Sink id',
`source_type` varchar(15) NOT NULL COMMENT 'Sink type',
- `field_name` varchar(120) NOT NULL COMMENT 'field name',
+ `field_name` varchar(120) NOT NULL COMMENT 'field name',
`field_value` varchar(128) DEFAULT NULL COMMENT 'Field value, required if it is a predefined field',
`pre_expression` varchar(256) DEFAULT NULL COMMENT 'Pre-defined field value expression',
`field_type` varchar(20) NOT NULL COMMENT 'field type',
@@ -512,7 +512,7 @@ CREATE TABLE IF NOT EXISTS `stream_transform_field`
`inlong_stream_id` varchar(256) NOT NULL COMMENT 'Inlong stream id',
`transform_id` int(11) NOT NULL COMMENT 'Transform id',
`transform_type` varchar(15) NOT NULL COMMENT 'Transform type',
- `field_name` varchar(120) NOT NULL COMMENT 'Field name',
+ `field_name` varchar(120) NOT NULL COMMENT 'Field name',
`field_value` varchar(128) DEFAULT NULL COMMENT 'Field value, required if it is a predefined field',
`pre_expression` varchar(256) DEFAULT NULL COMMENT 'Pre-defined field value expression',
`field_type` varchar(50) NOT NULL COMMENT 'Field type',
@@ -541,7 +541,7 @@ CREATE TABLE IF NOT EXISTS `stream_sink_field`
`sink_type` varchar(15) NOT NULL COMMENT 'Sink type',
`source_field_name` varchar(50) DEFAULT NULL COMMENT 'Source field name',
`source_field_type` varchar(50) DEFAULT NULL COMMENT 'Source field type',
- `field_name` varchar(120) NOT NULL COMMENT 'Field name',
+ `field_name` varchar(120) NOT NULL COMMENT 'Field name',
`field_type` varchar(50) NOT NULL COMMENT 'Field type',
`field_comment` varchar(2000) DEFAULT NULL COMMENT 'Field description',
`ext_params` text COMMENT 'Field ext params',
@@ -722,48 +722,6 @@ CREATE TABLE IF NOT EXISTS `db_collector_detail_task`
PRIMARY KEY (`id`)
);
--- ----------------------------
--- Table structure for sort_cluster_config
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `sort_cluster_config`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `cluster_name` varchar(128) NOT NULL COMMENT 'Cluster name',
- `task_name` varchar(128) NOT NULL COMMENT 'Task name',
- `sink_type` varchar(128) NOT NULL COMMENT 'Type of sink',
- PRIMARY KEY (`id`),
- KEY `sort_cluster_config_index` (`cluster_name`)
-);
-
--- ----------------------------
--- Table structure for sort_task_id_param
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `sort_task_id_param`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `task_name` varchar(128) NOT NULL COMMENT 'Task name',
- `group_id` varchar(128) NOT NULL COMMENT 'Inlong group id',
- `stream_id` varchar(128) NULL COMMENT 'Inlong stream id',
- `param_key` varchar(128) NOT NULL COMMENT 'Key of param',
- `param_value` varchar(1024) NOT NULL COMMENT 'Value of param',
- PRIMARY KEY (`id`),
- KEY `sort_task_id_param_index` (`task_name`)
-);
-
--- ----------------------------
--- Table structure for sort_task_sink_param
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `sort_task_sink_param`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `task_name` varchar(128) NOT NULL COMMENT 'Task name',
- `sink_type` varchar(128) NOT NULL COMMENT 'Type of sink',
- `param_key` varchar(128) NOT NULL COMMENT 'Key of param',
- `param_value` varchar(1024) NOT NULL COMMENT 'Value of param',
- PRIMARY KEY (`id`),
- KEY `sort_task_sink_params_index` (`task_name`, `sink_type`)
-);
-
-- ----------------------------
-- Table structure for sort_source_config
-- ----------------------------
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index 7efb1abb7..536263d79 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -288,7 +288,7 @@ CREATE TABLE IF NOT EXISTS `inlong_stream_field`
`inlong_group_id` varchar(256) NOT NULL COMMENT 'Owning inlong group id',
`inlong_stream_id` varchar(256) NOT NULL COMMENT 'Owning inlong stream id',
`is_predefined_field` tinyint(1) DEFAULT '0' COMMENT 'Whether it is a predefined field, 0: no, 1: yes',
- `field_name` varchar(120) NOT NULL COMMENT 'field name',
+ `field_name` varchar(120) NOT NULL COMMENT 'field name',
`field_value` varchar(128) DEFAULT NULL COMMENT 'Field value, required if it is a predefined field',
`pre_expression` varchar(256) DEFAULT NULL COMMENT 'Pre-defined field value expression',
`field_type` varchar(20) NOT NULL COMMENT 'field type',
@@ -514,7 +514,7 @@ CREATE TABLE IF NOT EXISTS `stream_source_field`
`inlong_stream_id` varchar(256) NOT NULL COMMENT 'Inlong stream id',
`source_id` int(11) NOT NULL COMMENT 'Sink id',
`source_type` varchar(15) NOT NULL COMMENT 'Sink type',
- `field_name` varchar(120) NOT NULL COMMENT 'field name',
+ `field_name` varchar(120) NOT NULL COMMENT 'field name',
`field_value` varchar(128) DEFAULT NULL COMMENT 'Field value, required if it is a predefined field',
`pre_expression` varchar(256) DEFAULT NULL COMMENT 'Pre-defined field value expression',
`field_type` varchar(20) NOT NULL COMMENT 'field type',
@@ -539,7 +539,7 @@ CREATE TABLE IF NOT EXISTS `stream_transform_field`
`inlong_stream_id` varchar(256) NOT NULL COMMENT 'Inlong stream id',
`transform_id` int(11) NOT NULL COMMENT 'Transform id',
`transform_type` varchar(15) NOT NULL COMMENT 'Transform type',
- `field_name` varchar(120) NOT NULL COMMENT 'Field name',
+ `field_name` varchar(120) NOT NULL COMMENT 'Field name',
`field_value` varchar(128) DEFAULT NULL COMMENT 'Field value, required if it is a predefined field',
`pre_expression` varchar(256) DEFAULT NULL COMMENT 'Pre-defined field value expression',
`field_type` varchar(50) NOT NULL COMMENT 'Field type',
@@ -569,7 +569,7 @@ CREATE TABLE IF NOT EXISTS `stream_sink_field`
`sink_type` varchar(15) NOT NULL COMMENT 'Sink type',
`source_field_name` varchar(50) DEFAULT NULL COMMENT 'Source field name',
`source_field_type` varchar(50) DEFAULT NULL COMMENT 'Source field type',
- `field_name` varchar(120) NOT NULL COMMENT 'Field name',
+ `field_name` varchar(120) NOT NULL COMMENT 'Field name',
`field_type` varchar(50) NOT NULL COMMENT 'Field type',
`field_comment` varchar(2000) DEFAULT NULL COMMENT 'Field description',
`ext_params` text COMMENT 'Field ext params',
@@ -765,51 +765,6 @@ CREATE TABLE IF NOT EXISTS `db_collector_detail_task`
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='db collector detail task table';
--- ----------------------------
--- Table structure for sort_cluster_config
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `sort_cluster_config`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `cluster_name` varchar(128) NOT NULL COMMENT 'Cluster name',
- `task_name` varchar(128) NOT NULL COMMENT 'Task name',
- `sink_type` varchar(128) NOT NULL COMMENT 'Type of sink',
- PRIMARY KEY (`id`),
- KEY `sort_cluster_config_index` (`cluster_name`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4 COMMENT ='Sort cluster config table';
-
--- ----------------------------
--- Table structure for sort_task_id_param
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `sort_task_id_param`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `task_name` varchar(128) NOT NULL COMMENT 'Task name',
- `group_id` varchar(128) NOT NULL COMMENT 'Inlong group id',
- `stream_id` varchar(128) NULL COMMENT 'Inlong stream id',
- `param_key` varchar(128) NOT NULL COMMENT 'Key of param',
- `param_value` varchar(1024) NOT NULL COMMENT 'Value of param',
- PRIMARY KEY (`id`),
- KEY `sort_task_id_param_index` (`task_name`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4 COMMENT ='Sort task id params table';
-
--- ----------------------------
--- Table structure for sort_task_sink_param
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `sort_task_sink_param`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `task_name` varchar(128) NOT NULL COMMENT 'Task name',
- `sink_type` varchar(128) NOT NULL COMMENT 'Type of sink',
- `param_key` varchar(128) NOT NULL COMMENT 'Key of param',
- `param_value` varchar(1024) NOT NULL COMMENT 'Value of param',
- PRIMARY KEY (`id`),
- KEY `sort_task_sink_params_index` (`task_name`, `sink_type`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4 COMMENT ='Sort task sink params table';
-
-- ----------------------------
-- Table structure for sort_source_config
-- ----------------------------
diff --git a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/openapi/SortControllerTest.java b/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/openapi/SortControllerTest.java
deleted file mode 100644
index aacadaa12..000000000
--- a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/openapi/SortControllerTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.web.controller.openapi;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.inlong.manager.dao.entity.SortClusterConfigEntity;
-import org.apache.inlong.manager.dao.entity.SortTaskIdParamEntity;
-import org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity;
-import org.apache.inlong.manager.dao.mapper.SortClusterConfgiEntityMapper;
-import org.apache.inlong.manager.dao.mapper.SortTaskIdParamEntityMapper;
-import org.apache.inlong.manager.dao.mapper.SortTaskSinkParamEntityMapper;
-import org.apache.inlong.manager.web.WebBaseTest;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.TestInstance.Lifecycle;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.web.servlet.RequestBuilder;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-/**
- * Test class for sort controller.
- */
-@Slf4j
-@TestInstance(Lifecycle.PER_CLASS)
-class SortControllerTest extends WebBaseTest {
-
- // todo Service do not support insert method now, use mappers to insert data.
- @Autowired
- private SortTaskIdParamEntityMapper taskIdParamEntityMapper;
-
- @Autowired
- private SortTaskSinkParamEntityMapper taskSinkParamEntityMapper;
-
- @Autowired
- private SortClusterConfgiEntityMapper sortClusterConfgiEntityMapper;
-
- @BeforeAll
- void setUp() {
- taskIdParamEntityMapper.insert(this.prepareIdParamsEntity("testTask1", 1));
- taskIdParamEntityMapper.insert(this.prepareIdParamsEntity("testTask1", 2));
- taskIdParamEntityMapper.insert(this.prepareIdParamsEntity("testTask2", 1));
- taskSinkParamEntityMapper
- .insert(this.prepareSinkParamsEntity("testTask1", "kafka", 1));
- taskSinkParamEntityMapper
- .insert(this.prepareSinkParamsEntity("testTask2", "pulsar", 1));
- sortClusterConfgiEntityMapper.insert(this.prepareClusterConfigEntity("testTask1", "kafka"));
- sortClusterConfgiEntityMapper.insert(this.prepareClusterConfigEntity("testTask2", "pulsar"));
- }
-
- // @Test
- // @Transactional
- public void testErrorSinkType() throws Exception {
- sortClusterConfgiEntityMapper.insert(
- this.prepareClusterConfigEntity("testTask1", "error type"));
- RequestBuilder request =
- get("/openapi/sort/getClusterConfig")
- .param("clusterName", "testCluster")
- .param("md5", "testMd5");
- mockMvc.perform(request).andExpect(status().isOk()).andDo(print());
- }
-
- // @Test
- // @Transactional
- public void testEmptyClusterNameWhenGet() throws Exception {
- RequestBuilder request =
- get("/openapi/sort/getClusterConfig")
- .param("clusterName", " ")
- .param("md5", "testMd5");
- mockMvc.perform(request).andExpect(status().isOk()).andDo(print());
- }
-
- private SortTaskIdParamEntity prepareIdParamsEntity(String task, int idx) {
- return SortTaskIdParamEntity.builder()
- .groupId(String.valueOf(idx))
- .streamId(String.valueOf(idx))
- .taskName(task)
- .paramKey("idParamKey " + idx)
- .paramValue("idParamValue " + idx)
- .build();
- }
-
- private SortClusterConfigEntity prepareClusterConfigEntity(String taskName, String sinkType) {
- return SortClusterConfigEntity.builder()
- .clusterName("testCluster")
- .taskName(taskName)
- .sinkType(sinkType)
- .build();
- }
-
- private SortTaskSinkParamEntity prepareSinkParamsEntity(String task, String sinkType, int idx) {
- return SortTaskSinkParamEntity.builder()
- .sinkType(sinkType)
- .paramKey("sinkParamKey " + idx)
- .paramValue("sinkParamValue " + idx)
- .taskName(task)
- .build();
- }
-
-}