Improvements to the Merge routine #5778
Merged
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
added 2 commits
April 30, 2021 15:02
pgovind
commented
Apr 30, 2021
| @@ -1152,7 +1152,7 @@ public void TestGroupBy() | |||
| if (originalColumn.Name == "Bool") | |||
| continue; | |||
| DataFrameColumn headColumn = head.Columns[originalColumn.Name]; | |||
| Assert.Equal(originalColumn[5], headColumn[verify[5]]); | |||
| Assert.Equal(originalColumn[7], headColumn[verify[5]]); | |||
There was a problem hiding this comment.
5 -> 7 because null is not equivalent to default in the GroupBy method anymore
pgovind
commented
Apr 30, 2021
| @@ -1658,7 +1658,7 @@ public void TestMerge() | |||
| Assert.Equal(16, merge.Rows.Count); | |||
| Assert.Equal(merge.Columns.Count, left.Columns.Count + right.Columns.Count); | |||
| Assert.Null(merge.Columns["Int_left"][12]); | |||
| Assert.Null(merge.Columns["Int_left"][5]); | |||
| Assert.Null(merge.Columns["Int_left"][15]); | |||
There was a problem hiding this comment.
5 -> 15 because we don't preserve the ordering of rows in OuterJoin, so rows with null values in the Column we are merging on will always go to the end. I don't think this needs to be a requirement. If somebody requests it at some point, we can think about preserving the ordering then.
Codecov Report
@@ Coverage Diff @@
## main #5778 +/- ##
==========================================
+ Coverage 68.33% 68.40% +0.07%
==========================================
Files 1131 1131
Lines 241008 241156 +148
Branches 25025 25033 +8
==========================================
+ Hits 164686 164957 +271
+ Misses 69824 69716 -108
+ Partials 6498 6483 -15
Flags with carried forward coverage won't be shown. Click here to find out more.
|
eerhardt
reviewed
May 3, 2021
eerhardt
reviewed
May 3, 2021
| for (long i = 0; i < matchedFullRows.Length; i++) | ||
| { | ||
| int rowIndex = matchedFullRows[i]; | ||
| MatchRowsOnMergedDataFrame(merge, left, right, rowIndex, rowIndex, rowIndex); |
There was a problem hiding this comment.
It's actually a part of TestMergeEdgeCases_Left, but I added one now anyway
eerhardt
approved these changes
May 5, 2021
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Currently, we don't differentiate between
nullvalues anddefaultvalues in columns. As a result, these values are considered equivalent in theMergeroutine. This PR fixes that by handling them separately. Also added unit tests so we don't regress in the future.Fixes #5765 and contributes to #5691