You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/08/10 14:27:04 UTC
[inlong] branch master updated: [INLONG-5432][Manager] Return the type of the MQ cluster when processing the getConfig method (#5434)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 bc10b8f8a [INLONG-5432][Manager] Return the type of the MQ cluster when processing the getConfig method (#5434)
bc10b8f8a is described below
commit bc10b8f8a567157b5387e216d96387f8a3ad7007
Author: fuweng11 <76...@users.noreply.github.com>
AuthorDate: Wed Aug 10 22:26:58 2022 +0800
[INLONG-5432][Manager] Return the type of the MQ cluster when processing the getConfig method (#5434)
---
.../src/main/resources/mappers/InlongClusterEntityMapper.xml | 8 +++++++-
.../inlong/manager/service/cluster/InlongClusterServiceImpl.java | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
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 d0e531324..1df48fbcb 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml
@@ -119,7 +119,7 @@
<if test="type != null and type != ''">
and `type` = #{type, jdbcType=VARCHAR}
</if>
- <if test="typeList != null and typeList.size()>0">
+ <if test="typeList != null and typeList.size() > 0">
and `type` in
<foreach item="item" index="index" collection="typeList" open="(" close=")" separator=",">
#{item}
@@ -128,6 +128,12 @@
<if test="clusterTag != null and clusterTag != ''">
and find_in_set(#{clusterTag, jdbcType=VARCHAR}, cluster_tags)
</if>
+ <if test="clusterTagList != null and clusterTagList.size() > 0">
+ and
+ <foreach item="item" index="index" collection="clusterTagList" open="(" close=")" separator="or">
+ find_in_set(#{item}, cluster_tags)
+ </foreach>
+ </if>
<if test="extTag != null and extTag != ''">
and ext_tag = #{extTag, jdbcType=VARCHAR}
</if>
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
index ee29f979a..b0256a1a3 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
@@ -737,6 +737,7 @@ public class InlongClusterServiceImpl implements InlongClusterService {
MQClusterInfo clusterInfo = new MQClusterInfo();
clusterInfo.setUrl(cluster.getUrl());
clusterInfo.setToken(cluster.getToken());
+ clusterInfo.setMqType(cluster.getType());
Map<String, String> configParams = GSON.fromJson(cluster.getExtParams(), Map.class);
clusterInfo.setParams(configParams);
mqSet.add(clusterInfo);