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 06:31:18 UTC
[incubator-inlong] branch master updated: [INLONG-695] update
getConfig API in inlong-manager (#530)
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 04d9280 [INLONG-695] update getConfig API in inlong-manager (#530)
04d9280 is described below
commit 04d928055409f29210574de798dc042f74942605
Author: healchow <he...@gmail.com>
AuthorDate: Fri Jul 9 14:31:11 2021 +0800
[INLONG-695] update getConfig API in inlong-manager (#530)
Co-authored-by: healzhou <he...@tencent.com>
---
.../dao/mapper/SourceFileDetailEntityMapper.java | 4 +-
.../mappers/SourceFileDetailEntityMapper.xml | 100 ++++++++++-----------
.../openapi/controller/DataProxyController.java | 6 +-
.../service/core/DataProxyClusterService.java | 3 +-
.../core/impl/DataProxyClusterServiceImpl.java | 2 +-
5 files changed, 56 insertions(+), 59 deletions(-)
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
index 6aaf4df..9772da6 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
@@ -55,6 +55,8 @@ public interface SourceFileDetailEntityMapper {
List<FileAgentTaskConfig> selectFileAgentTaskByIp(@Param("ip") String agentIp);
+ List<FileAgentTaskConfig> selectFileAgentTaskByIpForCheck(@Param("ip") String agentIp);
+
/**
* According to business identifier and data source identifier, query file source details
*
@@ -64,8 +66,6 @@ public interface SourceFileDetailEntityMapper {
*/
List<SourceFileDetailEntity> selectByIdentifier(@Param("bid") String bid, @Param("dsid") String dsid);
- List<FileAgentTaskConfig> selectFileAgentTaskByIpForCheck(@Param("ip") String agentIp);
-
/**
* According to business identifier and data stream identifier, physically delete file data source details
*
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
index 573e739..d4f99c3 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
@@ -373,65 +373,63 @@
</update>
<select id="selectFileAgentTaskByIp" resultMap="FileAgentTask">
- select d.business_identifier,
- d.data_stream_identifier,
- d.ip,
- d.file_path,
- d.status,
- d.status mod 100 as op,
- d.modify_time,
- d.id,
- concat(b.date_offset, b.date_offset_unit) as timeOffset,
- bis.middleware_type,
- bis.mq_resource_obj,
+ select detail.business_identifier,
+ detail.data_stream_identifier,
+ detail.ip,
+ detail.file_path,
+ detail.status,
+ detail.status mod 100 as op,
+ detail.modify_time,
+ detail.id,
+ concat(basic.date_offset, basic.date_offset_unit) as timeOffset,
+ biz.middleware_type,
+ biz.mq_resource_obj,
ds.data_generate_rule,
ds.sort_type,
- st.file_delimiter
-
- from source_file_basic b,
- source_file_detail d,
- business bis,
+ stream.file_delimiter
+ from source_file_basic basic,
+ source_file_detail detail,
+ business biz,
data_schema ds,
- data_stream st
- where bis.business_identifier = b.business_identifier
- and bis.schema_name = ds.name
- and b.business_identifier = d.business_identifier
- and b.data_stream_identifier = d.data_stream_identifier
- and st.data_stream_identifier = b.data_stream_identifier
- and st.business_identifier = b.business_identifier
- and d.is_deleted = 0
- and (floor(d.STATUS / 100) = 2 OR floor(d.STATUS / 100) = 3)
- and d.ip = #{ip,jdbcType=VARCHAR}
+ data_stream stream
+ where detail.ip = #{ip,jdbcType=VARCHAR}
+ and detail.is_deleted = 0
+ and (floor(detail.STATUS / 100) = 2 OR floor(detail.STATUS / 100) = 3)
+ and basic.business_identifier = detail.business_identifier
+ and basic.data_stream_identifier = detail.data_stream_identifier
+ and biz.business_identifier = detail.business_identifier
+ and biz.schema_name = ds.name
+ and stream.data_stream_identifier = detail.data_stream_identifier
+ and stream.business_identifier = detail.business_identifier
</select>
<select id="selectFileAgentTaskByIpForCheck" resultMap="FileAgentTask">
- select d.business_identifier,
- d.data_stream_identifier,
- d.ip,
- d.file_path,
- d.status,
- d.status mod 100 as op,
- d.modify_time,
- d.id,
- concat(b.date_offset, b.date_offset_unit) as timeOffset,
- bis.middleware_type,
- bis.mq_resource_obj,
+ select detail.business_identifier,
+ detail.data_stream_identifier,
+ detail.ip,
+ detail.file_path,
+ detail.status,
+ detail.status mod 100 as op,
+ detail.modify_time,
+ detail.id,
+ concat(basic.date_offset, basic.date_offset_unit) as timeOffset,
+ biz.middleware_type,
+ biz.mq_resource_obj,
ds.data_generate_rule,
ds.sort_type,
- st.file_delimiter
-
- from source_file_basic b,
- source_file_detail d,
- business bis,
+ stream.file_delimiter
+ from source_file_basic basic,
+ source_file_detail detail,
+ business biz,
data_schema ds,
- data_stream st
- where bis.business_identifier = b.business_identifier
- and bis.schema_name = ds.name
- and b.business_identifier = d.business_identifier
- and b.data_stream_identifier = d.data_stream_identifier
- and st.data_stream_identifier = b.data_stream_identifier
- and st.business_identifier = b.business_identifier
- and d.is_deleted = 0
- and d.ip = #{ip,jdbcType=VARCHAR}
+ data_stream stream
+ where detail.ip = #{ip,jdbcType=VARCHAR}
+ and detail.is_deleted = 0
+ and basic.business_identifier = detail.business_identifier
+ and basic.data_stream_identifier = detail.data_stream_identifier
+ and biz.business_identifier = basic.business_identifier
+ and biz.schema_name = ds.name
+ and stream.data_stream_identifier = basic.data_stream_identifier
+ and stream.business_identifier = basic.business_identifier
</select>
<select id="selectByIp" parameterType="java.lang.String" resultMap="BaseResultMap">
diff --git a/inlong-manager/manager-openapi/src/main/java/org/apache/inlong/manager/openapi/controller/DataProxyController.java b/inlong-manager/manager-openapi/src/main/java/org/apache/inlong/manager/openapi/controller/DataProxyController.java
index 0c5202f..8fcd3ac 100644
--- a/inlong-manager/manager-openapi/src/main/java/org/apache/inlong/manager/openapi/controller/DataProxyController.java
+++ b/inlong-manager/manager-openapi/src/main/java/org/apache/inlong/manager/openapi/controller/DataProxyController.java
@@ -44,8 +44,8 @@ public class DataProxyController {
return dataProxyClusterService.getIpList(request, httpRequest);
}
- @GetMapping("getConfig/{clusterId}")
- public Response<List<DataProxyConfig>> getConfig(@PathVariable(value = "clusterId") String clusterId) {
- return Response.success(dataProxyClusterService.getConfig(clusterId));
+ @GetMapping("getConfig")
+ public Response<List<DataProxyConfig>> getConfig() {
+ return Response.success(dataProxyClusterService.getConfig());
}
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataProxyClusterService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataProxyClusterService.java
index d32c334..f566bb9 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataProxyClusterService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataProxyClusterService.java
@@ -87,9 +87,8 @@ public interface DataProxyClusterService {
/**
* query data proxy config by cluster id
*
- * @param clusterId cluster id
* @return data proxy config
*/
- List<DataProxyConfig> getConfig(String clusterId);
+ List<DataProxyConfig> getConfig();
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataProxyClusterServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataProxyClusterServiceImpl.java
index b044aac..b2871a9 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataProxyClusterServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataProxyClusterServiceImpl.java
@@ -194,7 +194,7 @@ public class DataProxyClusterServiceImpl implements DataProxyClusterService {
}
@Override
- public List<DataProxyConfig> getConfig(String clusterId) {
+ public List<DataProxyConfig> getConfig() {
return businessEntityMapper.queryDataProxyConfig();
}
}