This is an automated email from the ASF dual-hosted git repository. healchow pushed a commit to branch INLONG-4186 in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
commit 97ca6af864a303b260a50613a5437a695248c99c Author: healchow <[email protected]> AuthorDate: Fri May 13 12:44:34 2022 +0800 [INLONG-4186][Manager] Add token field in cluster and node table --- .../common/pojo/cluster/InlongClusterRequest.java | 3 +++ .../common/pojo/cluster/InlongClusterResponse.java | 3 +++ .../manager/common/pojo/node/DataNodeRequest.java | 4 +-- .../manager/common/pojo/node/DataNodeResponse.java | 4 +-- .../inlong/manager/dao/entity/DataNodeEntity.java | 2 +- .../manager/dao/entity/InlongClusterEntity.java | 1 + .../resources/mappers/DataNodeEntityMapper.xml | 16 ++++++------ .../mappers/InlongClusterEntityMapper.xml | 29 ++++++++++++++++------ .../service/core/impl/DataNodeServiceImpl.java | 2 +- .../service/core/impl/DataNodeServiceTest.java | 4 +-- .../main/resources/sql/apache_inlong_manager.sql | 20 +++++++-------- .../manager-web/sql/apache_inlong_manager.sql | 14 +++++------ 12 files changed, 59 insertions(+), 43 deletions(-) diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/InlongClusterRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/InlongClusterRequest.java index 1a2720042..35a02e9ad 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/InlongClusterRequest.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/InlongClusterRequest.java @@ -51,6 +51,9 @@ public class InlongClusterRequest { @ApiModelProperty(value = "Extension tag") private String extTag; + @ApiModelProperty(value = "Cluster token") + private String token; + @ApiModelProperty(value = "Cluster heartbeat info") private String heartbeat; diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/InlongClusterResponse.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/InlongClusterResponse.java index 7803d7122..e70fe2b1d 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/InlongClusterResponse.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/InlongClusterResponse.java @@ -49,6 +49,9 @@ public class InlongClusterResponse { @ApiModelProperty(value = "Extension tag") private String extTag; + @ApiModelProperty(value = "Cluster token") + private String token; + @ApiModelProperty(value = "Cluster heartbeat info") private String heartbeat; diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeRequest.java index d86b69036..6e203a0b1 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeRequest.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeRequest.java @@ -47,8 +47,8 @@ public class DataNodeRequest { @ApiModelProperty(value = "Node username") private String username; - @ApiModelProperty(value = "Node password") - private String password; + @ApiModelProperty(value = "Node token") + private String token; @ApiModelProperty(value = "Extended params") private String extParams; diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeResponse.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeResponse.java index 8cb34eaeb..89c463b81 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeResponse.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeResponse.java @@ -46,8 +46,8 @@ public class DataNodeResponse { @ApiModelProperty(value = "Node username") private String username; - @ApiModelProperty(value = "Node password") - private String password; + @ApiModelProperty(value = "Node token") + private String token; @ApiModelProperty(value = "Extended params") private String extParams; diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/DataNodeEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/DataNodeEntity.java index 15bdf0545..43f57893e 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/DataNodeEntity.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/DataNodeEntity.java @@ -31,7 +31,7 @@ public class DataNodeEntity implements Serializable { private String type; private String url; private String username; - private String password; + private String token; private String inCharges; private Integer status; private Integer isDeleted; diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongClusterEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongClusterEntity.java index 2baf87bad..0c4852699 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongClusterEntity.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongClusterEntity.java @@ -33,6 +33,7 @@ public class InlongClusterEntity implements Serializable { private String url; private String clusterTag; private String extTag; + private String token; private String extParams; private String heartbeat; diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml index 5d7a521c9..20109b878 100644 --- a/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml +++ b/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml @@ -26,7 +26,7 @@ <result column="type" jdbcType="VARCHAR" property="type"/> <result column="url" jdbcType="VARCHAR" property="url"/> <result column="username" jdbcType="VARCHAR" property="username"/> - <result column="password" jdbcType="VARCHAR" property="password"/> + <result column="token" jdbcType="VARCHAR" property="token"/> <result column="ext_params" jdbcType="LONGVARCHAR" property="extParams"/> <result column="in_charges" jdbcType="VARCHAR" property="inCharges"/> <result column="status" jdbcType="INTEGER" property="status"/> @@ -37,19 +37,19 @@ <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/> </resultMap> <sql id="Base_Column_List"> - id, name, type, url, username, password, ext_params, in_charges, status, is_deleted, + id, name, type, url, username, token, ext_params, in_charges, status, is_deleted, creator, modifier, create_time, modify_time </sql> <insert id="insert" useGeneratedKeys="true" keyProperty="id" - parameterType="org.apache.inlong.manager.dao.entity.DataNodeEntity"> + parameterType="org.apache.inlong.manager.dao.entity.DataNodeEntity"> insert into data_node (id, name, type, - url, username, password, + url, username, token, in_charges, status, is_deleted, creator, modifier, create_time, modify_time, ext_params) values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, - #{url,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, + #{url,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, #{token,jdbcType=VARCHAR}, #{inCharges,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{isDeleted,jdbcType=INTEGER}, #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{extParams,jdbcType=LONGVARCHAR}) @@ -101,7 +101,7 @@ type = #{type,jdbcType=VARCHAR}, url = #{url,jdbcType=VARCHAR}, username = #{username,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, + token = #{token,jdbcType=VARCHAR}, ext_params = #{extParams,jdbcType=LONGVARCHAR}, in_charges = #{inCharges,jdbcType=VARCHAR}, status = #{status,jdbcType=INTEGER}, @@ -127,8 +127,8 @@ <if test="username != null"> username = #{username,jdbcType=VARCHAR}, </if> - <if test="password != null"> - password = #{password,jdbcType=VARCHAR}, + <if test="token != null"> + token = #{token,jdbcType=VARCHAR}, </if> <if test="inCharges != null"> in_charges = #{inCharges,jdbcType=VARCHAR}, diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml index 8303dcde5..3d6e364ea 100644 --- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml +++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml @@ -27,6 +27,7 @@ <result column="url" jdbcType="VARCHAR" property="url"/> <result column="cluster_tag" jdbcType="VARCHAR" property="clusterTag"/> <result column="ext_tag" jdbcType="VARCHAR" property="extTag"/> + <result column="token" jdbcType="VARCHAR" property="token"/> <result column="ext_params" jdbcType="LONGVARCHAR" property="extParams"/> <result column="heartbeat" jdbcType="LONGVARCHAR" property="heartbeat"/> <result column="in_charges" jdbcType="VARCHAR" property="inCharges"/> @@ -38,22 +39,24 @@ <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/> </resultMap> <sql id="Base_Column_List"> - id, name, type, url, cluster_tag, ext_tag, ext_params, heartbeat, in_charges, - status, is_deleted, creator, modifier, create_time, modify_time + id, name, type, url, cluster_tag, ext_tag, token, ext_params, heartbeat, + in_charges, status, is_deleted, creator, modifier, create_time, modify_time </sql> <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="org.apache.inlong.manager.dao.entity.InlongClusterEntity"> insert into inlong_cluster (id, name, type, url, cluster_tag, ext_tag, - ext_params, heartbeat, in_charges, - status, is_deleted, creator, - modifier, create_time, modify_time) + token, ext_params, heartbeat, + in_charges, status, is_deleted, + creator, modifier, + create_time, modify_time) values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{clusterTag,jdbcType=VARCHAR}, #{extTag,jdbcType=VARCHAR}, - #{extParams,jdbcType=LONGVARCHAR}, #{heartbeat,jdbcType=LONGVARCHAR}, #{inCharges,jdbcType=VARCHAR}, - #{status,jdbcType=INTEGER}, #{isDeleted,jdbcType=INTEGER}, #{creator,jdbcType=VARCHAR}, - #{modifier,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}) + #{token,jdbcType=VARCHAR}, #{extParams,jdbcType=LONGVARCHAR}, #{heartbeat,jdbcType=LONGVARCHAR}, + #{inCharges,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{isDeleted,jdbcType=INTEGER}, + #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}) </insert> <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="org.apache.inlong.manager.dao.entity.InlongClusterEntity"> @@ -77,6 +80,9 @@ <if test="extTag != null"> ext_tag, </if> + <if test="token != null"> + token, + </if> <if test="inCharges != null"> in_charges, </if> @@ -124,6 +130,9 @@ <if test="extTag != null"> #{extTag,jdbcType=VARCHAR}, </if> + <if test="token != null"> + #{token,jdbcType=VARCHAR}, + </if> <if test="inCharges != null"> #{inCharges,jdbcType=VARCHAR}, </if> @@ -168,6 +177,7 @@ url = #{url,jdbcType=VARCHAR}, cluster_tag = #{clusterTag,jdbcType=VARCHAR}, ext_tag = #{extTag,jdbcType=VARCHAR}, + token = #{token,jdbcType=VARCHAR}, ext_params = #{extParams,jdbcType=LONGVARCHAR}, heartbeat = #{heartbeat,jdbcType=LONGVARCHAR}, in_charges = #{inCharges,jdbcType=VARCHAR}, @@ -236,6 +246,9 @@ <if test="extTag != null"> ext_tag = #{extTag,jdbcType=VARCHAR}, </if> + <if test="token != null"> + token = #{token,jdbcType=VARCHAR}, + </if> <if test="extParams != null"> ext_params = #{extParams,jdbcType=LONGVARCHAR}, </if> diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataNodeServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataNodeServiceImpl.java index bf7e27581..2a72625ec 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataNodeServiceImpl.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataNodeServiceImpl.java @@ -172,7 +172,7 @@ public class DataNodeServiceImpl implements DataNodeService { private Boolean testHiveConnection(DataNodeRequest request) { String url = request.getUrl(); Preconditions.checkNotNull(url, "connection url cannot be empty"); - try (Connection ignored = HiveJdbcUtils.getConnection(url, request.getUsername(), request.getPassword())) { + try (Connection ignored = HiveJdbcUtils.getConnection(url, request.getUsername(), request.getToken())) { LOGGER.info("hive connection not null - connection success"); return true; } catch (Exception e) { diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/DataNodeServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/DataNodeServiceTest.java index 49ffccc07..6b023d6a3 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/DataNodeServiceTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/DataNodeServiceTest.java @@ -44,7 +44,7 @@ public class DataNodeServiceTest extends ServiceBaseTest { request.setType(type); request.setUrl(url); request.setUsername(username); - request.setPassword(password); + request.setToken(password); request.setInCharges(GLOBAL_OPERATOR); return dataNodeService.save(request, GLOBAL_OPERATOR); } @@ -69,7 +69,7 @@ public class DataNodeServiceTest extends ServiceBaseTest { request.setType(type); request.setUrl(url); request.setUsername(username); - request.setPassword(password); + request.setToken(password); return dataNodeService.update(request, GLOBAL_OPERATOR); } diff --git a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql index 4ef5d7498..6dce13aec 100644 --- a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql +++ b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql @@ -98,8 +98,7 @@ CREATE TABLE `inlong_group_ext` -- ---------------------------- -- Table structure for inlong_cluster -- ---------------------------- -DROP TABLE IF EXISTS `inlong_cluster`; -CREATE TABLE `inlong_cluster` +CREATE TABLE IF NOT EXISTS `inlong_cluster` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `name` varchar(128) NOT NULL COMMENT 'Cluster name', @@ -107,6 +106,7 @@ CREATE TABLE `inlong_cluster` `url` varchar(512) DEFAULT NULL COMMENT 'Cluster URL', `cluster_tag` varchar(128) DEFAULT NULL COMMENT 'Cluster tag, the same tab indicates that cluster belongs to the same set', `ext_tag` varchar(128) DEFAULT NULL COMMENT 'Extension tag, for extended use', + `token` varchar(512) DEFAULT NULL COMMENT 'Cluster token', `ext_params` text DEFAULT NULL COMMENT 'Extended params, will saved as JSON string', `heartbeat` text DEFAULT NULL COMMENT 'Cluster heartbeat info', `in_charges` varchar(512) NOT NULL COMMENT 'Name of responsible person, separated by commas', @@ -123,8 +123,7 @@ CREATE TABLE `inlong_cluster` -- ---------------------------- -- Table structure for inlong_cluster_node -- ---------------------------- -DROP TABLE IF EXISTS `inlong_cluster_node`; -CREATE TABLE `inlong_cluster_node` +CREATE TABLE IF NOT EXISTS `inlong_cluster_node` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `parent_id` int(11) NOT NULL COMMENT 'Id of the parent cluster', @@ -145,15 +144,14 @@ CREATE TABLE `inlong_cluster_node` -- ---------------------------- -- Table structure for data_node -- ---------------------------- -DROP TABLE IF EXISTS `data_node`; -CREATE TABLE `data_node` +CREATE TABLE IF NOT EXISTS `data_node` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', - `name` varchar(128) NOT NULL COMMENT 'Cluster name', - `type` varchar(20) DEFAULT '' COMMENT 'Cluster type, such as: MYSQL, HIVE, KAFKA, ES, etc', - `url` varchar(512) DEFAULT NULL COMMENT 'Cluster URL', - `username` varchar(128) DEFAULT NULL COMMENT 'Username for cluster if needed', - `password` varchar(128) DEFAULT NULL COMMENT 'Password for cluster', + `name` varchar(128) NOT NULL COMMENT 'Node name', + `type` varchar(20) DEFAULT '' COMMENT 'Node type, such as: MYSQL, HIVE, KAFKA, ES, etc', + `url` varchar(512) DEFAULT NULL COMMENT 'Node URL', + `username` varchar(128) DEFAULT NULL COMMENT 'Username for node if needed', + `token` varchar(512) DEFAULT NULL COMMENT 'Node token', `ext_params` text DEFAULT NULL COMMENT 'Extended params, will saved as JSON string', `in_charges` varchar(512) NOT NULL COMMENT 'Name of responsible person, separated by commas', `status` int(4) DEFAULT '0' COMMENT 'Cluster status', diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql b/inlong-manager/manager-web/sql/apache_inlong_manager.sql index 7a8e7bde0..ab0b25b5b 100644 --- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql +++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql @@ -107,8 +107,7 @@ CREATE TABLE `inlong_group_ext` -- ---------------------------- -- Table structure for inlong_cluster -- ---------------------------- -DROP TABLE IF EXISTS `inlong_cluster`; -CREATE TABLE `inlong_cluster` +CREATE TABLE IF NOT EXISTS `inlong_cluster` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `name` varchar(128) NOT NULL COMMENT 'Cluster name', @@ -116,6 +115,7 @@ CREATE TABLE `inlong_cluster` `url` varchar(512) DEFAULT NULL COMMENT 'Cluster URL', `cluster_tag` varchar(128) DEFAULT NULL COMMENT 'Cluster tag, the same tab indicates that cluster belongs to the same set', `ext_tag` varchar(128) DEFAULT NULL COMMENT 'Extension tag, for extended use', + `token` varchar(512) DEFAULT NULL COMMENT 'Cluster token', `ext_params` text DEFAULT NULL COMMENT 'Extended params, will saved as JSON string', `heartbeat` text DEFAULT NULL COMMENT 'Cluster heartbeat info', `in_charges` varchar(512) NOT NULL COMMENT 'Name of responsible person, separated by commas', @@ -133,8 +133,7 @@ CREATE TABLE `inlong_cluster` -- ---------------------------- -- Table structure for inlong_cluster_node -- ---------------------------- -DROP TABLE IF EXISTS `inlong_cluster_node`; -CREATE TABLE `inlong_cluster_node` +CREATE TABLE IF NOT EXISTS `inlong_cluster_node` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `parent_id` int(11) NOT NULL COMMENT 'Id of the parent cluster', @@ -156,15 +155,14 @@ CREATE TABLE `inlong_cluster_node` -- ---------------------------- -- Table structure for data_node -- ---------------------------- -DROP TABLE IF EXISTS `data_node`; -CREATE TABLE `data_node` +CREATE TABLE IF NOT EXISTS `data_node` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `name` varchar(128) NOT NULL COMMENT 'Node name', `type` varchar(20) DEFAULT '' COMMENT 'Node type, such as: MYSQL, HIVE, KAFKA, ES, etc', `url` varchar(512) DEFAULT NULL COMMENT 'Node URL', - `username` varchar(128) DEFAULT NULL COMMENT 'Username for node if needed', - `password` varchar(128) DEFAULT NULL COMMENT 'Password for node', + `username` varchar(128) DEFAULT NULL COMMENT 'Username for node', + `token` varchar(512) DEFAULT NULL COMMENT 'Node token', `ext_params` text DEFAULT NULL COMMENT 'Extended params, will saved as JSON string', `in_charges` varchar(512) NOT NULL COMMENT 'Name of responsible person, separated by commas', `status` int(4) DEFAULT '0' COMMENT 'Node status',
