You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/07/09 04:50:06 UTC
[incubator-inlong] branch master updated: [INLONG-692] remove hive
cluster entity in inlong-manager (#527)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 2f297ca [INLONG-692] remove hive cluster entity in inlong-manager (#527)
2f297ca is described below
commit 2f297ca8ae388496687195686c34fd0d46257b91
Author: healchow <he...@gmail.com>
AuthorDate: Fri Jul 9 12:50:00 2021 +0800
[INLONG-692] remove hive cluster entity in inlong-manager (#527)
Co-authored-by: healzhou <he...@tencent.com>
---
inlong-manager/doc/sql/apache_inlong_manager.sql | 23 ---
.../manager/web/controller/StorageController.java | 9 -
.../inlong/manager/common/enums/EntityStatus.java | 4 +-
.../pojo/datastorage/StorageClusterInfo.java | 36 ----
.../pojo/datastorage/StorageHiveClusterInfo.java | 50 -----
.../inlong/manager/common/util/LoginUserUtil.java | 3 +-
.../dao/entity/StorageHiveClusterEntity.java | 41 -----
.../dao/mapper/StorageHiveClusterEntityMapper.java | 44 -----
.../src/main/resources/generatorConfig.xml | 7 -
.../mappers/StorageHiveClusterEntityMapper.xml | 204 ---------------------
.../manager/service/core/StorageService.java | 10 -
.../service/core/impl/StorageServiceImpl.java | 32 ----
12 files changed, 3 insertions(+), 460 deletions(-)
diff --git a/inlong-manager/doc/sql/apache_inlong_manager.sql b/inlong-manager/doc/sql/apache_inlong_manager.sql
index 41c4e3e..bc88701 100644
--- a/inlong-manager/doc/sql/apache_inlong_manager.sql
+++ b/inlong-manager/doc/sql/apache_inlong_manager.sql
@@ -587,29 +587,6 @@ CREATE TABLE `storage_hive`
DEFAULT CHARSET = utf8mb4 COMMENT ='Data is stored in Hive configuration table';
-- ----------------------------
--- Table structure for storage_hive_cluster
--- ----------------------------
-DROP TABLE IF EXISTS `storage_hive_cluster`;
-CREATE TABLE `storage_hive_cluster`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `name` varchar(255) NOT NULL COMMENT 'cluster name',
- `type` varchar(10) DEFAULT 'Hive' COMMENT 'Cluster type, currently only Hive',
- `hive_addr` varchar(255) DEFAULT NULL COMMENT 'cluster URL address',
- `username` varchar(255) DEFAULT NULL COMMENT 'Username',
- `password` varchar(255) DEFAULT NULL COMMENT 'User password',
- `warehouse_dir` varchar(10) DEFAULT NULL COMMENT 'HDFS data data path',
- `hdfs_defaultfs` varchar(255) DEFAULT NULL COMMENT 'HDFS cluster address',
- `hdfs_ugi` varchar(255) DEFAULT NULL COMMENT 'HDFS write user information',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'modify time',
- `cluster_tag` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`id`)
-) ENGINE = InnoDB
- AUTO_INCREMENT = 2
- DEFAULT CHARSET = utf8mb4 COMMENT ='Hive cluster information';
-
--- ----------------------------
-- Table structure for storage_hive_field
-- ----------------------------
DROP TABLE IF EXISTS `storage_hive_field`;
diff --git a/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/StorageController.java b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/StorageController.java
index ea5dd95..5e64559 100644
--- a/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/StorageController.java
+++ b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/StorageController.java
@@ -27,7 +27,6 @@ import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.enums.OperationType;
import org.apache.inlong.manager.common.pojo.datastorage.BaseStorageInfo;
import org.apache.inlong.manager.common.pojo.datastorage.BaseStorageListVO;
-import org.apache.inlong.manager.common.pojo.datastorage.StorageClusterInfo;
import org.apache.inlong.manager.common.pojo.datastorage.StoragePageRequest;
import org.apache.inlong.manager.common.pojo.query.ColumnInfoBean;
import org.apache.inlong.manager.common.pojo.query.ConnectionInfo;
@@ -100,14 +99,6 @@ public class StorageController {
return Response.success(result);
}
- @RequestMapping(value = "/listStorageCluster", method = RequestMethod.GET)
- @ApiOperation(value = "Query the storage cluster of the specified type")
- @ApiImplicitParam(name = "storageType", dataTypeClass = String.class)
- public Response<StorageClusterInfo> listStorageCluster(
- @RequestParam(required = false) String storageType) {
- return Response.success(storageService.listStorageCluster(storageType));
- }
-
@RequestMapping(value = "/query/testConnection", method = RequestMethod.POST)
@ApiOperation(value = "Test the connection")
public Response<Boolean> testConnection(@RequestBody ConnectionInfo connectionInfo) {
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/EntityStatus.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/EntityStatus.java
index 9c30e1e..3a2dce0 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/EntityStatus.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/EntityStatus.java
@@ -38,8 +38,8 @@ public enum EntityStatus {
// Business related status
BIZ_WAIT_APPLYING(100, "waiting to applying"),
BIZ_WAIT_APPROVE(101, "waiting to approve"),
- BIZ_APPROVE_REJECT(102, "approve reject"),
- BIZ_APPROVE_PASS(103, "approve pass"),
+ BIZ_APPROVE_REJECT(102, "approval reject"),
+ BIZ_APPROVE_PASS(103, "approval pass"),
BIZ_CONFIG_ING(110, "configuring"),
BIZ_CONFIG_FAILURE(120, "failed to config"),
BIZ_CONFIG_SUCCESS(130, "successfully config"),
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/StorageClusterInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/StorageClusterInfo.java
deleted file mode 100644
index 96286b5..0000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/StorageClusterInfo.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.common.pojo.datastorage;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.Data;
-
-/**
- * Storage cluster info
- *
- */
-@Data
-@ApiModel(value = "Storage cluster info")
-public class StorageClusterInfo {
-
- @ApiModelProperty(value = "Hive cluster list")
- private List<StorageHiveClusterInfo> hiveClusterList;
-
-}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/StorageHiveClusterInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/StorageHiveClusterInfo.java
deleted file mode 100644
index 6692e12..0000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/StorageHiveClusterInfo.java
+++ /dev/null
@@ -1,50 +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.common.pojo.datastorage;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * Hive cluster info
- */
-@Data
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("Hive cluster info")
-public class StorageHiveClusterInfo extends BaseStorageClusterInfo {
-
- @ApiModelProperty("Cluster type, support: HIVE")
- private String type;
-
- @ApiModelProperty("Hive cluster address")
- private String hiveAddr;
-
- @ApiModelProperty("HDFS warehouse dir")
- private String warehouseDir;
-
- @ApiModelProperty("HDFS defaultfs path")
- private String hdfsDefaultfs;
-
- @ApiModelProperty("HDFS ugi info")
- private String hdfsUgi;
-
-}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/LoginUserUtil.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/LoginUserUtil.java
index 9fa1ae3..acc52dc 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/LoginUserUtil.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/LoginUserUtil.java
@@ -17,9 +17,8 @@
package org.apache.inlong.manager.common.util;
-import org.apache.inlong.manager.common.pojo.user.UserDetail;
-
import lombok.extern.slf4j.Slf4j;
+import org.apache.inlong.manager.common.pojo.user.UserDetail;
/**
* User info for login
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StorageHiveClusterEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StorageHiveClusterEntity.java
deleted file mode 100644
index 5740518..0000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StorageHiveClusterEntity.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.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-@Data
-public class StorageHiveClusterEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Integer id;
- private String name;
- private String type;
- private String hiveAddr;
- private String username;
- private String password;
- private String warehouseDir;
- private String hdfsDefaultfs;
- private String hdfsUgi;
- private String clusterTag;
- private Date createTime;
- private Date modifyTime;
-
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StorageHiveClusterEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StorageHiveClusterEntityMapper.java
deleted file mode 100644
index e1a6e68..0000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StorageHiveClusterEntityMapper.java
+++ /dev/null
@@ -1,44 +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.StorageHiveClusterEntity;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface StorageHiveClusterEntityMapper {
-
- int deleteByPrimaryKey(Integer id);
-
- int insert(StorageHiveClusterEntity record);
-
- int insertSelective(StorageHiveClusterEntity record);
-
- StorageHiveClusterEntity selectByPrimaryKey(Integer id);
-
- int updateByPrimaryKeySelective(StorageHiveClusterEntity record);
-
- int updateByPrimaryKey(StorageHiveClusterEntity record);
-
- List<StorageHiveClusterEntity> selectByCondition(@Param("type") String type);
-
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml b/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
index 6649250..1b37157 100644
--- a/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
+++ b/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
@@ -182,13 +182,6 @@
enableCountByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" enableUpdateByExample="false"/>
- <table tableName="storage_hive_cluster" domainObjectName="StorageHiveClusterEntity"
- enableSelectByPrimaryKey="true"
- enableUpdateByPrimaryKey="true"
- enableDeleteByPrimaryKey="true" enableInsert="true"
- enableCountByExample="false" enableDeleteByExample="false"
- enableSelectByExample="false" enableUpdateByExample="false"/>
-
<table tableName="storage_hive_field" domainObjectName="StorageHiveFieldEntity"
enableSelectByPrimaryKey="true"
enableUpdateByPrimaryKey="true"
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StorageHiveClusterEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StorageHiveClusterEntityMapper.xml
deleted file mode 100644
index 484e6bf..0000000
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StorageHiveClusterEntityMapper.xml
+++ /dev/null
@@ -1,204 +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
- ~ <p>
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~ <p>
- ~ 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.StorageHiveClusterEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.StorageHiveClusterEntity">
- <id column="id" jdbcType="INTEGER" property="id"/>
- <result column="name" jdbcType="VARCHAR" property="name"/>
- <result column="type" jdbcType="VARCHAR" property="type"/>
- <result column="hive_addr" jdbcType="VARCHAR" property="hiveAddr"/>
- <result column="username" jdbcType="VARCHAR" property="username"/>
- <result column="password" jdbcType="VARCHAR" property="password"/>
- <result column="warehouse_dir" jdbcType="VARCHAR" property="warehouseDir"/>
- <result column="hdfs_defaultfs" jdbcType="VARCHAR" property="hdfsDefaultfs"/>
- <result column="hdfs_ugi" jdbcType="VARCHAR" property="hdfsUgi"/>
- <result column="cluster_tag" jdbcType="VARCHAR" property="clusterTag"/>
- <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
- <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/>
- </resultMap>
- <sql id="Base_Column_List">
- id, name, type, hive_addr, username, password, warehouse_dir, hdfs_defaultfs, hdfs_ugi,
- create_time, modify_time, cluster_tag
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from storage_hive_cluster
- where id = #{id,jdbcType=INTEGER}
- </select>
- <select id="selectByCondition" resultType="org.apache.inlong.manager.dao.entity.StorageHiveClusterEntity">
- select
- <include refid="Base_Column_List"/>
- from storage_hive_cluster
- <where>
- <if test="type != null and type != ''">
- and type = #{type, jdbcType=VARCHAR}
- </if>
- </where>
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete
- from storage_hive_cluster
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <insert id="insert" parameterType="org.apache.inlong.manager.dao.entity.StorageHiveClusterEntity">
- insert into storage_hive_cluster (id, name, type,
- hive_addr, username, password,
- warehouse_dir, hdfs_defaultfs, hdfs_ugi,
- create_time, modify_time, cluster_tag)
- values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
- #{hiveAddr,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
- #{warehouseDir,jdbcType=VARCHAR}, #{hdfsDefaultfs,jdbcType=VARCHAR}, #{hdfsUgi,jdbcType=VARCHAR},
- #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{clusterTag,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" parameterType="org.apache.inlong.manager.dao.entity.StorageHiveClusterEntity">
- insert into storage_hive_cluster
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="name != null">
- name,
- </if>
- <if test="type != null">
- type,
- </if>
- <if test="hiveAddr != null">
- hive_addr,
- </if>
- <if test="username != null">
- username,
- </if>
- <if test="password != null">
- password,
- </if>
- <if test="warehouseDir != null">
- warehouse_dir,
- </if>
- <if test="hdfsDefaultfs != null">
- hdfs_defaultfs,
- </if>
- <if test="hdfsUgi != null">
- hdfs_ugi,
- </if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="modifyTime != null">
- modify_time,
- </if>
- <if test="clusterTag != null">
- cluster_tag,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="name != null">
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="type != null">
- #{type,jdbcType=VARCHAR},
- </if>
- <if test="hiveAddr != null">
- #{hiveAddr,jdbcType=VARCHAR},
- </if>
- <if test="username != null">
- #{username,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- #{password,jdbcType=VARCHAR},
- </if>
- <if test="warehouseDir != null">
- #{warehouseDir,jdbcType=VARCHAR},
- </if>
- <if test="hdfsDefaultfs != null">
- #{hdfsDefaultfs,jdbcType=VARCHAR},
- </if>
- <if test="hdfsUgi != null">
- #{hdfsUgi,jdbcType=VARCHAR},
- </if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- #{modifyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="clusterTag != null">
- #{clusterTag,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective"
- parameterType="org.apache.inlong.manager.dao.entity.StorageHiveClusterEntity">
- update storage_hive_cluster
- <set>
- <if test="name != null">
- name = #{name,jdbcType=VARCHAR},
- </if>
- <if test="type != null">
- type = #{type,jdbcType=VARCHAR},
- </if>
- <if test="hiveAddr != null">
- hive_addr = #{hiveAddr,jdbcType=VARCHAR},
- </if>
- <if test="username != null">
- username = #{username,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- password = #{password,jdbcType=VARCHAR},
- </if>
- <if test="warehouseDir != null">
- warehouse_dir = #{warehouseDir,jdbcType=VARCHAR},
- </if>
- <if test="hdfsDefaultfs != null">
- hdfs_defaultfs = #{hdfsDefaultfs,jdbcType=VARCHAR},
- </if>
- <if test="hdfsUgi != null">
- hdfs_ugi = #{hdfsUgi,jdbcType=VARCHAR},
- </if>
- <if test="createTime != null">
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="clusterTag != null">
- cluster_tag = #{clusterTag,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="org.apache.inlong.manager.dao.entity.StorageHiveClusterEntity">
- update storage_hive_cluster
- set name = #{name,jdbcType=VARCHAR},
- type = #{type,jdbcType=VARCHAR},
- hive_addr = #{hiveAddr,jdbcType=VARCHAR},
- username = #{username,jdbcType=VARCHAR},
- password = #{password,jdbcType=VARCHAR},
- warehouse_dir = #{warehouseDir,jdbcType=VARCHAR},
- hdfs_defaultfs = #{hdfsDefaultfs,jdbcType=VARCHAR},
- hdfs_ugi = #{hdfsUgi,jdbcType=VARCHAR},
- cluster_tag = #{clusterTag,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP}
- where id = #{id,jdbcType=INTEGER}
- </update>
-</mapper>
\ No newline at end of file
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/StorageService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/StorageService.java
index f8401b2..ec6c16d 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/StorageService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/StorageService.java
@@ -22,10 +22,8 @@ import java.util.List;
import org.apache.inlong.manager.common.pojo.datastorage.BaseStorageInfo;
import org.apache.inlong.manager.common.pojo.datastorage.BaseStorageListVO;
import org.apache.inlong.manager.common.pojo.datastorage.StorageApproveInfo;
-import org.apache.inlong.manager.common.pojo.datastorage.StorageClusterInfo;
import org.apache.inlong.manager.common.pojo.datastorage.StoragePageRequest;
import org.apache.inlong.manager.common.pojo.datastorage.StorageSummaryInfo;
-import org.springframework.web.multipart.MultipartFile;
/**
* Service layer interface for data storage
@@ -116,14 +114,6 @@ public interface StorageService {
void updateHiveStatusById(int id, int status, String log);
/**
- * Query the storage cluster of the specified storage type/area ID
- *
- * @param storageType Storage type
- * @return Store cluster information
- */
- StorageClusterInfo listStorageCluster(String storageType);
-
- /**
* Physically delete data storage information under specified conditions
*
* @param bid Business identifier
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/StorageServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/StorageServiceImpl.java
index 901f1c2..18043c7 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/StorageServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/StorageServiceImpl.java
@@ -30,16 +30,11 @@ import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.pojo.datastorage.BaseStorageInfo;
import org.apache.inlong.manager.common.pojo.datastorage.BaseStorageListVO;
import org.apache.inlong.manager.common.pojo.datastorage.StorageApproveInfo;
-import org.apache.inlong.manager.common.pojo.datastorage.StorageClusterInfo;
-import org.apache.inlong.manager.common.pojo.datastorage.StorageHiveClusterInfo;
import org.apache.inlong.manager.common.pojo.datastorage.StoragePageRequest;
import org.apache.inlong.manager.common.pojo.datastorage.StorageSummaryInfo;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.BusinessEntity;
-import org.apache.inlong.manager.dao.entity.StorageHiveClusterEntity;
import org.apache.inlong.manager.dao.entity.StorageHiveEntity;
-import org.apache.inlong.manager.dao.mapper.StorageHiveClusterEntityMapper;
import org.apache.inlong.manager.dao.mapper.StorageHiveEntityMapper;
import org.apache.inlong.manager.service.core.StorageService;
import org.slf4j.Logger;
@@ -61,8 +56,6 @@ public class StorageServiceImpl extends StorageBaseOperation implements StorageS
@Autowired
private StorageHiveEntityMapper hiveStorageMapper;
- @Autowired
- private StorageHiveClusterEntityMapper hiveClusterMapper;
@Transactional(rollbackFor = Throwable.class)
@Override
@@ -246,31 +239,6 @@ public class StorageServiceImpl extends StorageBaseOperation implements StorageS
hiveStorageMapper.updateStorageStatusById(entity);
}
- @Override
- public StorageClusterInfo listStorageCluster(String storageType) {
- LOGGER.debug("begin to list storage cluster info by storageType={}", storageType);
-
- // Query the specified type of cluster
- List<StorageHiveClusterEntity> hiveClusters;
- if (StringUtils.isNotEmpty(storageType)) {
- storageType = storageType.toUpperCase(Locale.ROOT);
- if (BizConstant.STORAGE_TYPE_HIVE.equals(storageType)) {
- hiveClusters = hiveClusterMapper.selectByCondition(storageType);
- } else {
- LOGGER.error("the storageType={} not support", storageType);
- throw new BusinessException(BizErrorCodeEnum.STORAGE_TYPE_NOT_SUPPORTED);
- }
- } else { // Query all storage clusters
- hiveClusters = hiveClusterMapper.selectByCondition(BizConstant.STORAGE_TYPE_HIVE);
- }
-
- StorageClusterInfo clusterInfo = new StorageClusterInfo();
- clusterInfo.setHiveClusterList(CommonBeanUtils.copyListProperties(hiveClusters, StorageHiveClusterInfo::new));
-
- LOGGER.info("success to list storage cluster info");
- return clusterInfo;
- }
-
@Transactional(rollbackFor = Throwable.class)
@Override
public boolean deleteAllByIdentifier(String bid, String dsid) {