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 2022/03/27 07:57:08 UTC
[incubator-inlong] branch master updated: [INLONG-3376][Manager] Support custom field format in client (#3377)
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 6ec8e14 [INLONG-3376][Manager] Support custom field format in client (#3377)
6ec8e14 is described below
commit 6ec8e14c1ce3e07b49559b3f060ebf85447a6eaa
Author: yunqingmoswu <44...@users.noreply.github.com>
AuthorDate: Sun Mar 27 15:57:03 2022 +0800
[INLONG-3376][Manager] Support custom field format in client (#3377)
Co-authored-by: yunqingmo <yu...@tencent.com>
---
.../main/java/org/apache/inlong/manager/client/api/SinkField.java | 5 +++--
.../main/java/org/apache/inlong/manager/client/api/StreamField.java | 4 ++++
.../org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java | 3 ++-
.../inlong/manager/client/api/util/InlongStreamSinkTransfer.java | 4 +++-
.../apache/inlong/manager/client/api/util/InlongStreamTransfer.java | 1 +
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/SinkField.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/SinkField.java
index ecf520f..09f2ef9 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/SinkField.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/SinkField.java
@@ -37,8 +37,9 @@ public class SinkField extends StreamField {
private String sourceFieldType;
public SinkField(int index, FieldType fieldType, String fieldName, String fieldComment,
- String fieldValue, String sourceFieldName, String sourceFieldType, Integer isMetaField) {
- super(index, fieldType, fieldName, fieldComment, fieldValue, isMetaField);
+ String fieldValue, String sourceFieldName, String sourceFieldType,
+ Integer isMetaField, String fieldFormat) {
+ super(index, fieldType, fieldName, fieldComment, fieldValue, isMetaField, fieldFormat);
this.sourceFieldName = sourceFieldName;
this.sourceFieldType = sourceFieldType;
}
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/StreamField.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/StreamField.java
index 445c53b..e1c51ca 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/StreamField.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/StreamField.java
@@ -48,4 +48,8 @@ public class StreamField {
@ApiModelProperty("Is this field a meta field, 0: no, 1: yes")
private Integer isMetaField = 0;
+ @ApiModelProperty("Field format,including: MICROSECONDS, MILLISECONDS, SECONDS, SQL, ISO_8601"
+ + " and custom such as 'yyyy-MM-dd HH:mm:ss' etc,maybe this is mainly used for time format")
+ private String fieldFormat;
+
}
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
index 9ed62f3..3991d82 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
@@ -66,7 +66,8 @@ public class InlongStreamImpl extends InlongStream {
fieldInfo.getFieldName(),
fieldInfo.getFieldComment(),
fieldInfo.getFieldValue(),
- fieldInfo.getIsMetaField()
+ fieldInfo.getIsMetaField(),
+ fieldInfo.getFieldFormat()
)
).collect(Collectors.toList());
}
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongStreamSinkTransfer.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongStreamSinkTransfer.java
index 5920b17..53223c0 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongStreamSinkTransfer.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongStreamSinkTransfer.java
@@ -153,7 +153,8 @@ public class InlongStreamSinkTransfer {
sinkFieldResponse.getFieldComment(),
null, sinkFieldResponse.getSourceFieldName(),
sinkFieldResponse.getSourceFieldType(),
- sinkFieldResponse.getIsMetaField())).collect(Collectors.toList());
+ sinkFieldResponse.getIsMetaField(),
+ sinkFieldResponse.getFieldFormat())).collect(Collectors.toList());
}
@@ -240,6 +241,7 @@ public class InlongStreamSinkTransfer {
request.setSourceFieldName(sinkField.getSourceFieldName());
request.setSourceFieldType(sinkField.getSourceFieldType());
request.setIsMetaField(sinkField.getIsMetaField());
+ request.setFieldFormat(sinkField.getFieldFormat());
fieldRequestList.add(request);
}
return fieldRequestList;
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongStreamTransfer.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongStreamTransfer.java
index 28a6301..e4cb801 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongStreamTransfer.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongStreamTransfer.java
@@ -67,6 +67,7 @@ public class InlongStreamTransfer {
fieldInfo.setFieldComment(field.getFieldComment());
fieldInfo.setFieldValue(field.getFieldValue());
fieldInfo.setIsMetaField(field.getIsMetaField());
+ fieldInfo.setFieldFormat(field.getFieldFormat());
return fieldInfo;
}).collect(Collectors.toList());
}