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 1dc2d67710 [INLONG-9727][Manager] Support configuring the timezone for
agent collection addresses to streamSource (#9728)
1dc2d67710 is described below
commit 1dc2d67710f2bd2715cba5c6899ac5560e0763d2
Author: fuweng11 <[email protected]>
AuthorDate: Tue Feb 27 14:25:00 2024 +0800
[INLONG-9727][Manager] Support configuring the timezone for agent
collection addresses to streamSource (#9728)
---
.../inlong/common/pojo/agent/DataConfig.java | 1 +
.../manager/dao/entity/StreamSourceEntity.java | 1 +
.../resources/mappers/StreamSourceEntityMapper.xml | 15 ++++++++----
.../inlong/manager/pojo/source/SourceRequest.java | 3 +++
.../inlong/manager/pojo/source/StreamSource.java | 3 +++
.../service/core/impl/AgentServiceImpl.java | 1 +
.../main/resources/h2/apache_inlong_manager.sql | 1 +
.../manager-web/sql/apache_inlong_manager.sql | 1 +
inlong-manager/manager-web/sql/changes-1.12.0.sql | 28 ++++++++++++++++++++++
9 files changed, 49 insertions(+), 5 deletions(-)
diff --git
a/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/DataConfig.java
b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/DataConfig.java
index 30bbafab5e..b214909aa4 100644
---
a/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/DataConfig.java
+++
b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/DataConfig.java
@@ -49,6 +49,7 @@ public class DataConfig {
private String syncPartitionKey;
private Integer state;
private String predefinedFields;
+ private String timeZone;
private String extParams;
/**
* The task version.
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StreamSourceEntity.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StreamSourceEntity.java
index e6f97718be..4b28525333 100644
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StreamSourceEntity.java
+++
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/StreamSourceEntity.java
@@ -47,6 +47,7 @@ public class StreamSourceEntity implements Serializable {
private String serializationType;
private String snapshot;
private Date reportTime;
+ private String dataTimeZone;
// extParams saved filePath, fileRollingType, dbName, tableName, etc.
private String extParams;
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 975ae6dc26..479a241452 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
@@ -35,6 +35,7 @@
<result column="serialization_type" jdbcType="VARCHAR"
property="serializationType"/>
<result column="snapshot" jdbcType="LONGVARCHAR" property="snapshot"/>
<result column="report_time" jdbcType="TIMESTAMP"
property="reportTime"/>
+ <result column="data_time_zone" jdbcType="VARCHAR"
property="dataTimeZone"/>
<result column="ext_params" jdbcType="LONGVARCHAR"
property="extParams"/>
<result column="version" jdbcType="INTEGER" property="version"/>
<result column="status" jdbcType="INTEGER" property="status"/>
@@ -48,7 +49,7 @@
<sql id="Base_Column_List">
id, inlong_group_id, inlong_stream_id, source_type, source_name,
template_id, agent_ip, uuid,
data_node_name, inlong_cluster_name, inlong_cluster_node_group,
serialization_type, snapshot, report_time,
- ext_params, version, status, previous_status, is_deleted, creator,
modifier, create_time, modify_time
+ data_time_zone, ext_params, version, status, previous_status,
is_deleted, creator, modifier, create_time, modify_time
</sql>
<insert id="insert" useGeneratedKeys="true" keyProperty="id"
@@ -56,15 +57,15 @@
insert into stream_source (inlong_group_id, inlong_stream_id,
source_type, source_name, template_id,
agent_ip,
uuid, data_node_name, inlong_cluster_name,
inlong_cluster_node_group,
- serialization_type, snapshot,
- report_time, ext_params, status,
+ serialization_type, snapshot, report_time,
+ data_time_zone, ext_params, status,
previous_status, creator, modifier)
values (#{inlongGroupId,jdbcType=VARCHAR},
#{inlongStreamId,jdbcType=VARCHAR},
#{sourceType,jdbcType=VARCHAR},
#{sourceName,jdbcType=VARCHAR}, #{templateId,jdbcType=INTEGER},
#{agentIp,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR},
#{dataNodeName,jdbcType=VARCHAR},
#{inlongClusterName,jdbcType=VARCHAR},
#{inlongClusterNodeGroup,jdbcType=VARCHAR},
- #{serializationType,jdbcType=VARCHAR},
#{snapshot,jdbcType=LONGVARCHAR},
- #{modifyTime,jdbcType=TIMESTAMP},
#{extParams,jdbcType=LONGVARCHAR}, #{status,jdbcType=INTEGER},
+ #{serializationType,jdbcType=VARCHAR},
#{snapshot,jdbcType=LONGVARCHAR},#{modifyTime,jdbcType=TIMESTAMP},
+ #{dataTimeZone,jdbcType=VARCHAR},
#{extParams,jdbcType=LONGVARCHAR}, #{status,jdbcType=INTEGER},
#{previousStatus,jdbcType=INTEGER},
#{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR})
</insert>
@@ -400,6 +401,9 @@
<if test="reportTime != null">
report_time = #{reportTime,jdbcType=TIMESTAMP},
</if>
+ <if test="dataTimeZone != null">
+ data_time_zone = #{dataTimeZone,jdbcType=VARCHAR},
+ </if>
<if test="extParams != null">
ext_params = #{extParams,jdbcType=LONGVARCHAR},
</if>
@@ -437,6 +441,7 @@
serialization_type = #{serializationType,jdbcType=VARCHAR},
snapshot = #{snapshot,jdbcType=LONGVARCHAR},
report_time = #{reportTime,jdbcType=TIMESTAMP},
+ data_time_zone = #{dataTimeZone,jdbcType=VARCHAR},
ext_params = #{extParams,jdbcType=LONGVARCHAR},
version = #{version,jdbcType=INTEGER} + 1,
status = #{status,jdbcType=INTEGER},
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
index f535483805..0bcfade77b 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
@@ -101,6 +101,9 @@ public class SourceRequest {
@Length(min = 1, max = 163840, message = "length must be between 1 and
163840")
private String snapshot;
+ @ApiModelProperty("Data Time zone")
+ private String dataTimeZone;
+
@ApiModelProperty(value = "Whether to sync schema from source after saving
or updating. Default is false")
private Boolean enableSyncSchema = false;
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/StreamSource.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/StreamSource.java
index ead1f7b7f5..cb0ecb2897 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/StreamSource.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/StreamSource.java
@@ -83,6 +83,9 @@ public abstract class StreamSource extends StreamNode {
@ApiModelProperty("Snapshot of this source task")
private String snapshot;
+ @ApiModelProperty("Data Time zone")
+ private String dataTimeZone;
+
@ApiModelProperty("Version")
private Integer version;
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
index 83c858971d..3b1741deb3 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
@@ -588,6 +588,7 @@ public class AgentServiceImpl implements AgentService {
dataConfig.setTaskType(getTaskType(entity));
dataConfig.setTaskName(entity.getSourceName());
dataConfig.setSnapshot(entity.getSnapshot());
+ dataConfig.setTimeZone(entity.getDataTimeZone());
dataConfig.setVersion(entity.getVersion());
String groupId = entity.getInlongGroupId();
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 168c2fc7ca..edd9abf88d 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
@@ -340,6 +340,7 @@ CREATE TABLE IF NOT EXISTS `stream_source`
`serialization_type` varchar(20) DEFAULT NULL COMMENT
'Serialization type, support: csv, json, canal, avro, etc',
`snapshot` mediumtext DEFAULT NULL COMMENT 'Snapshot
of this source task',
`report_time` timestamp NULL COMMENT 'Snapshot time',
+ `data_time_zone` varchar(256) DEFAULT NULL COMMENT 'Data
time zone',
`ext_params` mediumtext DEFAULT NULL COMMENT 'Another
fields will be saved as JSON string, such as filePath, dbName, tableName, etc',
`version` int(11) DEFAULT '1' COMMENT 'Stream
source version',
`status` int(4) DEFAULT '110' COMMENT 'Stream
source status',
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index 8823c1383c..025b53190e 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -360,6 +360,7 @@ CREATE TABLE IF NOT EXISTS `stream_source`
`serialization_type` varchar(20) DEFAULT NULL COMMENT
'Serialization type, support: csv, json, canal, avro, etc',
`snapshot` mediumtext DEFAULT NULL COMMENT 'Snapshot
of this source task',
`report_time` timestamp NULL COMMENT 'Snapshot time',
+ `data_time_zone` varchar(256) DEFAULT NULL COMMENT 'Data
time zone',
`ext_params` mediumtext DEFAULT NULL COMMENT 'Another
fields will be saved as JSON string, such as filePath, dbName, tableName, etc',
`version` int(11) DEFAULT '1' COMMENT 'Stream
source version',
`status` int(4) DEFAULT '110' COMMENT 'Stream
source status',
diff --git a/inlong-manager/manager-web/sql/changes-1.12.0.sql
b/inlong-manager/manager-web/sql/changes-1.12.0.sql
new file mode 100644
index 0000000000..82e8af66e5
--- /dev/null
+++ b/inlong-manager/manager-web/sql/changes-1.12.0.sql
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+-- This is the SQL change file from version 1.9.0 to the current version
1.10.0.
+-- When upgrading to version 1.10.0, please execute those SQLs in the DB (such
as MySQL) used by the Manager module.
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+USE `apache_inlong_manager`;
+
+ALTER TABLE `stream_source` ADD COLUMN `data_time_zone` varchar(256) DEFAULT
NULL COMMENT 'Data time zone';
+
+
