Skip to content

[FLINK-36174][hotfix] CDC yaml without pipeline should not throw exception. #3588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruanhang1993 merged 3 commits into from
Oct 29, 2024
Merged

[FLINK-36174][hotfix] CDC yaml without pipeline should not throw exception. #3588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04f9cb8
[FLINK-36174][hotfix] CDC yaml without pipeline should not throw exce…
loserwang1024 Aug 29, 2024
2732cd9
add test
loserwang1024 Aug 29, 2024
1baa069
fix test
loserwang1024 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...k-cdc-cli/src/main/java/org/apache/flink/cdc/cli/parser/YamlPipelineDefinitionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,11 @@ private PipelineDef parse(JsonNode pipelineDefJsonNode, Configuration globalPipe
// UDFs are optional. We parse UDF first and remove it from the pipelineDefJsonNode since
// it's not of plain data types and must be removed before calling toPipelineConfig.
List<UdfDef> udfDefs = new ArrayList<>();
Optional.ofNullable(((ObjectNode) pipelineDefJsonNode.get(PIPELINE_KEY)).remove(UDF_KEY))
.ifPresent(node -> node.forEach(udf -> udfDefs.add(toUdfDef(udf))));
if (pipelineDefJsonNode.get(PIPELINE_KEY) != null) {
Optional.ofNullable(
((ObjectNode) pipelineDefJsonNode.get(PIPELINE_KEY)).remove(UDF_KEY))
.ifPresent(node -> node.forEach(udf -> udfDefs.add(toUdfDef(udf))));
}

// Pipeline configs are optional
Configuration userPipelineConfig = toPipelineConfig(pipelineDefJsonNode.get(PIPELINE_KEY));
Expand Down
5 changes: 4 additions & 1 deletion ...c-cli/src/test/java/org/apache/flink/cdc/cli/parser/YamlPipelineDefinitionParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.net.URL;
import java.nio.file.Paths;
import java.time.Duration;
import java.time.ZoneId;
import java.util.Arrays;
import java.util.Collections;

Expand Down Expand Up @@ -426,7 +427,9 @@ void testParsingFullDefinitionFromString() throws Exception {
Collections.emptyList(),
Collections.emptyList(),
Collections.emptyList(),
Configuration.fromMap(Collections.singletonMap("parallelism", "1")));
Configuration.fromMap(
Collections.singletonMap(
"local-time-zone", ZoneId.systemDefault().toString())));

private final PipelineDef fullDefWithRouteRepSym =
new PipelineDef(
Expand Down
3 changes: 0 additions & 3 deletions flink-cdc-cli/src/test/resources/definitions/pipeline-definition-minimized.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@ source:

sink:
type: kafka

pipeline:
parallelism: 1