Skip to content
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

chore: fix alias resolution in n-way join logic #7592

Merged
merged 1 commit into from
May 26, 2021
Merged

chore: fix alias resolution in n-way join logic #7592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ksqldb-engine/src/main/java/io/confluent/ksql/planner/plan/JoinNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ public Stream<ColumnName> resolveSelectStar(
void validateKeyPresent(final SourceName sinkName, final Projection projection) {

if (joinKey.isForeignKey()) {
final DataSource leftInputTable = getLeftmostSourceNode().getDataSource();
final SourceName leftInputTableName = leftInputTable.getName();
final List<Column> leftInputTableKeys = leftInputTable.getSchema().key();
final DataSourceNode leftInputTable = getLeftmostSourceNode();
final SourceName leftInputTableName = leftInputTable.getAlias();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the actual fix: getAlias return the alias is there is one; otherwise the table name.

final List<Column> leftInputTableKeys = leftInputTable.getDataSource().getSchema().key();
final List<Column> missingKeys =
leftInputTableKeys.stream().filter(
k -> !projection.containsExpression(
Expand Down
22 changes: 11 additions & 11 deletions ksqldb-functional-tests/src/test/resources/query-validation-tests/fk-join.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
],
"post": {
"sources": [
{"name": "OUTPUT", "type": "table", "schema": "LT_ID BIGINT KEY, RT_ID_ALIAS STRING, NAME_ALIAS STRING, F1 STRING"}
{"name": "OUTPUT", "type": "table", "schema": "LT_ID BIGINT KEY, RT_ID_ALIAS BIGINT, NAME_ALIAS STRING, F1 STRING"}
]
}
},
Expand Down Expand Up @@ -388,14 +388,14 @@
{"topic": "OUTPUT", "key": 0, "value": {"RT_ID": null, "NAME": "foo", "F1": null}, "timestamp": 13000},
{"topic": "OUTPUT", "key": 1, "value": {"RT_ID": 0, "NAME": "zero", "F1": "a"}, "timestamp": 15000},
{"topic": "OUTPUT", "key": 10, "value": {"RT_ID": 0, "NAME": "bar", "F1": "a"}, "timestamp": 16000},
{"topic": "OUTPUT", "key": 1, "value": null, "timestamp": 17000},
{"topic": "OUTPUT", "key": 10, "value": null, "timestamp": 17000},
{"topic": "OUTPUT", "key": 1, "value": {"RT_ID": null, "NAME": "zero", "F1": null}, "timestamp": 17000},
{"topic": "OUTPUT", "key": 10, "value": {"RT_ID": null, "NAME": "bar", "F1": null}, "timestamp": 17000},
{"topic": "OUTPUT", "key": 1, "value": null, "timestamp": 18000},
{"topic": "OUTPUT", "key": 0, "value": null, "timestamp": 19000}
],
"post": {
"sources": [
{"name": "OUTPUT", "type": "table", "schema": "LT_ID BIGINT KEY, RT_ID STRING, NAME STRING, F1 STRING"}
{"name": "OUTPUT", "type": "table", "schema": "LT_ID BIGINT KEY, RT_ID BIGINT, NAME STRING, F1 STRING"}
]
}
},
Expand Down Expand Up @@ -462,14 +462,14 @@
{"topic": "OUTPUT", "key": 0, "value": {"RT_ID_ALIAS": null, "NAME_ALIAS": "foo", "F1": null}, "timestamp": 13000},
{"topic": "OUTPUT", "key": 1, "value": {"RT_ID_ALIAS": 0, "NAME_ALIAS": "zero", "F1": "a"}, "timestamp": 15000},
{"topic": "OUTPUT", "key": 10, "value": {"RT_ID_ALIAS": 0, "NAME_ALIAS": "bar", "F1": "a"}, "timestamp": 16000},
{"topic": "OUTPUT", "key": 1, "value": null, "timestamp": 17000},
{"topic": "OUTPUT", "key": 10, "value": null, "timestamp": 17000},
{"topic": "OUTPUT", "key": 1, "value": {"RT_ID_ALIAS": null, "NAME_ALIAS": "zero", "F1": null}, "timestamp": 17000},
{"topic": "OUTPUT", "key": 10, "value": {"RT_ID_ALIAS": null, "NAME_ALIAS": "bar", "F1": null}, "timestamp": 17000},
{"topic": "OUTPUT", "key": 1, "value": null, "timestamp": 18000},
{"topic": "OUTPUT", "key": 0, "value": null, "timestamp": 19000}
],
"post": {
"sources": [
{"name": "OUTPUT", "type": "table", "schema": "LT_ID BIGINT KEY, RT_ID_ALIAS STRING, NAME_ALIAS STRING, F1 STRING"}
{"name": "OUTPUT", "type": "table", "schema": "LT_ID BIGINT KEY, RT_ID_ALIAS BIGINT, NAME_ALIAS STRING, F1 STRING"}
]
}
},
Expand Down Expand Up @@ -606,14 +606,14 @@
{"topic": "left_topic", "key": 1, "value": null, "timestamp": 18000}
],
"outputs": [
{"topic": "OUTPUT", "key": 1, "value": {"LT_NAME": "zero", "LT_VALUE": 0, "RT_R_ID": null, "RT_F1": null, "RT_F2": 4, "NAME_ALIAS": "zero"}, ",timestamp": 0},
{"topic": "OUTPUT", "key": 1, "value": {"LT_NAME": "zero", "LT_VALUE": 0, "RT_R_ID": 0, "RT_F1": "blah", "RT_F2": 4, "NAME_ALIAS": "zero"}, "timestamp": 10000},
{"topic": "OUTPUT", "key": 1, "value": {"LT_NAME": "zero", "LT_VALUE": 0, "RT_R_ID": 0, "RT_F1": "blah", "RT_F2": 4, "NAME_ALIAS": "zero"}, "timestamp": 11000},
{"topic": "OUTPUT", "key": 1, "value": {"LT_NAME": "zero", "LT_FOREIGN_KEY": 0, "RT_R_ID": null, "RT_F1": null, "RT_F2": null, "NAME_ALIAS": "zero"}, ",timestamp": 0},
{"topic": "OUTPUT", "key": 1, "value": {"LT_NAME": "zero", "LT_FOREIGN_KEY": 0, "RT_R_ID": 0, "RT_F1": "blah", "RT_F2": 4, "NAME_ALIAS": "zero"}, "timestamp": 10000},
{"topic": "OUTPUT", "key": 1, "value": {"LT_NAME": "zero", "LT_FOREIGN_KEY": 0, "RT_R_ID": 0, "RT_F1": "blah", "RT_F2": 4, "NAME_ALIAS": "zero"}, "timestamp": 11000},
{"topic": "OUTPUT", "key": 1, "value": null, "timestamp": 18000}
],
"post": {
"sources": [
{"name": "OUTPUT", "type": "table", "schema": "LT_L_ID BIGINT KEY, LT_NAME STRING, LT_VALUE BIGINT, RT_R_ID BIGINT, RT_F1 STRING, RT_F2 BIGINT, NAME_ALIAS STRING"}
{"name": "OUTPUT", "type": "table", "schema": "LT_L_ID BIGINT KEY, LT_NAME STRING, LT_FOREIGN_KEY BIGINT, RT_R_ID BIGINT, RT_F1 STRING, RT_F2 BIGINT, NAME_ALIAS STRING"}
]
}
},
Expand Down