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

Jump to bottom

Allow merging index column with data column using keyword "on" #7736

Merged
merged 190 commits into from
Apr 2, 2021
Merged

Allow merging index column with data column using keyword "on" #7736

merged 190 commits into from
Apr 2, 2021

Conversation

skirui-source
Copy link
Contributor

fixes #5014
replaces PR #7569

shwina added 30 commits December 11, 2020 15:58
@shwina
Merge branch 'branch-0.17' into branch-0.18
4a4b4af
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
223f2b5 
…ranch-0.18
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
abd6ad2 
…ranch-0.18
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
18863b5 
…ranch-0.18
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
0fbdd31 
…ranch-0.18
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
dc9b943 
…ranch-0.18
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
d586aa7 
…ranch-0.18
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
996fda8 
…ranch-0.18
@shwina
Add a compute_hash_join_indices that returns just the join indices
2808a5c
@shwina
Don't need common_columns stuff for join that returns a gathermap
ef0baee
@shwina
Add hash_join_impl methods that return gathermaps
18f3074
@shwina
Add overloads to public hash_join class
70abf48
@shwina
Add top-level join APIs that return gathermaps
13dff67
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into g…
3300fe1 
…athermap-based-join-apis
@shwina
Use device_uvector instead of device_vector in join
7ed694c
@shwina
Undo some API changes
636c2ea
@shwina
Add join_result
b79da68
@shwina
Add APIs that return join_result
380aa59
@shwina
Remove column_in_common
3cbb2b4
@shwina
Add an inner join API that returns gathermaps
53ae7c9
@shwina
Add remaining APIs to return gathermaps
fde172b
@shwina
Add gathermap join test
4a286dd
@shwina
Replace -1 with INT_MIN
c756db9
@shwina
Make join_result columns instead of column_views
6a3d23e
@shwina
Replace join_result with a pair of columns
5dfc2a0
@shwina
Add gathermap test for outer join
362829b
@shwina
Add and pass full join gathermap test
4e4380c
@shwina
Begin Python-side refactor
339a13d
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into g…
2b07802 
…athermap-based-join-apis
@shwina
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into g…
0d5a19c 
…athermap-based-join-apis
@github-actions github-actions bot removed the libcudf Affects libcudf (C++/CUDA) code. label Mar 30, 2021
@kkraus14 kkraus14 removed request for a team and kkraus14 March 30, 2021 18:57
@skirui-source skirui-source added 3 - Ready for Review Ready for review by team and removed 2 - In Progress Currently a work in progress labels Mar 30, 2021
@skirui-source skirui-source requested a review from kkraus14 April 1, 2021 03:59
isVoid
isVoid requested changes Apr 1, 2021
View reviewed changes
Copy link
Contributor

@isVoid isVoid left a comment

Choose a reason for hiding this comment

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

This feature lacks test cases.

python/cudf/cudf/core/join/join.py Outdated Show resolved Hide resolved
python/cudf/cudf/core/join/join.py Outdated Show resolved Hide resolved
python/cudf/cudf/core/join/join.py Outdated Show resolved Hide resolved
@kkraus14
Copy link
Collaborator

kkraus14 commented Apr 1, 2021

This needs tests as well

vyasr
vyasr requested changes Apr 2, 2021
View reviewed changes
Copy link
Contributor

@vyasr vyasr left a comment

Choose a reason for hiding this comment

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

Nice work! I suggested some improvements.

python/cudf/cudf/core/join/join.py Outdated Show resolved Hide resolved
python/cudf/cudf/core/join/join.py Outdated Show resolved Hide resolved
python/cudf/cudf/tests/test_joining.py Outdated Show resolved Hide resolved
isVoid
isVoid approved these changes Apr 2, 2021
View reviewed changes
Copy link
Contributor

@isVoid isVoid left a comment

Choose a reason for hiding this comment

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

lgtm cc @kkraus14 for a second look

@vyasr vyasr added 5 - Ready to Merge Testing and reviews complete, ready to merge and removed 3 - Ready for Review Ready for review by team labels Apr 2, 2021
@kkraus14
Copy link
Collaborator

kkraus14 commented Apr 2, 2021

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 1825001 into rapidsai:branch-0.19 Apr 2, 2021
shwina pushed a commit to shwina/cudf that referenced this pull request Apr 7, 2021
@skirui-source @shwina
Allow merging index column with data column using keyword "on" (rapid…
6338e9c 
…sai#7736)

fixes rapidsai#5014 
replaces PR rapidsai#7569

Authors:
  - https://github.com/skirui-source
  - Ashwin Srinath (https://github.com/shwina)
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Michael Wang (https://github.com/isVoid)
  - Keith Kraus (https://github.com/kkraus14)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: rapidsai#7736
@skirui-source skirui-source deleted the mergeindexondata branch May 6, 2021 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@isVoid isVoid isVoid approved these changes

@kkraus14 kkraus14 kkraus14 approved these changes

@vyasr vyasr vyasr approved these changes

@shwina shwina Awaiting requested review from shwina

Assignees
No one assigned
Labels
5 - Ready to Merge Testing and reviews complete, ready to merge breaking Breaking change feature request New feature or request Python Affects Python cuDF API.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEA] Allow merging an index column with data column using keyword "on"
5 participants
@skirui-source @kkraus14 @vyasr @shwina @isVoid