This is an automated email from the ASF dual-hosted git repository.
healchow 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 72f5ef7af [INLONG-5876][Manager] Remove the check of data separator
(#5878)
72f5ef7af is described below
commit 72f5ef7afc79586cdf117c2297a4f01280823baa
Author: emhui <111486498+e-m...@users.noreply.github.com>
AuthorDate: Wed Sep 14 15:41:51 2022 +0800
[INLONG-5876][Manager] Remove the check of data separator (#5878)
---
.../src/test/java/org/apache/inlong/manager/client/BaseExample.java | 5 ++---
.../src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java | 5 ++---
.../java/org/apache/inlong/manager/common/enums/DataSeparator.java | 3 ++-
.../java/org/apache/inlong/manager/pojo/sink/hive/HiveSink.java | 2 +-
.../java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java | 2 +-
.../org/apache/inlong/manager/pojo/sink/hive/HiveSinkRequest.java | 2 +-
.../org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java | 5 +----
.../apache/inlong/manager/pojo/source/autopush/AutoPushSource.java | 4 ++--
.../inlong/manager/pojo/source/autopush/AutoPushSourceDTO.java | 4 ++--
.../inlong/manager/pojo/source/autopush/AutoPushSourceRequest.java | 6 +++---
.../org/apache/inlong/manager/pojo/source/kafka/KafkaSource.java | 4 ++--
.../org/apache/inlong/manager/pojo/source/kafka/KafkaSourceDTO.java | 4 ++--
.../apache/inlong/manager/pojo/source/kafka/KafkaSourceRequest.java | 6 +++---
.../org/apache/inlong/manager/pojo/source/pulsar/PulsarSource.java | 4 ++--
.../apache/inlong/manager/pojo/source/pulsar/PulsarSourceDTO.java | 4 ++--
.../inlong/manager/pojo/source/pulsar/PulsarSourceRequest.java | 6 +++---
.../org/apache/inlong/manager/pojo/stream/InlongStreamInfo.java | 4 ++--
.../org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java | 6 +++---
.../org/apache/inlong/manager/pojo/stream/InlongStreamResponse.java | 4 ++--
.../inlong/manager/service/source/pulsar/PulsarSourceOperator.java | 3 +--
.../java/org/apache/inlong/manager/service/ServiceBaseTest.java | 2 +-
.../apache/inlong/manager/service/sort/DisableZkForSortTest.java | 2 +-
.../manager-test/src/main/resources/h2/apache_inlong_manager.sql | 2 +-
inlong-manager/manager-web/sql/apache_inlong_manager.sql | 2 +-
24 files changed, 43 insertions(+), 48 deletions(-)
diff --git
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/BaseExample.java
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/BaseExample.java
index a8ca418d2..1abc7ae40 100644
---
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/BaseExample.java
+++
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/BaseExample.java
@@ -20,7 +20,6 @@ package org.apache.inlong.manager.client;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.Data;
import org.apache.inlong.manager.common.auth.DefaultAuthentication;
-import org.apache.inlong.manager.common.enums.DataSeparator;
import org.apache.inlong.manager.common.enums.FieldType;
import org.apache.inlong.manager.common.enums.FileFormat;
import org.apache.inlong.manager.common.consts.InlongConstants;
@@ -109,7 +108,7 @@ public class BaseExample {
streamInfo.setName(this.getStreamId());
streamInfo.setInlongStreamId(this.getStreamId());
streamInfo.setDataEncoding(StandardCharsets.UTF_8.toString());
- streamInfo.setDataSeparator(DataSeparator.VERTICAL_BAR.getSeparator());
+ streamInfo.setDataSeparator("|");
// if you need strictly order for data, set to 1
streamInfo.setSyncSend(InlongConstants.SYNC_SEND);
streamInfo.setMqResource(this.getTopic());
@@ -126,7 +125,7 @@ public class BaseExample {
hiveSink.setAuthentication(new DefaultAuthentication("hive", "hive"));
hiveSink.setDataEncoding(StandardCharsets.UTF_8.toString());
hiveSink.setFileFormat(FileFormat.TextFile.name());
- hiveSink.setDataSeparator(DataSeparator.VERTICAL_BAR.getSeparator());
+ hiveSink.setDataSeparator("|");
hiveSink.setDataPath("hdfs://{ip:port}/usr/hive/warehouse/{db.name}");
hiveSink.setHiveConfDir("{hive.conf.dir}");
diff --git
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
index 015591878..4c8c122da 100644
---
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
+++
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
@@ -24,7 +24,6 @@ import
org.apache.inlong.manager.client.api.ClientConfiguration;
import org.apache.inlong.manager.client.api.InlongClient;
import org.apache.inlong.manager.common.auth.DefaultAuthentication;
import org.apache.inlong.manager.common.consts.InlongConstants;
-import org.apache.inlong.manager.common.enums.DataSeparator;
import org.apache.inlong.manager.common.enums.FieldType;
import org.apache.inlong.manager.common.enums.FileFormat;
import org.apache.inlong.manager.pojo.group.InlongGroupInfo;
@@ -140,7 +139,7 @@ public class BaseTest {
hiveSink.setAuthentication(new DefaultAuthentication("hive", "hive"));
hiveSink.setDataEncoding(StandardCharsets.UTF_8.toString());
hiveSink.setFileFormat(FileFormat.TextFile.name());
- hiveSink.setDataSeparator(DataSeparator.VERTICAL_BAR.getSeparator());
+ hiveSink.setDataSeparator("|");
hiveSink.setDataPath("hdfs://{ip:port}/usr/hive/warehouse/{db.name}");
hiveSink.setSinkFieldList(Lists.newArrayList(
new SinkField(0, FieldType.INT.toString(), "age",
FieldType.INT.toString(), "age"),
@@ -160,7 +159,7 @@ public class BaseTest {
streamInfo.setInlongStreamId(STREAM_ID);
streamInfo.setName(STREAM_ID);
streamInfo.setDataEncoding(StandardCharsets.UTF_8.toString());
- streamInfo.setDataSeparator(DataSeparator.VERTICAL_BAR.getSeparator());
+ streamInfo.setDataSeparator("|");
// if you need strictly order for data, set to 1
streamInfo.setSyncSend(InlongConstants.SYNC_SEND);
streamInfo.setMqResource(TOPIC);
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/DataSeparator.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/DataSeparator.java
index 39c27f8d2..1b549401b 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/DataSeparator.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/DataSeparator.java
@@ -29,7 +29,8 @@ public enum DataSeparator {
DASH("-", 45),
SOH("\001", 1),
STX("\002", 2),
- ETX("\003", 3);
+ ETX("\003", 3),
+ TAB("\t", 9);
private final String separator;
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSink.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSink.java
index 14faf161d..63a410ae8 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSink.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSink.java
@@ -77,7 +77,7 @@ public class HiveSink extends StreamSink {
@ApiModelProperty("Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty("Data separator, stored as ASCII code")
+ @ApiModelProperty("Data separator")
private String dataSeparator;
@ApiModelProperty("Version for Hive, such as: 3.2.1")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java
index b56c002b7..008e16839 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java
@@ -79,7 +79,7 @@ public class HiveSinkDTO {
@ApiModelProperty("Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty("Data separator, stored as ASCII code")
+ @ApiModelProperty("Data separator")
private String dataSeparator;
@ApiModelProperty("Properties for hive")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkRequest.java
index f5fd9c8c3..cfe4f9d31 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkRequest.java
@@ -79,7 +79,7 @@ public class HiveSinkRequest extends SinkRequest {
@ApiModelProperty("Data encoding format: UTF-8, GBK")
private String dataEncoding = StandardCharsets.UTF_8.toString();
- @ApiModelProperty("Data separator, stored as ASCII code")
+ @ApiModelProperty("Data separator")
private String dataSeparator = DataSeparator.SOH.getSeparator();
@ApiModelProperty("Version for Hive, such as: 3.2.1")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java
index d0e0fa4dc..b334eca18 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.common.enums.DataTypeEnum;
import org.apache.inlong.manager.common.consts.SourceType;
-import org.apache.inlong.manager.common.enums.DataSeparator;
import org.apache.inlong.manager.pojo.source.StreamSource;
import org.apache.inlong.manager.pojo.source.kafka.KafkaOffset;
import org.apache.inlong.manager.pojo.source.kafka.KafkaSource;
@@ -233,9 +232,7 @@ public class ExtractNodeUtils {
DataTypeEnum dataType =
DataTypeEnum.forName(pulsarSource.getSerializationType());
switch (dataType) {
case CSV:
- String separator = DataSeparator
-
.forAscii(Integer.parseInt(pulsarSource.getDataSeparator())).getSeparator();
- format = new CsvFormat(separator);
+ format = new CsvFormat(pulsarSource.getDataSeparator());
break;
case AVRO:
format = new AvroFormat();
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSource.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSource.java
index ebd23d5fc..4cd605b2d 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSource.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSource.java
@@ -48,10 +48,10 @@ public class AutoPushSource extends StreamSource {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
+ @ApiModelProperty(value = "Data separator")
private String dataSeparator;
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
public AutoPushSource() {
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSourceDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSourceDTO.java
index baa0c872c..336cd01f2 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSourceDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSourceDTO.java
@@ -46,10 +46,10 @@ public class AutoPushSourceDTO {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
+ @ApiModelProperty(value = "Data separator")
private String dataSeparator;
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
public static AutoPushSourceDTO getFromRequest(AutoPushSourceRequest
request) {
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSourceRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSourceRequest.java
index 6ee58efd0..b9e08adc9 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSourceRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/autopush/AutoPushSourceRequest.java
@@ -44,10 +44,10 @@ public class AutoPushSourceRequest extends SourceRequest {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding = StandardCharsets.UTF_8.toString();
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
- private String dataSeparator =
DataSeparator.VERTICAL_BAR.getAsciiCode().toString();
+ @ApiModelProperty(value = "Data separator")
+ private String dataSeparator = DataSeparator.VERTICAL_BAR.getSeparator();
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
public AutoPushSourceRequest() {
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSource.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSource.java
index 74d480b35..15d1a2be5 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSource.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSource.java
@@ -84,10 +84,10 @@ public class KafkaSource extends StreamSource {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
+ @ApiModelProperty(value = "Data separator")
private String dataSeparator;
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
public KafkaSource() {
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSourceDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSourceDTO.java
index e81c373a7..dd4735d9e 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSourceDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSourceDTO.java
@@ -93,10 +93,10 @@ public class KafkaSourceDTO {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
+ @ApiModelProperty(value = "Data separator")
private String dataSeparator;
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
@ApiModelProperty("Properties for Kafka")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSourceRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSourceRequest.java
index 120567218..671dc0375 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSourceRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/kafka/KafkaSourceRequest.java
@@ -82,10 +82,10 @@ public class KafkaSourceRequest extends SourceRequest {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding = StandardCharsets.UTF_8.toString();
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
- private String dataSeparator =
DataSeparator.VERTICAL_BAR.getAsciiCode().toString();
+ @ApiModelProperty(value = "Data separator")
+ private String dataSeparator = DataSeparator.VERTICAL_BAR.getSeparator();
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
public KafkaSourceRequest() {
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSource.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSource.java
index e1be7d1cb..a604cfeaa 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSource.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSource.java
@@ -65,10 +65,10 @@ public class PulsarSource extends StreamSource {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
+ @ApiModelProperty(value = "Data separator")
private String dataSeparator;
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
@ApiModelProperty("Configure the Source's startup mode. "
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSourceDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSourceDTO.java
index 17c540a88..3a4623868 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSourceDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSourceDTO.java
@@ -62,10 +62,10 @@ public class PulsarSourceDTO {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
+ @ApiModelProperty(value = "Data separator")
private String dataSeparator;
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
@ApiModelProperty("Configure the Source's startup mode. "
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSourceRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSourceRequest.java
index e883e1caa..4d717dca2 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSourceRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/pulsar/PulsarSourceRequest.java
@@ -59,10 +59,10 @@ public class PulsarSourceRequest extends SourceRequest {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding = StandardCharsets.UTF_8.toString();
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
- private String dataSeparator =
DataSeparator.VERTICAL_BAR.getAsciiCode().toString();
+ @ApiModelProperty(value = "Data separator")
+ private String dataSeparator = DataSeparator.VERTICAL_BAR.getSeparator();
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
@ApiModelProperty("Configure the Source's startup mode."
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamInfo.java
index 9dc56c4cf..64c037580 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamInfo.java
@@ -67,10 +67,10 @@ public class InlongStreamInfo {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
+ @ApiModelProperty(value = "Data separator")
private String dataSeparator;
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
@ApiModelProperty(value = "Whether to send synchronously, 0: no, 1: yes",
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
index 6815ff35f..cd149478d 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
@@ -64,10 +64,10 @@ public class InlongStreamRequest {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding = StandardCharsets.UTF_8.toString();
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
- private String dataSeparator =
DataSeparator.VERTICAL_BAR.getAsciiCode().toString();
+ @ApiModelProperty(value = "Data separator")
+ private String dataSeparator = DataSeparator.VERTICAL_BAR.getSeparator();
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
@ApiModelProperty(value = "Whether to send synchronously, 0: no, 1: yes",
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamResponse.java
index bb7237127..28d61974f 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamResponse.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamResponse.java
@@ -62,10 +62,10 @@ public class InlongStreamResponse {
@ApiModelProperty(value = "Data encoding format: UTF-8, GBK")
private String dataEncoding;
- @ApiModelProperty(value = "Data separator, stored as ASCII code")
+ @ApiModelProperty(value = "Data separator")
private String dataSeparator;
- @ApiModelProperty(value = "Data field escape symbol, stored as ASCII code")
+ @ApiModelProperty(value = "Data field escape symbol")
private String dataEscapeChar;
@ApiModelProperty(value = "Whether to send synchronously, 0: no, 1: yes",
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/pulsar/PulsarSourceOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/pulsar/PulsarSourceOperator.java
index 0b079c269..4096b22d8 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/pulsar/PulsarSourceOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/pulsar/PulsarSourceOperator.java
@@ -26,7 +26,6 @@ import org.apache.inlong.common.enums.DataTypeEnum;
import org.apache.inlong.manager.common.consts.InlongConstants;
import org.apache.inlong.manager.common.consts.SourceType;
import org.apache.inlong.manager.common.enums.ClusterType;
-import org.apache.inlong.manager.common.enums.DataSeparator;
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
@@ -155,7 +154,7 @@ public class PulsarSourceOperator extends
AbstractSourceOperator {
if
(DataTypeEnum.CSV.getName().equalsIgnoreCase(pulsarSource.getSerializationType()))
{
pulsarSource.setDataSeparator(streamInfo.getDataSeparator());
if (StringUtils.isEmpty(pulsarSource.getDataSeparator())) {
-
pulsarSource.setDataSeparator(DataSeparator.COMMA.getAsciiCode().toString());
+ pulsarSource.setDataSeparator(",");
}
}
pulsarSource.setScanStartupMode(PulsarScanStartupMode.EARLIEST.getValue());
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/ServiceBaseTest.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/ServiceBaseTest.java
index 0407c8bcc..6b7fdf133 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/ServiceBaseTest.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/ServiceBaseTest.java
@@ -117,7 +117,7 @@ public class ServiceBaseTest extends BaseTest {
request.setInlongGroupId(inlongGroupId);
request.setInlongStreamId(inlongStreamId);
request.setMqResource(inlongStreamId);
- request.setDataSeparator("124");
+ request.setDataSeparator("|");
request.setDataEncoding("UTF-8");
request.setFieldList(createStreamFields(inlongGroupId,
inlongStreamId));
streamService.save(request, GLOBAL_OPERATOR);
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
index 96d82dc26..bdb5a7a50 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
@@ -102,7 +102,7 @@ public class DisableZkForSortTest extends
WorkflowServiceImplTest {
sinkRequest.setFileFormat("TextFile");
sinkRequest.setDataPath("hdfs://localhost:4007/user/hive/warehouse/default");
sinkRequest.setFileFormat(StandardCharsets.UTF_8.name());
- sinkRequest.setDataSeparator("124");
+ sinkRequest.setDataSeparator("|");
streamSinkService.save(sinkRequest, OPERATOR);
return sinkRequest;
}
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 d844285b7..f7a2faf36 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
@@ -262,7 +262,7 @@ CREATE TABLE IF NOT EXISTS `inlong_stream`
`mq_resource` varchar(128) DEFAULT NULL COMMENT 'MQ
resource, in one stream, corresponding to the filter ID of TubeMQ,
corresponding to the topic of Pulsar',
`data_type` varchar(20) DEFAULT NULL COMMENT 'Data type,
including: CSV, KEY-VALUE, JSON, AVRO, etc.',
`data_encoding` varchar(8) DEFAULT 'UTF-8' COMMENT 'Data
encoding format, including: UTF-8, GBK, etc.',
- `data_separator` varchar(8) DEFAULT NULL COMMENT 'The source
data field separator, stored as ASCII code',
+ `data_separator` varchar(8) DEFAULT NULL COMMENT 'The source
data field separator',
`data_escape_char` varchar(8) DEFAULT NULL COMMENT 'Source data
field escape character, the default is NULL (NULL), stored as 1 character',
`sync_send` tinyint(1) DEFAULT '0' COMMENT
'order_preserving 0: none, 1: yes',
`daily_records` int(11) DEFAULT '10' COMMENT 'Number of
access records per day, unit: 10,000 records per day',
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index cfa64e471..1f25b8aaa 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -277,7 +277,7 @@ CREATE TABLE IF NOT EXISTS `inlong_stream`
`mq_resource` varchar(128) DEFAULT NULL COMMENT 'MQ
resource, in one stream, corresponding to the filter ID of TubeMQ,
corresponding to the topic of Pulsar',
`data_type` varchar(20) DEFAULT NULL COMMENT 'Data type,
including: CSV, KEY-VALUE, JSON, AVRO, etc.',
`data_encoding` varchar(8) DEFAULT 'UTF-8' COMMENT 'Data
encoding format, including: UTF-8, GBK, etc.',
- `data_separator` varchar(8) DEFAULT NULL COMMENT 'The source
data field separator, stored as ASCII code',
+ `data_separator` varchar(8) DEFAULT NULL COMMENT 'The source
data field separator',
`data_escape_char` varchar(8) DEFAULT NULL COMMENT 'Source data
field escape character, the default is NULL (NULL), stored as 1 character',
`sync_send` tinyint(1) DEFAULT '0' COMMENT
'order_preserving 0: none, 1: yes',
`daily_records` int(11) DEFAULT '10' COMMENT 'Number of
access records per day, unit: 10,000 records per day',
