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/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 27c924d81 [INLONG-4586][Manager] Fix duplicate defined stream fields
in the stream source (#4587)
27c924d81 is described below
commit 27c924d81a90f5b8e2e7e9ea2cd82c8d58a131ba
Author: kipshi <[email protected]>
AuthorDate: Wed Jun 8 16:50:18 2022 +0800
[INLONG-4586][Manager] Fix duplicate defined stream fields in the stream
source (#4587)
---
.../apache/inlong/manager/client/BaseExample.java | 2 +-
.../inlong/manager/client/File2HBaseExample.java | 2 +-
.../inlong/manager/client/File2IcebergExample.java | 2 +-
.../apache/inlong/manager/client/ut/BaseTest.java | 2 +-
.../inlong/manager/client/ut/Kafka2HiveTest.java | 2 +-
.../client/api/util/StreamTransformTransfer.java | 6 +++---
.../manager/common/pojo/sink/StreamSink.java | 2 +-
.../manager/common/pojo/source/StreamSource.java | 5 -----
.../manager/common/pojo/stream/StreamNode.java | 2 +-
.../pojo/transform/TransformDefinitionTest.java | 4 ++--
.../service/sink/ck/ClickHouseSinkOperation.java | 2 +-
.../sink/es/ElasticsearchSinkOperation.java | 2 +-
.../sink/greenplum/GreenplumSinkOperation.java | 2 +-
.../service/sink/hbase/HBaseSinkOperation.java | 2 +-
.../service/sink/hdfs/HdfsSinkOperation.java | 2 +-
.../service/sink/hive/HiveSinkOperation.java | 2 +-
.../service/sink/iceberg/IcebergSinkOperation.java | 2 +-
.../service/sink/kafka/KafkaSinkOperation.java | 2 +-
.../service/sink/mysql/MySQLSinkOperation.java | 2 +-
.../sink/postgres/PostgresSinkOperation.java | 2 +-
.../sink/sqlserver/SqlServerSinkOperation.java | 2 +-
.../manager/service/sort/util/LoadNodeUtils.java | 22 +++++++++++-----------
22 files changed, 34 insertions(+), 39 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 9e2d773b7..b17f78a70 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
@@ -135,7 +135,7 @@ public class BaseExample {
SinkField field2 = new SinkField(1, FieldType.STRING.toString(),
"name", FieldType.STRING.toString(), "name");
fields.add(field1);
fields.add(field2);
- hiveSink.setFieldList(fields);
+ hiveSink.setSinkFieldList(fields);
hiveSink.setTableName("{table.name}");
hiveSink.setSinkName("{hive.sink.name}");
return hiveSink;
diff --git
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2HBaseExample.java
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2HBaseExample.java
index 627842836..4aa34c37f 100644
---
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2HBaseExample.java
+++
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2HBaseExample.java
@@ -142,7 +142,7 @@ public class File2HBaseExample extends BaseExample {
fields.add(field1);
fields.add(field2);
fields.add(field3);
- sink.setFieldList(fields);
+ sink.setSinkFieldList(fields);
return sink;
}
}
diff --git
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2IcebergExample.java
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2IcebergExample.java
index 1554a69ac..8e2da3082 100644
---
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2IcebergExample.java
+++
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2IcebergExample.java
@@ -152,7 +152,7 @@ public class File2IcebergExample extends BaseExample {
fields.add(field2);
fields.add(field3);
fields.add(field4);
- sink.setFieldList(fields);
+ sink.setSinkFieldList(fields);
return sink;
}
}
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 fc5d8c933..d38f20bde 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
@@ -158,7 +158,7 @@ public class BaseTest {
hiveSink.setFileFormat(FileFormat.TextFile.name());
hiveSink.setDataSeparator(DataSeparator.VERTICAL_BAR.getSeparator());
hiveSink.setDataPath("hdfs://{ip:port}/usr/hive/warehouse/{db.name}");
- hiveSink.setFieldList(Lists.newArrayList(
+ hiveSink.setSinkFieldList(Lists.newArrayList(
new SinkField(0, FieldType.INT.toString(), "age",
FieldType.INT.toString(), "age"),
new SinkField(1, FieldType.STRING.toString(), "name",
FieldType.STRING.toString(), "name")
));
diff --git
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
index 4b9023482..ac804b901 100644
---
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
+++
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
@@ -305,7 +305,7 @@ class Kafka2HiveTest extends BaseTest {
.creator("admin")
.modifier("admin")
.dataFormat(DataFormat.NONE)
- .fieldList(Lists.newArrayList(
+
.sinkFieldList(Lists.newArrayList(
SinkField.builder()
.id(17)
.fieldName("age")
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/StreamTransformTransfer.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/StreamTransformTransfer.java
index f6ab1c231..ae705ad92 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/StreamTransformTransfer.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/StreamTransformTransfer.java
@@ -59,8 +59,8 @@ public class StreamTransformTransfer {
if (CollectionUtils.isNotEmpty(streamTransform.getPostNodes())) {
transformRequest.setPostNodeNames(Joiner.on(",").join(streamTransform.getPostNodes()));
}
- if (CollectionUtils.isNotEmpty(streamTransform.getFields())) {
- transformRequest.setFieldList(streamTransform.getFields());
+ if (CollectionUtils.isNotEmpty(streamTransform.getFieldList())) {
+ transformRequest.setFieldList(streamTransform.getFieldList());
}
return transformRequest;
}
@@ -90,7 +90,7 @@ public class StreamTransformTransfer {
streamTransform.setPostNodes(Sets.newHashSet(postNodes));
}
if (CollectionUtils.isNotEmpty(transformResponse.getFieldList())) {
- streamTransform.setFields(transformResponse.getFieldList());
+ streamTransform.setFieldList(transformResponse.getFieldList());
}
return streamTransform;
}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java
index b0a5bd5db..4997a2836 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java
@@ -108,7 +108,7 @@ public abstract class StreamSink extends StreamNode {
private Date modifyTime;
@ApiModelProperty("Sink field list")
- private List<SinkField> fieldList = Lists.newArrayList();
+ private List<SinkField> sinkFieldList = Lists.newArrayList();
@ApiModelProperty("Properties for sink")
private Map<String, Object> properties = Maps.newHashMap();
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java
index 6a53a1ada..064546b06 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java
@@ -27,11 +27,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
-import org.apache.inlong.manager.common.pojo.stream.StreamField;
import org.apache.inlong.manager.common.pojo.stream.StreamNode;
import java.util.Date;
-import java.util.List;
/**
* Stream source info, including source name, agent ip, etc.
@@ -103,9 +101,6 @@ public abstract class StreamSource extends StreamNode {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @ApiModelProperty("Field list")
- private List<StreamField> fieldList;
-
public SourceRequest genSourceRequest() {
return null;
}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamNode.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamNode.java
index 7c0e4abba..a4713f34b 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamNode.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamNode.java
@@ -40,7 +40,7 @@ public class StreamNode {
protected Set<String> postNodes;
- protected List<StreamField> fields;
+ protected List<StreamField> fieldList;
public void addPre(String pre) {
Preconditions.checkNotEmpty(pre, "Pre node should not be empty");
diff --git
a/inlong-manager/manager-common/src/test/java/org/apache/inlong/manager/common/pojo/transform/TransformDefinitionTest.java
b/inlong-manager/manager-common/src/test/java/org/apache/inlong/manager/common/pojo/transform/TransformDefinitionTest.java
index 4361c4928..284e519bc 100644
---
a/inlong-manager/manager-common/src/test/java/org/apache/inlong/manager/common/pojo/transform/TransformDefinitionTest.java
+++
b/inlong-manager/manager-common/src/test/java/org/apache/inlong/manager/common/pojo/transform/TransformDefinitionTest.java
@@ -69,9 +69,9 @@ public class TransformDefinitionTest {
public void testJoinerDefinition() {
List<StreamField> streamFields = createStreamFields();
StreamNode leftNode = new BlankStreamNode();
- leftNode.setFields(streamFields);
+ leftNode.setFieldList(streamFields);
StreamNode rightNode = new BlankStreamNode();
- rightNode.setFields(streamFields);
+ rightNode.setFieldList(streamFields);
JoinerDefinition joinerDefinition = new JoinerDefinition(leftNode,
rightNode, streamFields, streamFields,
JoinMode.INNER_JOIN);
String definitionJson = gson.toJson(joinerDefinition);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/ck/ClickHouseSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/ck/ClickHouseSinkOperation.java
index a8a48ff80..9824a47ea 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/ck/ClickHouseSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/ck/ClickHouseSinkOperation.java
@@ -147,7 +147,7 @@ public class ClickHouseSinkOperation implements
StreamSinkOperation {
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/es/ElasticsearchSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/es/ElasticsearchSinkOperation.java
index d605b0027..aa1c612ee 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/es/ElasticsearchSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/es/ElasticsearchSinkOperation.java
@@ -147,7 +147,7 @@ public class ElasticsearchSinkOperation implements
StreamSinkOperation {
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/greenplum/GreenplumSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/greenplum/GreenplumSinkOperation.java
index 03f7b4712..2e57797df 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/greenplum/GreenplumSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/greenplum/GreenplumSinkOperation.java
@@ -143,7 +143,7 @@ public class GreenplumSinkOperation implements
StreamSinkOperation {
StreamSink response = this.getFromEntity(entity, GreenplumSink::new);
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hbase/HBaseSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hbase/HBaseSinkOperation.java
index ca207a165..b82a12bbb 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hbase/HBaseSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hbase/HBaseSinkOperation.java
@@ -143,7 +143,7 @@ public class HBaseSinkOperation implements
StreamSinkOperation {
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hdfs/HdfsSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hdfs/HdfsSinkOperation.java
index 77e23f0fe..7da67db57 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hdfs/HdfsSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hdfs/HdfsSinkOperation.java
@@ -143,7 +143,7 @@ public class HdfsSinkOperation implements
StreamSinkOperation {
StreamSink response = this.getFromEntity(entity, HdfsSink::new);
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java
index 144c263bc..c345a3013 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java
@@ -147,7 +147,7 @@ public class HiveSinkOperation implements
StreamSinkOperation {
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/iceberg/IcebergSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/iceberg/IcebergSinkOperation.java
index 46aa16f75..e1c1a6764 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/iceberg/IcebergSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/iceberg/IcebergSinkOperation.java
@@ -167,7 +167,7 @@ public class IcebergSinkOperation implements
StreamSinkOperation {
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/kafka/KafkaSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/kafka/KafkaSinkOperation.java
index 38814b409..33fec7b74 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/kafka/KafkaSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/kafka/KafkaSinkOperation.java
@@ -143,7 +143,7 @@ public class KafkaSinkOperation implements
StreamSinkOperation {
StreamSink response = this.getFromEntity(entity, KafkaSink::new);
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/mysql/MySQLSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/mysql/MySQLSinkOperation.java
index 2ba28953f..ae43289c3 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/mysql/MySQLSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/mysql/MySQLSinkOperation.java
@@ -143,7 +143,7 @@ public class MySQLSinkOperation implements
StreamSinkOperation {
StreamSink response = this.getFromEntity(entity, MySQLSink::new);
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/postgres/PostgresSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/postgres/PostgresSinkOperation.java
index bb7cbecbd..dbb59ff85 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/postgres/PostgresSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/postgres/PostgresSinkOperation.java
@@ -142,7 +142,7 @@ public class PostgresSinkOperation implements
StreamSinkOperation {
StreamSink response = this.getFromEntity(entity, PostgresSink::new);
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/sqlserver/SqlServerSinkOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/sqlserver/SqlServerSinkOperation.java
index cd6cb1b82..23d2b823a 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/sqlserver/SqlServerSinkOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/sqlserver/SqlServerSinkOperation.java
@@ -143,7 +143,7 @@ public class SqlServerSinkOperation implements
StreamSinkOperation {
StreamSink response = this.getFromEntity(entity, SqlServerSink::new);
List<StreamSinkFieldEntity> entities =
sinkFieldMapper.selectBySinkId(entity.getId());
List<SinkField> infos = CommonBeanUtils.copyListProperties(entities,
SinkField::new);
- response.setFieldList(infos);
+ response.setSinkFieldList(infos);
return response;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/LoadNodeUtils.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/LoadNodeUtils.java
index ddc972983..5cdcfba54 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/LoadNodeUtils.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/LoadNodeUtils.java
@@ -119,7 +119,7 @@ public class LoadNodeUtils {
public static KafkaLoadNode createLoadNode(KafkaSink kafkaSink) {
String id = kafkaSink.getSinkName();
String name = kafkaSink.getSinkName();
- List<SinkField> fieldList = kafkaSink.getFieldList();
+ List<SinkField> fieldList = kafkaSink.getSinkFieldList();
List<FieldInfo> fieldInfos = fieldList.stream()
.map(field -> FieldInfoUtils.parseSinkFieldInfo(field, name))
.collect(Collectors.toList());
@@ -174,7 +174,7 @@ public class LoadNodeUtils {
public static HiveLoadNode createLoadNode(HiveSink hiveSink) {
String id = hiveSink.getSinkName();
String name = hiveSink.getSinkName();
- List<SinkField> fieldList = hiveSink.getFieldList();
+ List<SinkField> fieldList = hiveSink.getSinkFieldList();
List<FieldInfo> fields = fieldList.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
.collect(Collectors.toList());
@@ -213,7 +213,7 @@ public class LoadNodeUtils {
public static HbaseLoadNode createLoadNode(HBaseSink hbaseSink) {
String id = hbaseSink.getSinkName();
String name = hbaseSink.getSinkName();
- List<SinkField> fieldList = hbaseSink.getFieldList();
+ List<SinkField> fieldList = hbaseSink.getSinkFieldList();
List<FieldInfo> fields = fieldList.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
.collect(Collectors.toList());
@@ -244,7 +244,7 @@ public class LoadNodeUtils {
* Create load node of PostgreSQL.
*/
public static PostgresLoadNode createLoadNode(PostgresSink postgresSink) {
- List<SinkField> fieldList = postgresSink.getFieldList();
+ List<SinkField> fieldList = postgresSink.getSinkFieldList();
String name = postgresSink.getSinkName();
List<FieldInfo> fields = fieldList.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
@@ -272,7 +272,7 @@ public class LoadNodeUtils {
* Create load node of ClickHouse.
*/
public static ClickHouseLoadNode createLoadNode(ClickHouseSink ckSink) {
- List<SinkField> sinkFields = ckSink.getFieldList();
+ List<SinkField> sinkFields = ckSink.getSinkFieldList();
String name = ckSink.getSinkName();
List<FieldInfo> fields = sinkFields.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
@@ -302,7 +302,7 @@ public class LoadNodeUtils {
String id = icebergSink.getSinkName();
String name = icebergSink.getSinkName();
CatalogType catalogType =
CatalogType.forName(icebergSink.getCatalogType());
- List<SinkField> sinkFields = icebergSink.getFieldList();
+ List<SinkField> sinkFields = icebergSink.getSinkFieldList();
List<FieldInfo> fields = sinkFields.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
.collect(Collectors.toList());
@@ -334,7 +334,7 @@ public class LoadNodeUtils {
public static SqlServerLoadNode createLoadNode(SqlServerSink
sqlServerSink) {
final String id = sqlServerSink.getSinkName();
final String name = sqlServerSink.getSinkName();
- final List<SinkField> fieldList = sqlServerSink.getFieldList();
+ final List<SinkField> fieldList = sqlServerSink.getSinkFieldList();
List<FieldInfo> fields = fieldList.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
.collect(Collectors.toList());
@@ -366,7 +366,7 @@ public class LoadNodeUtils {
public static ElasticsearchLoadNode createLoadNode(ElasticsearchSink
elasticsearchSink) {
final String id = elasticsearchSink.getSinkName();
final String name = elasticsearchSink.getSinkName();
- final List<SinkField> fieldList = elasticsearchSink.getFieldList();
+ final List<SinkField> fieldList = elasticsearchSink.getSinkFieldList();
List<FieldInfo> fields = fieldList.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
.collect(Collectors.toList());
@@ -399,7 +399,7 @@ public class LoadNodeUtils {
public static FileSystemLoadNode createLoadNode(HdfsSink hdfsSink) {
String id = hdfsSink.getSinkName();
String name = hdfsSink.getSinkName();
- List<SinkField> fieldList = hdfsSink.getFieldList();
+ List<SinkField> fieldList = hdfsSink.getSinkFieldList();
List<FieldInfo> fields = fieldList.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
.collect(Collectors.toList());
@@ -436,7 +436,7 @@ public class LoadNodeUtils {
public static GreenplumLoadNode createLoadNode(GreenplumSink
greenplumSink) {
String id = greenplumSink.getSinkName();
String name = greenplumSink.getSinkName();
- List<SinkField> fieldList = greenplumSink.getFieldList();
+ List<SinkField> fieldList = greenplumSink.getSinkFieldList();
List<FieldInfo> fields = fieldList.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
.collect(Collectors.toList());
@@ -466,7 +466,7 @@ public class LoadNodeUtils {
public static MySqlLoadNode createLoadNode(MySQLSink mysqlSink) {
String id = mysqlSink.getSinkName();
String name = mysqlSink.getSinkName();
- List<SinkField> fieldList = mysqlSink.getFieldList();
+ List<SinkField> fieldList = mysqlSink.getSinkFieldList();
List<FieldInfo> fields = fieldList.stream()
.map(sinkField -> FieldInfoUtils.parseSinkFieldInfo(sinkField,
name))
.collect(Collectors.toList());
