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 02:11:50 UTC
[inlong] branch master updated: [INLONG-5401][Manager] Fix StreamSinkFieldEntity and SinkField fields not match (#5407)
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 c955c6917 [INLONG-5401][Manager] Fix StreamSinkFieldEntity and SinkField fields not match (#5407)
c955c6917 is described below
commit c955c69173598e8f129142bb0a4cb163708e8cb8
Author: jiancheng Lv <63...@qq.com>
AuthorDate: Wed Aug 10 10:11:46 2022 +0800
[INLONG-5401][Manager] Fix StreamSinkFieldEntity and SinkField fields not match (#5407)
Co-authored-by: jianchenglv <6>
---
.../inlong/manager/dao/entity/StreamSinkFieldEntity.java | 2 ++
.../main/resources/mappers/StreamSinkFieldEntityMapper.xml | 11 +++++++++--
.../src/main/resources/h2/apache_inlong_manager.sql | 2 ++
inlong-manager/manager-web/sql/apache_inlong_manager.sql | 2 ++
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StreamSinkFieldEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StreamSinkFieldEntity.java
index 31e9a9275..975d34c20 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StreamSinkFieldEntity.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StreamSinkFieldEntity.java
@@ -45,6 +45,8 @@ public class StreamSinkFieldEntity implements Serializable {
private Integer isMetaField;
private String metaFieldName;
private String fieldFormat;
+ private String originNodeName;
+ private String originFieldName;
private Short rankNum;
private Integer isDeleted;
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkFieldEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkFieldEntityMapper.xml
index 5587a8214..ece761b77 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkFieldEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkFieldEntityMapper.xml
@@ -35,12 +35,15 @@
<result column="is_meta_field" jdbcType="SMALLINT" property="isMetaField"/>
<result column="meta_field_name" jdbcType="VARCHAR" property="metaFieldName"/>
<result column="field_format" jdbcType="VARCHAR" property="fieldFormat"/>
+ <result column="origin_node_name" jdbcType="VARCHAR" property="originNodeName"/>
+ <result column="origin_field_name" jdbcType="VARCHAR" property="originFieldName"/>
<result column="rank_num" jdbcType="SMALLINT" property="rankNum"/>
<result column="is_deleted" jdbcType="INTEGER" property="isDeleted"/>
</resultMap>
<sql id="Base_Column_List">
id, sink_id, field_name, field_type, field_comment, source_field_name, source_field_type,
- ext_params, is_meta_field, meta_field_name, field_format, rank_num, is_deleted
+ ext_params, is_meta_field, meta_field_name, field_format, origin_node_name, origin_field_name,
+ rank_num, is_deleted
</sql>
<insert id="insert" useGeneratedKeys="true" keyProperty="id"
@@ -52,7 +55,8 @@
source_field_name, source_field_type,
ext_params, is_meta_field,
meta_field_name, field_format,
- rank_num, is_deleted)
+ origin_node_name, origin_field_name,
+ rank_num, is_deleted )
values (#{id,jdbcType=INTEGER}, #{inlongGroupId,jdbcType=VARCHAR},
#{inlongStreamId,jdbcType=VARCHAR}, #{sinkId,jdbcType=INTEGER},
#{sinkType,jdbcType=VARCHAR}, #{fieldName,jdbcType=VARCHAR},
@@ -60,6 +64,7 @@
#{sourceFieldName,jdbcType=VARCHAR}, #{sourceFieldType,jdbcType=VARCHAR},
#{extParams,jdbcType=LONGVARCHAR}, #{isMetaField,jdbcType=SMALLINT},
#{metaFieldName,jdbcType=VARCHAR}, #{fieldFormat,jdbcType=VARCHAR},
+ #{originNodeName,jdbcType=VARCHAR}, #{originFieldName,jdbcType=VARCHAR},
#{rankNum,jdbcType=SMALLINT}, #{isDeleted,jdbcType=INTEGER})
</insert>
<insert id="insertAll">
@@ -71,6 +76,7 @@
source_field_name, source_field_type,
ext_params, is_meta_field,
meta_field_name, field_format,
+ origin_node_name, origin_field_name,
rank_num, is_deleted
)
values
@@ -83,6 +89,7 @@
#{item.sourceFieldName,jdbcType=VARCHAR}, #{item.sourceFieldType,jdbcType=VARCHAR},
#{item.extParams,jdbcType=LONGVARCHAR}, #{item.isMetaField,jdbcType=SMALLINT},
#{item.metaFieldName,jdbcType=VARCHAR}, #{item.fieldFormat,jdbcType=VARCHAR},
+ #{item.originNodeName,jdbcType=VARCHAR}, #{item.originFieldName,jdbcType=VARCHAR},
#{item.rankNum,jdbcType=SMALLINT}, #{item.isDeleted,jdbcType=INTEGER}
)
</foreach>
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 6b3f4f882..e2111830b 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
@@ -526,6 +526,8 @@ CREATE TABLE IF NOT EXISTS `stream_sink_field`
`is_meta_field` smallint(3) DEFAULT '0' COMMENT 'Is this field a meta field? 0: no, 1: yes',
`meta_field_name` varchar(20) DEFAULT NULL COMMENT 'Meta field name',
`field_format` varchar(50) DEFAULT NULL COMMENT 'Field format, including: MICROSECONDS, MILLISECONDS, SECONDS, SQL, ISO_8601 and custom such as yyyy-MM-dd HH:mm:ss',
+ `origin_node_name` varchar(256) DEFAULT '' COMMENT 'Origin node name which stream field belongs',
+ `origin_field_name` varchar(50) DEFAULT '' COMMENT 'Origin field name before transform operation',
`rank_num` smallint(6) DEFAULT '0' COMMENT 'Field order (front-end display field order)',
`is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, > 0: deleted',
PRIMARY KEY (`id`)
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index 6b0d630bd..7c33576af 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -552,6 +552,8 @@ CREATE TABLE IF NOT EXISTS `stream_sink_field`
`is_meta_field` smallint(3) DEFAULT '0' COMMENT 'Is this field a meta field? 0: no, 1: yes',
`meta_field_name` varchar(20) DEFAULT NULL COMMENT 'Meta field name',
`field_format` varchar(50) DEFAULT NULL COMMENT 'Field format, including: MICROSECONDS, MILLISECONDS, SECONDS, SQL, ISO_8601 and custom such as yyyy-MM-dd HH:mm:ss',
+ `origin_node_name` varchar(256) DEFAULT '' COMMENT 'Origin node name which stream field belongs',
+ `origin_field_name` varchar(50) DEFAULT '' COMMENT 'Origin field name before transform operation',
`rank_num` smallint(6) DEFAULT '0' COMMENT 'Field order (front-end display field order)',
`is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, > 0: deleted',
PRIMARY KEY (`id`)