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 2023/11/28 03:23:55 UTC
(inlong) branch master updated: [INLONG-9343][Manager] Support configuring timeZone related parameters for fileSource (#9344)
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 9449fcaf50 [INLONG-9343][Manager] Support configuring timeZone related parameters for fileSource (#9344)
9449fcaf50 is described below
commit 9449fcaf507a409ac4df14c35d9304ed1e12f9e9
Author: fuweng11 <76...@users.noreply.github.com>
AuthorDate: Tue Nov 28 11:23:48 2023 +0800
[INLONG-9343][Manager] Support configuring timeZone related parameters for fileSource (#9344)
---
.../org/apache/inlong/manager/pojo/source/file/FileSource.java | 6 ++++++
.../org/apache/inlong/manager/pojo/source/file/FileSourceDTO.java | 6 ++++++
.../apache/inlong/manager/pojo/source/file/FileSourceRequest.java | 6 ++++++
.../apache/inlong/manager/service/core/impl/AgentServiceImpl.java | 8 ++++----
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSource.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSource.java
index 7036473798..de2dc20af8 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSource.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSource.java
@@ -80,6 +80,12 @@ public class FileSource extends StreamSource {
@ApiModelProperty("Cycle unit")
private String cycleUnit;
+ @ApiModelProperty("Max file count")
+ private String maxFileCount;
+
+ @ApiModelProperty("Time zone")
+ private String timeZone;
+
@ApiModelProperty("Whether retry")
private Boolean retry;
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSourceDTO.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSourceDTO.java
index 19b7018b2a..a9a20d7fb4 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSourceDTO.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSourceDTO.java
@@ -83,6 +83,12 @@ public class FileSourceDTO {
@ApiModelProperty("Cycle unit")
private String cycleUnit = "D";
+ @ApiModelProperty("Max file count")
+ private String maxFileCount;
+
+ @ApiModelProperty("Time zone")
+ private String timeZone;
+
@ApiModelProperty("Whether retry")
private Boolean retry = false;
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSourceRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSourceRequest.java
index c27ec4e761..1e5889ceb8 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSourceRequest.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/file/FileSourceRequest.java
@@ -75,6 +75,12 @@ public class FileSourceRequest extends SourceRequest {
@ApiModelProperty("Cycle unit")
private String cycleUnit;
+ @ApiModelProperty("Max file count")
+ private String maxFileCount;
+
+ @ApiModelProperty("Time zone")
+ private String timeZone;
+
@ApiModelProperty("Whether retry")
private Boolean retry;
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 d4731d4e55..5d6fb1101e 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
@@ -598,11 +598,11 @@ public class AgentServiceImpl implements AgentService {
dataConfig.setState(
SourceStatus.NORMAL_STATUS_SET.contains(SourceStatus.forCode(entity.getStatus())) ? 1 : 0);
dataConfig.setSyncSend(streamEntity.getSyncSend());
- if (SourceType.FILE.equalsIgnoreCase(streamEntity.getDataType())) {
- String dataSeparator = streamEntity.getDataSeparator();
- extParams = (null != dataSeparator ? getExtParams(extParams, dataSeparator) : extParams);
+ if (SourceType.FILE.equalsIgnoreCase(entity.getSourceType())
+ && StringUtils.isNotBlank(streamEntity.getDataSeparator())) {
+ String dataSeparator = String.valueOf((char) Integer.parseInt(streamEntity.getDataSeparator()));
+ extParams = getExtParams(extParams, dataSeparator);
}
-
InlongStreamInfo streamInfo = CommonBeanUtils.copyProperties(streamEntity, InlongStreamInfo::new);
// Processing extParams
unpackExtParams(streamEntity.getExtParams(), streamInfo);