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

Enable sorting on column with nulls using query-planning #15639

Merged
merged 7 commits into from
May 9, 2024
Merged

Enable sorting on column with nulls using query-planning #15639

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8c437d
add custom RepartitionQuantiles graph
rjzamora May 2, 2024
d9c75b2
remove some fluff
rjzamora May 2, 2024
98cbbac
handle empty data
rjzamora May 2, 2024
239dca8
Merge remote-tracking branch 'upstream/branch-24.06' into handle-null…
rjzamora May 2, 2024
99e1db5
avoid RepartitionQuantiles patching
rjzamora May 6, 2024
b057fd9
Merge remote-tracking branch 'upstream/branch-24.06' into handle-null…
rjzamora May 6, 2024
7c7d31d
Merge branch 'branch-24.06' into handle-null-sorting
rjzamora May 9, 2024
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
2 changes: 1 addition & 1 deletion python/dask_cudf/dask_cudf/backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ def categorical_dtype_cudf(categories=None, ordered=False):
@tolist_dispatch.register((cudf.Series, cudf.BaseIndex))
@_dask_cudf_nvtx_annotate
def tolist_cudf(obj):
return obj.to_arrow().to_pylist()
return obj.to_pandas().tolist()


@is_categorical_dtype_dispatch.register(
Expand Down
2 changes: 1 addition & 1 deletion python/dask_cudf/dask_cudf/tests/test_sort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def test_sort_repartition():
dd.assert_eq(len(new_ddf), len(ddf))


@xfail_dask_expr("dask-expr code path fails with nulls")
@xfail_dask_expr("missing null support", lt_version="2024.5.1")
Copy link
Member Author

Choose a reason for hiding this comment

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

I'd like this test to run for anything newer than the "2024.5.0" release (including main). Not sure of the "correct" way to do this.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think that is correct. pytest.mark.xfail(some_condition, reason="some_reason") which is what this expands to is the canonical way.

@pytest.mark.parametrize("na_position", ["first", "last"])
@pytest.mark.parametrize("ascending", [True, False])
@pytest.mark.parametrize("by", ["a", "b", ["a", "b"]])
Expand Down
Loading