vernedeng commented on code in PR #9623:
URL: https://github.com/apache/inlong/pull/9623#discussion_r1468887691
##########
inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/deserialization/CsvDeserializationInfo.java:
##########
@@ -17,28 +17,82 @@
package org.apache.inlong.sort.protocol.deserialization;
+import org.apache.commons.lang3.StringUtils;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nullable;
+
+import java.util.Objects;
+
/**
* Csv deserialization info
*/
-public class CsvDeserializationInfo implements DeserializationInfo {
+public class CsvDeserializationInfo extends InLongMsgDeserializationInfo {
- private static final long serialVersionUID = -5035426390567887081L;
+ private static final long serialVersionUID = 7424482369272150638L;
private final char splitter;
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ @Nullable
+ private final Character escapeChar;
+
+ private final String tid;
+
// TODO: support mapping index to field
+ public CsvDeserializationInfo(
+ @JsonProperty("splitter") char splitter) {
+ this(TID_DEFAULT_VALUE, splitter, null);
+ }
+
+ public CsvDeserializationInfo(
+ @JsonProperty("splitter") char splitter,
+ @JsonProperty("escape_char") @Nullable Character escapeChar) {
+ this(TID_DEFAULT_VALUE, splitter, escapeChar);
Review Comment:
tid -> streamId
##########
inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/deserialization/CsvDeserializationInfo.java:
##########
@@ -17,28 +17,82 @@
package org.apache.inlong.sort.protocol.deserialization;
+import org.apache.commons.lang3.StringUtils;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nullable;
+
+import java.util.Objects;
+
/**
* Csv deserialization info
*/
-public class CsvDeserializationInfo implements DeserializationInfo {
+public class CsvDeserializationInfo extends InLongMsgDeserializationInfo {
- private static final long serialVersionUID = -5035426390567887081L;
+ private static final long serialVersionUID = 7424482369272150638L;
private final char splitter;
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ @Nullable
+ private final Character escapeChar;
+
+ private final String tid;
+
// TODO: support mapping index to field
+ public CsvDeserializationInfo(
+ @JsonProperty("splitter") char splitter) {
+ this(TID_DEFAULT_VALUE, splitter, null);
+ }
+
+ public CsvDeserializationInfo(
+ @JsonProperty("splitter") char splitter,
+ @JsonProperty("escape_char") @Nullable Character escapeChar) {
+ this(TID_DEFAULT_VALUE, splitter, escapeChar);
+ }
@JsonCreator
public CsvDeserializationInfo(
- @JsonProperty("splitter") char splitter) {
+ @JsonProperty("tid") String tid,
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
