[BUG] Fix join errors with same key name joins (resolves #2649) #2877
+92
−7
Conversation
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
CodSpeed Performance ReportMerging #2877 will not alter performanceComparing Summary
|
anmolsingh20
force-pushed
the
fix_same_key_name_join_errors_2649
branch
3 times, most recently
from
3fd90e2 to
569d611
Compare
|
Just assigned @kevinzwang and @colin-ho for the review! |
kevinzwang
reviewed
Sep 23, 2024
anmolsingh20
force-pushed
the
fix_same_key_name_join_errors_2649
branch
2 times, most recently
from
53aa100 to
239e7b2
Compare
kevinzwang
reviewed
Sep 26, 2024
kevinzwang
reviewed
Sep 26, 2024
anmolsingh20
force-pushed
the
fix_same_key_name_join_errors_2649
branch
from
239e7b2 to
a431fb9
Compare
…#2649) The issue fixed here had a workaround previously - aliasing the duplicate column name. This is not needed anymore as the aliasing is performed under the hood, taking care of uniqueness of individual column keys to avoid the duplicate issue.
anmolsingh20
force-pushed
the
fix_same_key_name_join_errors_2649
branch
from
a431fb9 to
111995e
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2877 +/- ##
==========================================
+ Coverage 65.98% 66.65% +0.67%
==========================================
Files 1008 1011 +3
Lines 113417 115576 +2159
==========================================
+ Hits 74836 77037 +2201
+ Misses 38581 38539 -42
|
anmolsingh20
force-pushed
the
fix_same_key_name_join_errors_2649
branch
from
6dd44b7 to
653b43c
Compare
kevinzwang
reviewed
Oct 3, 2024
Comment on lines
224
to
232
| (Expr::Column(_), Expr::Column(_)) if left_expr != right_expr => { | ||
| let unique_id = Uuid::new_v4().to_string(); | ||
| let renamed_left_expr = | ||
| left_expr.alias(format!("{}_{}", left_expr.name(), unique_id)); | ||
| let renamed_right_expr = | ||
| right_expr.alias(format!("{}_{}", right_expr.name(), unique_id)); | ||
| (renamed_left_expr, renamed_right_expr) | ||
| } | ||
| _ => (left_expr, right_expr), |
There was a problem hiding this comment.
Quick comment: If the join keys are not column expressions, we may still want to rename them. The only time when we wouldn't want to rename is when they are both equal and column expressions. So I think the match arms would look something like this instead:
(Expr::Column(l_name), Expr::Column(r_name)) if l_name == r_name => (left_expr, right_expr),
_ => {
// the stuff you have here
}There was a problem hiding this comment.
Good point, made a quick update!
Rename join keys except when they share the same key name and are Column expression types; include original expression name in the renamed expression.
anmolsingh20
force-pushed
the
fix_same_key_name_join_errors_2649
branch
from
653b43c to
1f661b4
Compare
|
Looks good to me! @anmolsingh20 thanks again for taking your time to add this |
sagiahrac
pushed a commit
to sagiahrac/Daft
that referenced
this pull request
Oct 7, 2024
…#2649) (Eventual-Inc#2877) The issue fixed here had a workaround previously - aliasing the duplicate column name. This is not needed anymore as the aliasing is performed under the hood, taking care of uniqueness of individual column keys to avoid the duplicate issue. --------- Co-authored-by: AnmolS <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The issue fixed here had a workaround previously - aliasing the duplicate column name. This is not needed anymore as the aliasing is performed under the hood, taking care of uniqueness of individual column keys to avoid the duplicate issue.