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 d09b7a4f6 [INLONG-5188][Manager] Fix the error of creating group
workflow and remove redundant settings (#5196)
d09b7a4f6 is described below
commit d09b7a4f693192701c55998f6eced9952e404026
Author: fuweng11 <[email protected]>
AuthorDate: Mon Jul 25 17:10:38 2022 +0800
[INLONG-5188][Manager] Fix the error of creating group workflow and remove
redundant settings (#5196)
---
.../resources/mappers/ConsumptionEntityMapper.xml | 44 ++------------------
.../resources/mappers/DataNodeEntityMapper.xml | 22 +++-------
.../mappers/InlongClusterEntityMapper.xml | 22 +++-------
.../mappers/InlongClusterNodeEntityMapper.xml | 19 ++-------
.../mappers/InlongClusterTagEntityMapper.xml | 22 +++-------
.../resources/mappers/InlongGroupEntityMapper.xml | 16 +++-----
.../resources/mappers/InlongStreamEntityMapper.xml | 43 ++-----------------
.../resources/mappers/StreamSinkEntityMapper.xml | 43 ++-----------------
.../resources/mappers/StreamSourceEntityMapper.xml | 25 +++--------
.../mappers/StreamTransformEntityMapper.xml | 48 +++-------------------
.../main/resources/mappers/UserEntityMapper.xml | 36 ++--------------
.../mappers/WorkflowApproverEntityMapper.xml | 46 ++-------------------
.../dao/mapper/InlongGroupEntityMapperTest.java | 3 +-
.../service/cluster/AbstractClusterOperator.java | 8 ----
.../service/cluster/InlongClusterServiceImpl.java | 24 ++---------
.../service/core/impl/ConsumptionServiceImpl.java | 11 ++---
.../service/core/impl/DataNodeServiceImpl.java | 6 ---
.../service/core/impl/InlongStreamServiceImpl.java | 8 +---
.../manager/service/core/impl/UserServiceImpl.java | 10 ++---
.../core/impl/WorkflowApproverServiceImpl.java | 6 ---
.../service/group/AbstractGroupOperator.java | 8 ----
.../manager/service/sink/AbstractSinkOperator.java | 7 ----
.../service/source/AbstractSourceOperator.java | 29 +++++++------
.../transform/StreamTransformServiceImpl.java | 10 -----
24 files changed, 79 insertions(+), 437 deletions(-)
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
index e71cae2a7..a27acde49 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
@@ -69,15 +69,11 @@
insert into consumption (id, consumer_group, in_charges,
inlong_group_id, mq_type, topic,
filter_enabled, inlong_stream_id,
- status, is_deleted,
- creator, modifier,
- create_time, modify_time, version)
+ status, creator, modifier)
values (#{id, jdbcType=INTEGER}, #{consumerGroup, jdbcType=VARCHAR},
#{inCharges, jdbcType=VARCHAR},
#{inlongGroupId, jdbcType=VARCHAR}, #{mqType,
jdbcType=VARCHAR}, #{topic, jdbcType=VARCHAR},
#{filterEnabled, jdbcType=INTEGER}, #{inlongStreamId,
jdbcType=VARCHAR},
- #{status, jdbcType=INTEGER}, #{isDeleted, jdbcType=INTEGER},
- #{creator, jdbcType=VARCHAR}, #{modifier, jdbcType=VARCHAR},
- #{createTime, jdbcType=TIMESTAMP}, #{modifyTime,
jdbcType=TIMESTAMP}, #{version, jdbcType=INTEGER})
+ #{status, jdbcType=INTEGER}, #{creator, jdbcType=VARCHAR},
#{modifier, jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
parameterType="org.apache.inlong.manager.dao.entity.ConsumptionEntity">
@@ -116,18 +112,6 @@
<if test="modifier != null">
modifier,
</if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="modifyTime != null">
- modify_time,
- </if>
- <if test="isDeleted != null">
- is_deleted,
- </if>
- <if test="version != null">
- version,
- </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -163,18 +147,6 @@
<if test="modifier != null">
#{modifier, jdbcType=VARCHAR},
</if>
- <if test="createTime != null">
- #{createTime, jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- #{modifyTime, jdbcType=TIMESTAMP},
- </if>
- <if test="isDeleted != null">
- #{isDeleted, jdbcType=INTEGER},
- </if>
- <if test="version != null">
- #{version, jdbcType=INTEGER},
- </if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective"
@@ -211,15 +183,7 @@
<if test="modifier != null">
modifier = #{modifier, 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="version != null">
- version = #{version, jdbcType=INTEGER} + 1,
- </if>
+ version = #{version, jdbcType=INTEGER} + 1
</set>
where id = #{id, jdbcType=INTEGER}
and is_deleted = 0
@@ -237,8 +201,6 @@
status = #{status, jdbcType=INTEGER},
creator = #{creator, jdbcType=VARCHAR},
modifier = #{modifier, jdbcType=VARCHAR},
- create_time = #{createTime, jdbcType=TIMESTAMP},
- modify_time = #{modifyTime, jdbcType=TIMESTAMP},
is_deleted = #{isDeleted, jdbcType=INTEGER},
version = #{version, jdbcType=INTEGER} + 1
where id = #{id, jdbcType=INTEGER}
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 e184ab7ae..461ada591 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml
@@ -46,14 +46,12 @@
parameterType="org.apache.inlong.manager.dao.entity.DataNodeEntity">
insert into data_node (id, name, type,
url, username, token,
- in_charges, status, is_deleted,
- creator, modifier, create_time,
- modify_time, ext_params, version)
+ in_charges, status, creator,
+ modifier, ext_params)
values (#{id, jdbcType=INTEGER}, #{name, jdbcType=VARCHAR}, #{type,
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}, #{version, jdbcType=INTEGER})
+ #{inCharges, jdbcType=VARCHAR}, #{status, jdbcType=INTEGER},
#{creator, jdbcType=VARCHAR},
+ #{modifier, jdbcType=VARCHAR}, #{extParams,
jdbcType=LONGVARCHAR})
</insert>
<select id="selectById" parameterType="java.lang.Integer"
resultMap="BaseResultMap">
@@ -109,8 +107,6 @@
is_deleted = #{isDeleted, jdbcType=INTEGER},
creator = #{creator, jdbcType=VARCHAR},
modifier = #{modifier, jdbcType=VARCHAR},
- create_time = #{createTime, jdbcType=TIMESTAMP},
- modify_time = #{modifyTime, jdbcType=TIMESTAMP},
version = #{version, jdbcType=INTEGER} + 1
where id = #{id, jdbcType=INTEGER}
and version = #{version, jdbcType=INTEGER}
@@ -148,18 +144,10 @@
<if test="modifier != null">
modifier = #{modifier, 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="extParams != null">
ext_params = #{extParams, jdbcType=LONGVARCHAR},
</if>
- <if test="version != null">
- version = #{version, jdbcType=INTEGER} + 1,
- </if>
+ version = #{version, jdbcType=INTEGER} + 1
</set>
where id = #{id, jdbcType=INTEGER}
and version = #{version, jdbcType=INTEGER}
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 8795656bf..e3c95f770 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterEntityMapper.xml
@@ -49,15 +49,13 @@
insert into inlong_cluster (id, name, type,
url, cluster_tags, ext_tag,
token, ext_params, heartbeat,
- in_charges, status, is_deleted,
- creator, modifier,
- create_time, modify_time, version)
+ in_charges, status, creator,
+ modifier)
values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR},
#{url,jdbcType=VARCHAR}, #{clusterTags,jdbcType=VARCHAR},
#{extTag,jdbcType=VARCHAR},
#{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}, #{version,jdbcType=INTEGER})
+ #{inCharges,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{creator,jdbcType=VARCHAR},
+ #{modifier,jdbcType=VARCHAR})
</insert>
<select id="selectById" parameterType="java.lang.Integer"
resultMap="BaseResultMap">
@@ -138,8 +136,6 @@
is_deleted = #{isDeleted,jdbcType=INTEGER},
creator = #{creator,jdbcType=VARCHAR},
modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
version = #{version,jdbcType=INTEGER} + 1
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
@@ -186,15 +182,7 @@
<if test="modifier != null">
modifier = #{modifier,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="version != null">
- version = #{version,jdbcType=INTEGER} + 1,
- </if>
+ version = #{version,jdbcType=INTEGER} + 1
</set>
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterNodeEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterNodeEntityMapper.xml
index f09499e1a..aaf555443 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterNodeEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterNodeEntityMapper.xml
@@ -44,13 +44,10 @@
parameterType="org.apache.inlong.manager.dao.entity.InlongClusterNodeEntity">
insert into inlong_cluster_node (id, parent_id, type,
ip, port, ext_params,
- status, is_deleted, creator,
- modifier, create_time, modify_time,
version)
+ status, creator, modifier)
values (#{id,jdbcType=INTEGER}, #{parentId,jdbcType=INTEGER},
#{type,jdbcType=VARCHAR},
#{ip,jdbcType=VARCHAR}, #{port,jdbcType=INTEGER},
#{extParams,jdbcType=LONGVARCHAR},
- #{status,jdbcType=INTEGER}, #{isDeleted,jdbcType=INTEGER},
#{creator,jdbcType=VARCHAR},
- #{modifier,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP},
- #{version,jdbcType=INTEGER})
+ #{status,jdbcType=INTEGER}, #{creator,jdbcType=VARCHAR},
#{modifier,jdbcType=VARCHAR})
</insert>
<select id="selectById" parameterType="java.lang.Integer"
resultMap="BaseResultMap">
@@ -129,18 +126,10 @@
<if test="modifier != null">
modifier = #{modifier,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="extParams != null">
ext_params = #{extParams,jdbcType=LONGVARCHAR},
</if>
- <if test="version != null">
- version = #{version,jdbcType=INTEGER} + 1,
- </if>
+ version = #{version,jdbcType=INTEGER} + 1
</set>
where id = #{id,jdbcType=INTEGER}
</update>
@@ -155,8 +144,6 @@
is_deleted = #{isDeleted,jdbcType=INTEGER},
creator = #{creator,jdbcType=VARCHAR},
modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
version = #{version,jdbcType=INTEGER} + 1
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterTagEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterTagEntityMapper.xml
index d49d821b9..b5d97f94a 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterTagEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongClusterTagEntityMapper.xml
@@ -40,13 +40,11 @@
<insert id="insert" useGeneratedKeys="true" keyProperty="id"
parameterType="org.apache.inlong.manager.dao.entity.InlongClusterTagEntity">
insert into inlong_cluster_tag (id, cluster_tag, ext_params,
- in_charges, status, is_deleted,
- creator, modifier,
- create_time, modify_time, version)
+ in_charges, status, creator,
+ modifier)
values (#{id,jdbcType=INTEGER}, #{clusterTag,jdbcType=VARCHAR},
#{extParams,jdbcType=LONGVARCHAR},
- #{inCharges,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{isDeleted,jdbcType=INTEGER},
- #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR},
- #{createTime,jdbcType=TIMESTAMP},
#{modifyTime,jdbcType=TIMESTAMP}, #{version,jdbcType=INTEGER})
+ #{inCharges,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{creator,jdbcType=VARCHAR},
+ #{modifier,jdbcType=VARCHAR})
</insert>
<select id="selectById" parameterType="java.lang.Integer"
resultMap="BaseResultMap">
@@ -86,8 +84,6 @@
is_deleted = #{isDeleted,jdbcType=INTEGER},
creator = #{creator,jdbcType=VARCHAR},
modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
version = #{version,jdbcType=INTEGER} + 1
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
@@ -117,15 +113,7 @@
<if test="modifier != null">
modifier = #{modifier,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="version != null">
- version = #{version,jdbcType=INTEGER} + 1,
- </if>
+ version = #{version,jdbcType=INTEGER} + 1
</set>
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
index fb6e1f08d..26780ea7c 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -72,9 +72,8 @@
lightweight, inlong_cluster_tag,
ext_params, in_charges,
followers, status,
- previous_status, is_deleted,
- creator, modifier,
- create_time, modify_time, version)
+ previous_status, creator,
+ modifier)
values (#{id,jdbcType=INTEGER}, #{inlongGroupId,jdbcType=VARCHAR},
#{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
#{mqType,jdbcType=VARCHAR}, #{mqResource,jdbcType=VARCHAR},
@@ -84,9 +83,8 @@
#{lightweight,jdbcType=INTEGER},
#{inlongClusterTag,jdbcType=VARCHAR},
#{extParams,jdbcType=LONGVARCHAR},
#{inCharges,jdbcType=VARCHAR},
#{followers,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
- #{previousStatus,jdbcType=INTEGER},
#{isDeleted,jdbcType=INTEGER},
- #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR},
- #{createTime,jdbcType=TIMESTAMP},
#{modifyTime,jdbcType=TIMESTAMP}, #{version,jdbcType=INTEGER})
+ #{previousStatus,jdbcType=INTEGER},
#{creator,jdbcType=VARCHAR},
+ #{modifier,jdbcType=VARCHAR})
</insert>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer"
resultMap="BaseResultMap">
@@ -220,8 +218,6 @@
is_deleted = #{isDeleted,jdbcType=INTEGER},
creator = #{creator,jdbcType=VARCHAR},
modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
version = #{version,jdbcType=INTEGER} + 1
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
@@ -289,9 +285,7 @@
<if test="modifier != null">
modifier = #{modifier,jdbcType=VARCHAR},
</if>
- <if test="version != null">
- version = #{version,jdbcType=INTEGER} + 1,
- </if>
+ version = #{version,jdbcType=INTEGER} + 1
</set>
where inlong_group_id = #{inlongGroupId, jdbcType=VARCHAR}
and is_deleted = 0
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
index 5a3a68e8b..0520b2c3a 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
@@ -65,17 +65,14 @@
data_escape_char, sync_send, daily_records,
daily_storage, peak_records, max_length,
storage_period, ext_params, status,
- previous_status, is_deleted, creator,
- modifier, create_time, modify_time, version)
+ previous_status, creator, modifier)
values (#{id,jdbcType=INTEGER}, #{inlongGroupId,jdbcType=VARCHAR},
#{inlongStreamId,jdbcType=VARCHAR},
#{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
#{mqResource,jdbcType=VARCHAR},
#{dataType,jdbcType=VARCHAR},
#{dataEncoding,jdbcType=VARCHAR}, #{dataSeparator,jdbcType=VARCHAR},
#{dataEscapeChar,jdbcType=VARCHAR},
#{syncSend,jdbcType=INTEGER}, #{dailyRecords,jdbcType=INTEGER},
#{dailyStorage,jdbcType=INTEGER},
#{peakRecords,jdbcType=INTEGER}, #{maxLength,jdbcType=INTEGER},
#{storagePeriod,jdbcType=INTEGER},
#{extParams,jdbcType=LONGVARCHAR}, #{status,jdbcType=INTEGER},
- #{previousStatus,jdbcType=INTEGER},
#{isDeleted,jdbcType=INTEGER}, #{creator,jdbcType=VARCHAR},
- #{modifier,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP},
- #{version,jdbcType=INTEGER})
+ #{previousStatus,jdbcType=INTEGER},
#{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
parameterType="org.apache.inlong.manager.dao.entity.InlongStreamEntity">
@@ -138,24 +135,12 @@
<if test="previousStatus != null">
previous_status,
</if>
- <if test="isDeleted != null">
- is_deleted,
- </if>
<if test="creator != null">
creator,
</if>
<if test="modifier != null">
modifier,
</if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="modifyTime != null">
- modify_time,
- </if>
- <if test="version != null">
- version,
- </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -215,24 +200,12 @@
<if test="previousStatus != null">
#{previousStatus,jdbcType=INTEGER},
</if>
- <if test="isDeleted != null">
- #{isDeleted,jdbcType=INTEGER},
- </if>
<if test="creator != null">
#{creator,jdbcType=VARCHAR},
</if>
<if test="modifier != null">
#{modifier,jdbcType=VARCHAR},
</if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- #{modifyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="version != null">
- #{version,jdbcType=INTEGER},
- </if>
</trim>
</insert>
@@ -337,8 +310,6 @@
is_deleted = #{isDeleted, jdbcType=INTEGER},
creator = #{creator, jdbcType=VARCHAR},
modifier = #{modifier, jdbcType=VARCHAR},
- create_time = #{createTime, jdbcType=TIMESTAMP},
- modify_time = #{modifyTime, jdbcType=TIMESTAMP},
version = #{version, jdbcType=INTEGER} + 1
where id = #{id, jdbcType=INTEGER}
and version = #{version, jdbcType=INTEGER}
@@ -409,15 +380,7 @@
<if test="modifier != null">
modifier = #{modifier, 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="version != null">
- version = #{version, jdbcType=INTEGER} + 1,
- </if>
+ version = #{version, jdbcType=INTEGER} + 1
</set>
where inlong_group_id = #{inlongGroupId, jdbcType=VARCHAR}
and inlong_stream_id = #{inlongStreamId, jdbcType=VARCHAR}
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
index bcdfb75cf..3fda29bec 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
@@ -223,16 +223,14 @@
data_node_name, sort_task_name,
sort_consumer_group, ext_params,
operate_log, status, previous_status,
- is_deleted, creator, modifier,
- create_time, modify_time, version)
+ creator, modifier)
values (#{id, jdbcType=INTEGER}, #{inlongGroupId, jdbcType=VARCHAR},
#{inlongStreamId, jdbcType=VARCHAR},
#{sinkType, jdbcType=VARCHAR}, #{sinkName, jdbcType=VARCHAR},
#{description, jdbcType=VARCHAR},
#{enableCreateResource, jdbcType=TINYINT},
#{inlongClusterName, jdbcType=VARCHAR},
#{dataNodeName, jdbcType=VARCHAR}, #{sortTaskName,
jdbcType=VARCHAR},
#{sortConsumerGroup, jdbcType=VARCHAR}, #{extParams,
jdbcType=VARCHAR},
#{operateLog, jdbcType=VARCHAR}, #{status, jdbcType=INTEGER},
#{previousStatus, jdbcType=INTEGER},
- #{isDeleted, jdbcType=INTEGER}, #{creator, jdbcType=VARCHAR},
#{modifier, jdbcType=VARCHAR},
- #{createTime, jdbcType=TIMESTAMP}, #{modifyTime,
jdbcType=TIMESTAMP}, #{version,jdbcType=INTEGER})
+ #{creator, jdbcType=VARCHAR}, #{modifier, jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
parameterType="org.apache.inlong.manager.dao.entity.StreamSinkEntity">
@@ -283,24 +281,12 @@
<if test="previousStatus != null">
previous_status,
</if>
- <if test="isDeleted != null">
- is_deleted,
- </if>
<if test="creator != null">
creator,
</if>
<if test="modifier != null">
modifier,
</if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="modifyTime != null">
- modify_time,
- </if>
- <if test="version != null">
- version,
- </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -348,24 +334,12 @@
<if test="previousStatus != null">
#{previousStatus, jdbcType=INTEGER},
</if>
- <if test="isDeleted != null">
- #{isDeleted, jdbcType=INTEGER},
- </if>
<if test="creator != null">
#{creator, jdbcType=VARCHAR},
</if>
<if test="modifier != null">
#{modifier, jdbcType=VARCHAR},
</if>
- <if test="createTime != null">
- #{createTime, jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- #{modifyTime, jdbcType=TIMESTAMP},
- </if>
- <if test="version != null">
- #{version, jdbcType=INTEGER},
- </if>
</trim>
</insert>
@@ -424,15 +398,7 @@
<if test="modifier != null">
modifier = #{modifier,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="version != null">
- version = #{version,jdbcType=INTEGER} + 1,
- </if>
+ version = #{version,jdbcType=INTEGER} + 1
</set>
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
@@ -456,8 +422,6 @@
is_deleted = #{isDeleted,jdbcType=INTEGER},
creator = #{creator,jdbcType=VARCHAR},
modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
version = #{version,jdbcType=INTEGER} + 1
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
@@ -467,7 +431,6 @@
set status = #{status,jdbcType=INTEGER},
previous_status = status,
operate_log = #{operateLog,jdbcType=VARCHAR},
- modify_time = now()
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectAllTasks"
resultType="org.apache.inlong.manager.common.pojo.sortstandalone.SortTaskInfo">
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
index 2055996a6..cab1e9ea7 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
@@ -55,17 +55,14 @@
source_type, source_name, agent_ip,
uuid, data_node_name, cluster_id,
serialization_type, snapshot,
- report_time, ext_params, version,
- status, previous_status, is_deleted,
- creator, modifier, create_time, modify_time)
+ report_time, ext_params, status,
+ previous_status, creator, modifier)
values (#{id,jdbcType=INTEGER}, #{inlongGroupId,jdbcType=VARCHAR},
#{inlongStreamId,jdbcType=VARCHAR},
#{sourceType,jdbcType=VARCHAR},
#{sourceName,jdbcType=VARCHAR}, #{agentIp,jdbcType=VARCHAR},
#{uuid,jdbcType=VARCHAR}, #{dataNodeName,jdbcType=VARCHAR},
#{clusterId,jdbcType=INTEGER},
#{serializationType,jdbcType=VARCHAR},
#{snapshot,jdbcType=LONGVARCHAR},
- #{modifyTime,jdbcType=TIMESTAMP},
#{extParams,jdbcType=LONGVARCHAR}, #{version,jdbcType=INTEGER},
- #{status,jdbcType=INTEGER},
#{previousStatus,jdbcType=INTEGER}, #{isDeleted,jdbcType=INTEGER},
- #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR},
- #{createTime,jdbcType=TIMESTAMP},
#{modifyTime,jdbcType=TIMESTAMP})
+ #{modifyTime,jdbcType=TIMESTAMP},
#{extParams,jdbcType=LONGVARCHAR}, #{status,jdbcType=INTEGER},
+ #{previousStatus,jdbcType=INTEGER},
#{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR})
</insert>
<select id="selectById"
resultType="org.apache.inlong.manager.dao.entity.StreamSourceEntity">
@@ -264,9 +261,6 @@
<if test="extParams != null">
ext_params = #{extParams,jdbcType=LONGVARCHAR},
</if>
- <if test="version != null">
- version = #{version,jdbcType=INTEGER} + 1,
- </if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
@@ -282,12 +276,7 @@
<if test="modifier != null">
modifier = #{modifier,jdbcType=VARCHAR},
</if>
- <if test="createTime != null">
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
- </if>
+ version = #{version,jdbcType=INTEGER} + 1
</set>
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
@@ -311,9 +300,7 @@
previous_status = #{previousStatus,jdbcType=INTEGER},
is_deleted = #{isDeleted,jdbcType=INTEGER},
creator = #{creator,jdbcType=VARCHAR},
- modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP}
+ modifier = #{modifier,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
</update>
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
index 29aca44a7..65c299556 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
@@ -44,14 +44,12 @@
parameterType="org.apache.inlong.manager.dao.entity.StreamTransformEntity">
insert into stream_transform (id, inlong_group_id, inlong_stream_id,
transform_name, transform_type,
pre_node_names,
- post_node_names, transform_definition,
version,
- is_deleted, creator, modifier,
- create_time, modify_time)
+ post_node_names, transform_definition,
+ creator, modifier)
values (#{id,jdbcType=INTEGER}, #{inlongGroupId,jdbcType=VARCHAR},
#{inlongStreamId,jdbcType=VARCHAR},
#{transformName,jdbcType=VARCHAR},
#{transformType,jdbcType=VARCHAR}, #{preNodeNames,jdbcType=VARCHAR},
- #{postNodeNames,jdbcType=VARCHAR},
#{transformDefinition,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER},
- #{isDeleted,jdbcType=INTEGER}, #{creator,jdbcType=VARCHAR},
#{modifier,jdbcType=VARCHAR},
- #{createTime,jdbcType=TIMESTAMP},
#{modifyTime,jdbcType=TIMESTAMP})
+ #{postNodeNames,jdbcType=VARCHAR},
#{transformDefinition,jdbcType=VARCHAR},
+ #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
parameterType="org.apache.inlong.manager.dao.entity.StreamTransformEntity">
@@ -81,24 +79,12 @@
<if test="transformDefinition != null">
transform_definition,
</if>
- <if test="version != null">
- version,
- </if>
- <if test="isDeleted != null">
- is_deleted,
- </if>
<if test="creator != null">
creator,
</if>
<if test="modifier != null">
modifier,
</if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="modifyTime != null">
- modify_time,
- </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -125,24 +111,12 @@
<if test="transformDefinition != null">
#{transformDefinition,jdbcType=VARCHAR},
</if>
- <if test="version != null">
- #{version,jdbcType=INTEGER},
- </if>
- <if test="isDeleted != null">
- #{isDeleted,jdbcType=INTEGER},
- </if>
<if test="creator != null">
#{creator,jdbcType=VARCHAR},
</if>
<if test="modifier != null">
#{modifier,jdbcType=VARCHAR},
</if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- #{modifyTime,jdbcType=TIMESTAMP},
- </if>
</trim>
</insert>
@@ -180,9 +154,7 @@
version = #{version,jdbcType=INTEGER} + 1,
is_deleted = #{isDeleted,jdbcType=INTEGER},
creator = #{creator,jdbcType=VARCHAR},
- modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP}
+ modifier = #{modifier,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
</update>
@@ -210,9 +182,6 @@
<if test="transformDefinition != null">
transform_definition = #{transformDefinition,jdbcType=VARCHAR},
</if>
- <if test="version != null">
- version = #{version,jdbcType=INTEGER} + 1,
- </if>
<if test="isDeleted != null">
is_deleted = #{isDeleted,jdbcType=INTEGER},
</if>
@@ -222,12 +191,7 @@
<if test="modifier != null">
modifier = #{modifier,jdbcType=VARCHAR},
</if>
- <if test="createTime != null">
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
- </if>
+ version = #{version,jdbcType=INTEGER} + 1
</set>
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/UserEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/UserEntityMapper.xml
index c00509525..8be6445d7 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/UserEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/UserEntityMapper.xml
@@ -100,13 +100,11 @@
insert into user (id, name, password,
secret_key, public_key, private_key,
encrypt_version, account_type, due_date,
- create_time, update_time,
- create_by, update_by, version)
+ create_by, update_by)
values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR},
#{password,jdbcType=VARCHAR},
#{secretKey,jdbcType=VARCHAR}, #{publicKey,jdbcType=VARCHAR},
#{privateKey,jdbcType=VARCHAR},
#{encryptVersion,jdbcType=INTEGER},
#{accountType,jdbcType=INTEGER}, #{dueDate,jdbcType=TIMESTAMP},
- #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR},
- #{updateBy,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER})
+ #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective"
parameterType="org.apache.inlong.manager.dao.entity.UserEntity">
insert into user
@@ -138,21 +136,12 @@
<if test="dueDate != null">
due_date,
</if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="updateTime != null">
- update_time,
- </if>
<if test="createBy != null">
create_by,
</if>
<if test="updateBy != null">
update_by,
</if>
- <if test="version != null">
- version,
- </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -182,21 +171,12 @@
<if test="dueDate != null">
#{dueDate,jdbcType=TIMESTAMP},
</if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="updateTime != null">
- #{updateTime,jdbcType=TIMESTAMP},
- </if>
<if test="createBy != null">
#{createBy,jdbcType=VARCHAR},
</if>
<if test="updateBy != null">
#{updateBy,jdbcType=VARCHAR},
</if>
- <if test="version != null">
- #{version,jdbcType=INTEGER},
- </if>
</trim>
</insert>
<select id="countByExample"
parameterType="org.apache.inlong.manager.dao.entity.UserEntityExample"
@@ -233,21 +213,13 @@
<if test="dueDate != null">
due_date = #{dueDate,jdbcType=TIMESTAMP},
</if>
- <if test="createTime != null">
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="updateTime != null">
- update_time = #{updateTime,jdbcType=TIMESTAMP},
- </if>
<if test="createBy != null">
create_by = #{createBy,jdbcType=VARCHAR},
</if>
<if test="updateBy != null">
update_by = #{updateBy,jdbcType=VARCHAR},
</if>
- <if test="version != null">
- version = #{version,jdbcType=INTEGER} + 1,
- </if>
+ version = #{version,jdbcType=INTEGER} + 1
</set>
where id = #{id,jdbcType=INTEGER}
and version = #{version,jdbcType=INTEGER}
@@ -262,8 +234,6 @@
encrypt_version = #{encryptVersion,jdbcType=INTEGER},
account_type = #{accountType,jdbcType=INTEGER},
due_date = #{dueDate,jdbcType=TIMESTAMP},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- update_time = #{updateTime,jdbcType=TIMESTAMP},
create_by = #{createBy,jdbcType=VARCHAR},
update_by = #{updateBy,jdbcType=VARCHAR},
version = #{version,jdbcType=INTEGER} + 1
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml
index b4297295d..642355b08 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml
@@ -48,21 +48,17 @@
<delete id="deleteByPrimaryKey">
update workflow_approver
set is_deleted = id,
- modify_time=now(),
modifier=#{modifier, jdbcType=VARCHAR}
where id = #{id, jdbcType=INTEGER}
</delete>
<insert id="insert"
parameterType="org.apache.inlong.manager.dao.entity.WorkflowApproverEntity">
insert into workflow_approver (id, process_name, task_name,
- filter_key, filter_value, filter_value_desc,
approvers,
- creator, modifier, create_time,
- modify_time, is_deleted, version)
+ filter_key, filter_value,
filter_value_desc,
+ approvers, creator, modifier)
values (#{id, jdbcType=INTEGER}, #{processName, jdbcType=VARCHAR},
#{taskName, jdbcType=VARCHAR},
#{filterKey, jdbcType=VARCHAR}, #{filterValue,
jdbcType=VARCHAR}, #{filterValueDesc, jdbcType=VARCHAR},
- #{approvers, jdbcType=VARCHAR},
- #{creator, jdbcType=VARCHAR}, #{modifier, jdbcType=VARCHAR},
#{createTime, jdbcType=TIMESTAMP},
- #{modifyTime, jdbcType=TIMESTAMP}, #{isDeleted,
jdbcType=INTEGER}, #{version, jdbcType=INTEGER})
+ #{approvers, jdbcType=VARCHAR}, #{creator, jdbcType=VARCHAR},
#{modifier, jdbcType=VARCHAR})
</insert>
<insert id="insertSelective"
parameterType="org.apache.inlong.manager.dao.entity.WorkflowApproverEntity">
@@ -95,18 +91,6 @@
<if test="modifier != null">
modifier,
</if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="modifyTime != null">
- modify_time,
- </if>
- <if test="isDeleted != null">
- is_deleted,
- </if>
- <if test="version != null">
- version,
- </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -136,18 +120,6 @@
<if test="modifier != null">
#{modifier, jdbcType=VARCHAR},
</if>
- <if test="createTime != null">
- #{createTime, jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- #{modifyTime, jdbcType=TIMESTAMP},
- </if>
- <if test="isDeleted != null">
- #{isDeleted, jdbcType=INTEGER},
- </if>
- <if test="version != null">
- #{version, jdbcType=INTEGER},
- </if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective"
@@ -178,18 +150,10 @@
<if test="modifier != null">
modifier = #{modifier, 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="isDeleted != null">
is_deleted = #{isDeleted, jdbcType=INTEGER},
</if>
- <if test="version != null">
- version = #{version, jdbcType=INTEGER} + 1,
- </if>
+ version = #{version, jdbcType=INTEGER} + 1
</set>
where id = #{id, jdbcType=INTEGER}
and is_deleted = 0
@@ -205,8 +169,6 @@
approvers = #{approvers, jdbcType=VARCHAR},
creator = #{creator, jdbcType=VARCHAR},
modifier = #{modifier, jdbcType=VARCHAR},
- create_time = #{createTime, jdbcType=TIMESTAMP},
- modify_time = #{modifyTime, jdbcType=TIMESTAMP},
is_deleted = #{isDeleted, jdbcType=INTEGER},
version = #{version, jdbcType=INTEGER} + 1
where id = #{id, jdbcType=INTEGER}
diff --git
a/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapperTest.java
b/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapperTest.java
index 9bde1ed49..fdf3dc2a3 100644
---
a/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapperTest.java
+++
b/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapperTest.java
@@ -46,7 +46,8 @@ public class InlongGroupEntityMapperTest extends DaoBaseTest {
public void selectByPrimaryKey() {
InlongGroupEntity entity = createGroupEntity();
groupEntityMapper.insert(entity);
- Assertions.assertEquals(entity,
groupEntityMapper.selectByPrimaryKey(entity.getId()));
+ InlongGroupEntity groupEntity =
groupEntityMapper.selectByPrimaryKey(entity.getId());
+ Assertions.assertEquals(entity.getInlongGroupId(),
groupEntity.getInlongGroupId());
}
private InlongGroupEntity createGroupEntity() {
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/AbstractClusterOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/AbstractClusterOperator.java
index efa5b80d7..58d5f293d 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/AbstractClusterOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/AbstractClusterOperator.java
@@ -30,8 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
-
/**
* Default operator of inlong cluster.
*/
@@ -51,11 +49,6 @@ public abstract class AbstractClusterOperator implements
InlongClusterOperator {
entity.setCreator(operator);
entity.setModifier(operator);
- Date now = new Date();
- entity.setCreateTime(now);
- entity.setModifyTime(now);
- entity.setIsDeleted(InlongConstants.UN_DELETED);
- entity.setVersion(InlongConstants.INITIAL_VERSION);
clusterMapper.insert(entity);
return entity.getId();
@@ -76,7 +69,6 @@ public abstract class AbstractClusterOperator implements
InlongClusterOperator {
// set the ext params
this.setTargetEntity(request, entity);
entity.setModifier(operator);
- entity.setModifyTime(new Date());
int rowCount = clusterMapper.updateByIdSelective(entity);
if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
LOGGER.error("cluster has already updated with name={}, type={},
curVersion={}", request.getName(),
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 638bf0431..b72c15f7b 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
@@ -77,7 +77,6 @@ import
org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -130,11 +129,6 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
InlongClusterTagEntity entity =
CommonBeanUtils.copyProperties(request, InlongClusterTagEntity::new);
entity.setCreator(operator);
entity.setModifier(operator);
- Date now = new Date();
- entity.setCreateTime(now);
- entity.setModifyTime(now);
- entity.setIsDeleted(InlongConstants.UN_DELETED);
- entity.setVersion(InlongConstants.INITIAL_VERSION);
clusterTagMapper.insert(entity);
LOGGER.info("success to save cluster tag={} by user={}", request,
operator);
return entity.getId();
@@ -212,7 +206,6 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
this.assertNoInlongGroupExists(oldClusterTag);
// update the associated cluster tag in inlong_cluster
- Date now = new Date();
List<InlongClusterEntity> clusterEntities =
clusterMapper.selectByKey(oldClusterTag, null, null);
if (CollectionUtils.isNotEmpty(clusterEntities)) {
clusterEntities.forEach(entity -> {
@@ -222,7 +215,6 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
String updateTags = Joiner.on(",").join(tagSet);
entity.setClusterTags(updateTags);
entity.setModifier(operator);
- entity.setModifyTime(now);
clusterMapper.updateByIdSelective(entity);
});
}
@@ -230,7 +222,6 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
CommonBeanUtils.copyProperties(request, exist, true);
exist.setModifier(operator);
- exist.setModifyTime(new Date());
int rowCount = clusterTagMapper.updateById(exist);
if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
LOGGER.error(errMsg);
@@ -258,11 +249,10 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
this.assertNoInlongGroupExists(clusterTag);
// update the associated cluster tag in inlong_cluster
- Date now = new Date();
List<InlongClusterEntity> clusterEntities =
clusterMapper.selectByKey(clusterTag, null, null);
if (CollectionUtils.isNotEmpty(clusterEntities)) {
clusterEntities.forEach(entity -> {
- this.removeClusterTag(entity, clusterTag, operator, now);
+ this.removeClusterTag(entity, clusterTag, operator);
});
}
@@ -401,7 +391,6 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
boolean isInCharge = Preconditions.inSeparatedString(operator,
exist.getInCharges(), InlongConstants.COMMA);
Preconditions.checkTrue(isInCharge ||
userEntity.getAccountType().equals(UserTypeEnum.ADMIN.getCode()),
"Current user does not have permission to bind or unbind
cluster tag");
- Date now = new Date();
if (CollectionUtils.isNotEmpty(request.getBindClusters())) {
request.getBindClusters().forEach(id -> {
InlongClusterEntity entity = clusterMapper.selectById(id);
@@ -412,7 +401,6 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
updateEntity.setId(id);
updateEntity.setClusterTags(updateTags);
updateEntity.setModifier(operator);
- entity.setModifyTime(now);
clusterMapper.updateByIdSelective(updateEntity);
});
}
@@ -420,7 +408,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
if (CollectionUtils.isNotEmpty(request.getUnbindClusters())) {
request.getUnbindClusters().forEach(id -> {
InlongClusterEntity entity = clusterMapper.selectById(id);
- this.removeClusterTag(entity, clusterTag, operator, now);
+ this.removeClusterTag(entity, clusterTag, operator);
});
}
LOGGER.info("success to bind or unbind cluster tag {} by {}", request,
operator);
@@ -476,11 +464,6 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
InlongClusterNodeEntity entity =
CommonBeanUtils.copyProperties(request, InlongClusterNodeEntity::new);
entity.setCreator(operator);
entity.setModifier(operator);
- Date now = new Date();
- entity.setCreateTime(now);
- entity.setModifyTime(now);
- entity.setIsDeleted(InlongConstants.UN_DELETED);
- entity.setVersion(InlongConstants.INITIAL_VERSION);
clusterNodeMapper.insert(entity);
LOGGER.info("success to add inlong cluster node={}", request);
@@ -795,13 +778,12 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
/**
* Remove cluster tag from the given cluster entity.
*/
- private void removeClusterTag(InlongClusterEntity entity, String
clusterTag, String operator, Date modifyTime) {
+ private void removeClusterTag(InlongClusterEntity entity, String
clusterTag, String operator) {
Set<String> tagSet =
Sets.newHashSet(entity.getClusterTags().split(InlongConstants.COMMA));
tagSet.remove(clusterTag);
String updateTags = Joiner.on(",").join(tagSet);
entity.setClusterTags(updateTags);
entity.setModifier(operator);
- entity.setModifyTime(modifyTime);
clusterMapper.updateByIdSelective(entity);
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
index d365147e5..c2489d112 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
@@ -356,9 +356,9 @@ public class ConsumptionServiceImpl implements
ConsumptionService {
entity.setFilterEnabled(0);
entity.setStatus(ConsumptionStatus.APPROVED.getStatus());
- entity.setIsDeleted(InlongConstants.UN_DELETED);
- entity.setCreator(groupInfo.getCreator());
- entity.setCreateTime(new Date());
+ String operator = groupInfo.getCreator();
+ entity.setCreator(operator);
+ entity.setModifier(operator);
consumptionMapper.insert(entity);
@@ -377,13 +377,8 @@ public class ConsumptionServiceImpl implements
ConsumptionService {
private ConsumptionEntity saveConsumption(ConsumptionInfo info, String
operator) {
ConsumptionEntity entity = CommonBeanUtils.copyProperties(info,
ConsumptionEntity::new);
entity.setStatus(ConsumptionStatus.WAIT_ASSIGN.getStatus());
- entity.setIsDeleted(0);
entity.setCreator(operator);
entity.setModifier(operator);
- Date now = new Date();
- entity.setCreateTime(now);
- entity.setModifyTime(now);
- entity.setVersion(InlongConstants.INITIAL_VERSION);
if (info.getId() != null) {
consumptionMapper.updateByPrimaryKey(entity);
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 0de2c72a1..82a0c333e 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
@@ -39,7 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Connection;
-import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -69,11 +68,6 @@ public class DataNodeServiceImpl implements DataNodeService {
DataNodeEntity entity = CommonBeanUtils.copyProperties(request,
DataNodeEntity::new);
entity.setCreator(operator);
entity.setModifier(operator);
- Date now = new Date();
- entity.setCreateTime(now);
- entity.setModifyTime(now);
- entity.setIsDeleted(InlongConstants.UN_DELETED);
- entity.setVersion(InlongConstants.INITIAL_VERSION);
dataNodeMapper.insert(entity);
LOGGER.debug("success to save data node={}", request);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongStreamServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongStreamServiceImpl.java
index d524bc5d3..69636258e 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongStreamServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongStreamServiceImpl.java
@@ -60,7 +60,6 @@ import
org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -114,8 +113,7 @@ public class InlongStreamServiceImpl implements
InlongStreamService {
InlongStreamEntity streamEntity =
CommonBeanUtils.copyProperties(request, InlongStreamEntity::new);
streamEntity.setStatus(StreamStatus.NEW.getCode());
streamEntity.setCreator(operator);
- streamEntity.setCreateTime(new Date());
- streamEntity.setVersion(InlongConstants.INITIAL_VERSION);
+ streamEntity.setModifier(operator);
streamMapper.insertSelective(streamEntity);
saveField(groupId, streamId, request.getFieldList());
@@ -477,12 +475,8 @@ public class InlongStreamServiceImpl implements
InlongStreamService {
streamEntity.setMaxLength(1000);
streamEntity.setStatus(StreamStatus.CONFIG_SUCCESSFUL.getCode());
- streamEntity.setIsDeleted(InlongConstants.UN_DELETED);
streamEntity.setCreator(operator);
streamEntity.setModifier(operator);
- Date now = new Date();
- streamEntity.setCreateTime(now);
- streamEntity.setModifyTime(now);
streamMapper.insert(streamEntity);
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/UserServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/UserServiceImpl.java
index 80a0526ca..30dff2ea7 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/UserServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/UserServiceImpl.java
@@ -122,7 +122,9 @@ public class UserServiceImpl implements UserService {
entity.setAccountType(userInfo.getType());
entity.setPassword(MD5Utils.encrypt(password));
entity.setDueDate(DateUtils.getExpirationDate(userInfo.getValidDays()));
- entity.setCreateBy(LoginUserUtils.getLoginUserDetail().getUsername());
+ String currentUser = LoginUserUtils.getLoginUserDetail().getUsername();
+ entity.setCreateBy(currentUser);
+ entity.setUpdateBy(currentUser);
entity.setName(username);
try {
Map<String, String> keyPairs = RSAUtils.generateRSAKeyPairs();
@@ -140,8 +142,6 @@ public class UserServiceImpl implements UserService {
throw new BusinessException(errMsg);
}
- entity.setCreateTime(new Date());
- entity.setVersion(InlongConstants.INITIAL_VERSION);
Preconditions.checkTrue(userMapper.insert(entity) > 0, "Create user
failed");
LOGGER.debug("success to create user info={}", userInfo);
@@ -170,8 +170,8 @@ public class UserServiceImpl implements UserService {
UserEntity updateUserEntity =
userMapper.selectByPrimaryKey(updateUser.getId());
Preconditions.checkNotNull(updateUserEntity, "User not exists with
id=" + updateUser.getId());
UserEntity targetUserEntity = getByUsername(updateUser.getUsername());
- Preconditions.checkTrue(Objects.equals(targetUserEntity.getName(),
updateUserEntity.getName())
- && !Objects.equals(targetUserEntity.getId(),
updateUserEntity.getId()),
+ Preconditions.checkTrue(Objects.isNull(targetUserEntity)
+ || Objects.equals(targetUserEntity.getId(),
updateUserEntity.getId()),
"Username [" + updateUser.getUsername() + "] already exists");
String errMsg = String.format("user has already updated with
username=%s, curVersion=%s",
updateUser.getUsername(), updateUser.getVersion());
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowApproverServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowApproverServiceImpl.java
index ea4e57beb..a026f8ac0 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowApproverServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowApproverServiceImpl.java
@@ -40,7 +40,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
-import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -102,9 +101,6 @@ public class WorkflowApproverServiceImpl implements
WorkflowApproverService {
@Override
public void add(WorkflowApprover approver, String operator) {
- Date now = new Date();
- approver.setCreateTime(now);
- approver.setModifyTime(now);
approver.setModifier(operator);
approver.setCreator(operator);
@@ -125,7 +121,6 @@ public class WorkflowApproverServiceImpl implements
WorkflowApproverService {
Preconditions.checkEmpty(exist, "already exit the same config");
WorkflowApproverEntity entity =
CommonBeanUtils.copyProperties(approver, WorkflowApproverEntity::new);
- entity.setIsDeleted(InlongConstants.UN_DELETED);
int success = this.workflowApproverMapper.insert(entity);
Preconditions.checkTrue(success == 1, "add failed");
}
@@ -146,7 +141,6 @@ public class WorkflowApproverServiceImpl implements
WorkflowApproverService {
}
WorkflowApproverEntity update = new WorkflowApproverEntity();
update.setId(config.getId());
- update.setModifyTime(new Date());
update.setModifier(operator);
update.setApprovers(config.getApprovers());
update.setFilterKey(config.getFilterKey().name());
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/AbstractGroupOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/AbstractGroupOperator.java
index 7c7249449..b8dd6084e 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/AbstractGroupOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/AbstractGroupOperator.java
@@ -34,8 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
-
/**
* Default operator of inlong group.
*/
@@ -60,13 +58,8 @@ public abstract class AbstractGroupOperator implements
InlongGroupOperator {
// after saving, the status is set to [GROUP_WAIT_SUBMIT]
entity.setStatus(GroupStatus.TO_BE_SUBMIT.getCode());
- entity.setIsDeleted(InlongConstants.UN_DELETED);
entity.setCreator(operator);
entity.setModifier(operator);
- Date now = new Date();
- entity.setCreateTime(now);
- entity.setModifyTime(now);
- entity.setVersion(InlongConstants.INITIAL_VERSION);
groupMapper.insert(entity);
return groupId;
@@ -89,7 +82,6 @@ public abstract class AbstractGroupOperator implements
InlongGroupOperator {
setTargetEntity(request, entity);
entity.setModifier(operator);
- entity.setModifyTime(new Date());
int rowCount = groupMapper.updateByIdentifierSelective(entity);
if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
LOGGER.error("inlong group has already updated with group id={},
curVersion={}",
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/AbstractSinkOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/AbstractSinkOperator.java
index b0ee05075..b26f09bb3 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/AbstractSinkOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/AbstractSinkOperator.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -77,13 +76,8 @@ public abstract class AbstractSinkOperator implements
StreamSinkOperator {
public Integer saveOpt(SinkRequest request, String operator) {
StreamSinkEntity entity = CommonBeanUtils.copyProperties(request,
StreamSinkEntity::new);
entity.setStatus(SinkStatus.NEW.getCode());
- entity.setIsDeleted(InlongConstants.UN_DELETED);
entity.setCreator(operator);
entity.setModifier(operator);
- Date now = new Date();
- entity.setCreateTime(now);
- entity.setModifyTime(now);
- entity.setVersion(InlongConstants.INITIAL_VERSION);
// get the ext params
setTargetEntity(request, entity);
@@ -124,7 +118,6 @@ public abstract class AbstractSinkOperator implements
StreamSinkOperator {
entity.setPreviousStatus(entity.getStatus());
entity.setStatus(SinkStatus.CONFIG_ING.getCode());
entity.setModifier(operator);
- entity.setModifyTime(new Date());
int rowCount = sinkMapper.updateByPrimaryKeySelective(entity);
if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
LOGGER.error(errMsg);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/AbstractSourceOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/AbstractSourceOperator.java
index efc9c6683..5196cd9f4 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/AbstractSourceOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/AbstractSourceOperator.java
@@ -42,7 +42,6 @@ import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -77,7 +76,6 @@ public abstract class AbstractSourceOperator implements
StreamSourceOperator {
@Transactional(rollbackFor = Throwable.class)
public Integer saveOpt(SourceRequest request, Integer groupStatus, String
operator) {
StreamSourceEntity entity = CommonBeanUtils.copyProperties(request,
StreamSourceEntity::new);
- entity.setVersion(InlongConstants.INITIAL_VERSION);
if
(GroupStatus.forCode(groupStatus).equals(GroupStatus.CONFIG_SUCCESSFUL)) {
entity.setStatus(SourceStatus.TO_BE_ISSUED_ADD.getCode());
} else {
@@ -85,11 +83,6 @@ public abstract class AbstractSourceOperator implements
StreamSourceOperator {
}
entity.setCreator(operator);
entity.setModifier(operator);
- Date now = new Date();
- entity.setCreateTime(now);
- entity.setModifyTime(now);
- entity.setIsDeleted(InlongConstants.UN_DELETED);
- entity.setVersion(InlongConstants.INITIAL_VERSION);
// get the ext params
setTargetEntity(request, entity);
@@ -149,7 +142,6 @@ public abstract class AbstractSourceOperator implements
StreamSourceOperator {
// Setting updated parameters of stream source entity.
setTargetEntity(request, entity);
entity.setModifier(operator);
- entity.setModifyTime(new Date());
// Re-issue task if necessary
entity.setPreviousStatus(entity.getStatus());
@@ -187,11 +179,15 @@ public abstract class AbstractSourceOperator implements
StreamSourceOperator {
throw new BusinessException(String.format("source=%s is not
allowed to stop", existEntity));
}
StreamSourceEntity curEntity = CommonBeanUtils.copyProperties(request,
StreamSourceEntity::new);
- curEntity.setVersion(existEntity.getVersion() + 1);
- curEntity.setModifyTime(new Date());
curEntity.setPreviousStatus(curState.getCode());
curEntity.setStatus(nextState.getCode());
- sourceMapper.updateByPrimaryKeySelective(curEntity);
+ int rowCount = sourceMapper.updateByPrimaryKeySelective(curEntity);
+ if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
+ LOGGER.error("source has already updated with groupId={},
streamId={}, name={}, curVersion={}",
+ curEntity.getInlongGroupId(),
curEntity.getInlongStreamId(), curEntity.getSourceName(),
+ curEntity.getVersion());
+ throw new BusinessException(ErrorCodeEnum.CONFIG_EXPIRED);
+ }
}
@Override
@@ -204,12 +200,15 @@ public abstract class AbstractSourceOperator implements
StreamSourceOperator {
throw new BusinessException(String.format("Source=%s is not
allowed to restart", existEntity));
}
StreamSourceEntity curEntity = CommonBeanUtils.copyProperties(request,
StreamSourceEntity::new);
- curEntity.setVersion(existEntity.getVersion() + 1);
- curEntity.setModifyTime(new Date());
curEntity.setPreviousStatus(curState.getCode());
curEntity.setStatus(nextState.getCode());
-
- sourceMapper.updateByPrimaryKeySelective(curEntity);
+ int rowCount = sourceMapper.updateByPrimaryKeySelective(curEntity);
+ if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
+ LOGGER.error("source has already updated with groupId={},
streamId={}, name={}, curVersion={}",
+ curEntity.getInlongGroupId(),
curEntity.getInlongStreamId(), curEntity.getSourceName(),
+ curEntity.getVersion());
+ throw new BusinessException(ErrorCodeEnum.CONFIG_EXPIRED);
+ }
}
private void updateFieldOpt(StreamSourceEntity entity, List<StreamField>
fieldInfos) {
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
index 0daad228f..307b5a30a 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
@@ -43,7 +43,6 @@ import
org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -83,13 +82,8 @@ public class StreamTransformServiceImpl implements
StreamTransformService {
}
StreamTransformEntity transformEntity =
CommonBeanUtils.copyProperties(request,
StreamTransformEntity::new);
- transformEntity.setVersion(InlongConstants.INITIAL_VERSION);
transformEntity.setCreator(operator);
transformEntity.setModifier(operator);
- Date now = new Date();
- transformEntity.setCreateTime(now);
- transformEntity.setModifyTime(now);
- transformEntity.setIsDeleted(InlongConstants.UN_DELETED);
transformMapper.insert(transformEntity);
saveFieldOpt(transformEntity, request.getFieldList());
return transformEntity.getId();
@@ -151,8 +145,6 @@ public class StreamTransformServiceImpl implements
StreamTransformService {
StreamTransformEntity transformEntity =
CommonBeanUtils.copyProperties(request,
StreamTransformEntity::new);
transformEntity.setModifier(operator);
- transformEntity.setVersion(transformEntity.getVersion() + 1);
- transformEntity.setModifyTime(new Date());
int rowCount = transformMapper.updateByIdSelective(transformEntity);
if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
LOGGER.error(msg);
@@ -177,12 +169,10 @@ public class StreamTransformServiceImpl implements
StreamTransformService {
List<StreamTransformEntity> entityList =
transformMapper.selectByRelatedId(groupId, streamId,
request.getTransformName());
if (CollectionUtils.isNotEmpty(entityList)) {
- Date now = new Date();
for (StreamTransformEntity entity : entityList) {
Integer id = entity.getId();
entity.setIsDeleted(id);
entity.setModifier(operator);
- entity.setModifyTime(now);
int rowCount = transformMapper.updateByIdSelective(entity);
if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
LOGGER.error("transform has already updated with
groupId={}, streamId={}, name={}, curVersion={}",
