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/02/02 03:31:51 UTC
[inlong] branch master updated: [INLONG-7306][Sort] Use properties to save extended parameters in Redis LoadNode (#7307)
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 084903ef5 [INLONG-7306][Sort] Use properties to save extended parameters in Redis LoadNode (#7307)
084903ef5 is described below
commit 084903ef572cb5cf0201efd01882dfae418b751c
Author: feat <fe...@outlook.com>
AuthorDate: Thu Feb 2 11:31:45 2023 +0800
[INLONG-7306][Sort] Use properties to save extended parameters in Redis LoadNode (#7307)
---
.../inlong/sort/protocol/node/load/RedisLoadNode.java | 14 +++-----------
.../apache/inlong/sort/parser/RedisNodeSqlParserTest.java | 1 -
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/RedisLoadNode.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/RedisLoadNode.java
index 2ee12a9c7..f17dd3602 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/RedisLoadNode.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/RedisLoadNode.java
@@ -36,7 +36,6 @@ import org.apache.inlong.sort.protocol.transformation.FilterFunction;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.Serializable;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -79,10 +78,6 @@ public class RedisLoadNode extends LoadNode implements InlongMetric, Serializabl
public static final String CONNECTOR_KEY = "connector";
public static final String CONNECTOR_REDIS_INLONG = "redis-inlong";
private Format format;
-
- @JsonProperty("extList")
- private List<HashMap<String, String>> extList;
-
private String clusterMode;
private String dataType;
private String schemaMapMode;
@@ -116,7 +111,6 @@ public class RedisLoadNode extends LoadNode implements InlongMetric, Serializabl
@JsonProperty("filterStrategy") FilterStrategy filterStrategy,
@Nullable @JsonProperty("sinkParallelism") Integer sinkParallelism,
@JsonProperty("properties") Map<String, String> properties,
- @JsonProperty("extList") List<HashMap<String, String>> extList,
@JsonProperty("clusterMode") String clusterMode,
@JsonProperty("dataType") String dataType,
@JsonProperty("schemaMapMode") String schemaMapMode,
@@ -137,7 +131,6 @@ public class RedisLoadNode extends LoadNode implements InlongMetric, Serializabl
@Nullable @JsonProperty("maxRetries") Integer maxRetries) {
super(id, name, fields, fieldRelations, filters, filterStrategy, sinkParallelism, properties);
- this.extList = extList;
this.clusterMode = clusterMode;
this.dataType = dataType;
this.schemaMapMode = schemaMapMode;
@@ -215,12 +208,11 @@ public class RedisLoadNode extends LoadNode implements InlongMetric, Serializabl
// If the extend attributes starts with .ddl,
// it will be passed to the ddl statement of the table
- if (extList != null) {
- extList.forEach(ext -> {
- String keyName = ext.get(EXTEND_ATTR_KEY_NAME);
+ Map<String, String> properties = getProperties();
+ if (properties != null) {
+ properties.forEach((keyName, ddlValue) -> {
if (StringUtils.isNoneBlank(keyName) && keyName.startsWith(DDL_ATTR_PREFIX)) {
String ddlKeyName = keyName.substring(DDL_ATTR_PREFIX.length());
- String ddlValue = ext.get(EXTEND_ATTR_VALUE_NAME);
options.put(ddlKeyName, ddlValue);
}
});
diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java
index f5ea25b08..9f0a43c4d 100644
--- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java
+++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java
@@ -98,7 +98,6 @@ public class RedisNodeSqlParserTest extends AbstractTestBase {
null,
null,
null,
- null,
"standalone",
"HASH",
"STATIC_PREFIX_MATCH",