-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
[FLINK-36794] [cdc-composer/cli] pipeline cdc connector support multiple data sources #3844
Open
linjianchang
wants to merge
1
commit into
apache:master
Choose a base branch
from
linjianchang:master-36794
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -97,6 +97,13 @@ public class YamlPipelineDefinitionParser implements PipelineDefinitionParser { | |
|
||
public static final String TRANSFORM_TABLE_OPTION_KEY = "table-options"; | ||
|
||
private static final String HOST_LIST = "host_list"; | ||
private static final String COMMA = ","; | ||
private static final String HOST_NAME = "hostname"; | ||
private static final String PORT = "port"; | ||
private static final String COLON = ":"; | ||
private static final String MUTIPLE = "_mutiple"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should be |
||
|
||
private final ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); | ||
|
||
/** Parse the specified pipeline definition file. */ | ||
|
@@ -135,13 +142,35 @@ private PipelineDef parse(JsonNode pipelineDefJsonNode, Configuration globalPipe | |
SchemaChangeBehavior schemaChangeBehavior = | ||
userPipelineConfig.get(PIPELINE_SCHEMA_CHANGE_BEHAVIOR); | ||
|
||
// JsonNode root = mapper.readTree(pipelineDefPath.toFile()); | ||
JsonNode sourceNode = pipelineDefJsonNode.get(SOURCE_KEY); | ||
JsonNode hostList = sourceNode.get(HOST_LIST); | ||
String type = sourceNode.get(TYPE_KEY).asText(); | ||
List<SourceDef> sourceDefs = new ArrayList<>(); | ||
if (hostList != null && type.contains(MUTIPLE)) { | ||
String hostString = hostList.asText(); | ||
String[] hosts = hostString.split(COMMA); | ||
Arrays.stream(hosts) | ||
.forEach( | ||
e -> { | ||
((ObjectNode) sourceNode) | ||
.put(TYPE_KEY, type.substring(0, type.indexOf("_"))); | ||
((ObjectNode) sourceNode).put(HOST_NAME, e.split(COLON)[0]); | ||
((ObjectNode) sourceNode).put(PORT, e.split(COLON)[1]); | ||
((ObjectNode) sourceNode).remove(HOST_LIST); | ||
getSourceDefs(sourceNode, sourceDefs); | ||
}); | ||
} else { | ||
// Source is required | ||
getSourceDefs(sourceNode, sourceDefs); | ||
} | ||
// Source is required | ||
SourceDef sourceDef = | ||
toSourceDef( | ||
checkNotNull( | ||
pipelineDefJsonNode.get(SOURCE_KEY), | ||
"Missing required field \"%s\" in pipeline definition", | ||
SOURCE_KEY)); | ||
// SourceDef sourceDef = | ||
// toSourceDef( | ||
// checkNotNull( | ||
// pipelineDefJsonNode.get(SOURCE_KEY), | ||
// "Missing required field \"%s\" in pipeline definition", | ||
// SOURCE_KEY)); | ||
|
||
// Sink is required | ||
SinkDef sinkDef = | ||
|
@@ -171,7 +200,17 @@ private PipelineDef parse(JsonNode pipelineDefJsonNode, Configuration globalPipe | |
pipelineConfig.addAll(userPipelineConfig); | ||
|
||
return new PipelineDef( | ||
sourceDef, sinkDef, routeDefs, transformDefs, udfDefs, modelDefs, pipelineConfig); | ||
sourceDefs, sinkDef, routeDefs, transformDefs, udfDefs, modelDefs, pipelineConfig); | ||
} | ||
|
||
private void getSourceDefs(JsonNode root, List<SourceDef> sourceDefs) { | ||
SourceDef sourceDef = | ||
toSourceDef( | ||
checkNotNull( | ||
root, | ||
"Missing required field \"%s\" in pipeline definition", | ||
SOURCE_KEY)); | ||
sourceDefs.add(sourceDef); | ||
} | ||
|
||
private SourceDef toSourceDef(JsonNode sourceNode) { | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we use a new key like 'sources' to describe multiple sources? The '_multiple' suffix in value seems a bit odd. Because the YAML content does not correspond one-to-one with the PipelineDef.