Skip to content

Commit 8005dec

Browse files
authored
Remove legacy DataFrame implementation (#8968)
1 parent 6c3b8ad commit 8005dec

File tree

9 files changed

+10
-723
lines changed

9 files changed

+10
-723
lines changed

.github/workflows/tests.yaml

+2-17
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@ jobs:
5757
label: no_queue
5858
partition: "not ci1"
5959

60-
# Set dataframe.query-planning: false
61-
- os: ubuntu-latest
62-
environment: "3.10"
63-
label: no_expr
64-
partition: "ci1"
65-
- os: ubuntu-latest
66-
environment: "3.10"
67-
label: no_expr
68-
partition: "not ci1"
69-
7060
# dask.array P2P shuffle
7161
- os: ubuntu-latest
7262
environment: mindeps
@@ -83,12 +73,12 @@ jobs:
8373
- os: ubuntu-latest
8474
environment: mindeps
8575
label: pandas
86-
extra_packages: [numpy=1.24, pandas=2.0, pyarrow=14.0.1]
76+
extra_packages: [numpy=1.24, pandas=2.0, pyarrow=14.0.1, dask-expr]
8777
partition: "ci1"
8878
- os: ubuntu-latest
8979
environment: mindeps
9080
label: pandas
91-
extra_packages: [numpy=1.24, pandas=2.0, pyarrow=14.0.1]
81+
extra_packages: [numpy=1.24, pandas=2.0, pyarrow=14.0.1, dask-expr]
9282
partition: "not ci1"
9383

9484
- os: ubuntu-latest
@@ -221,11 +211,6 @@ jobs:
221211
if: ${{ matrix.label == 'no_queue' }}
222212
run: echo "DASK_DISTRIBUTED__SCHEDULER__WORKER_SATURATION=inf" >> $GITHUB_ENV
223213

224-
- name: Set up dask env to disable dask-expr
225-
shell: bash -l {0}
226-
if: ${{ matrix.label == 'no_expr' }}
227-
run: echo "DASK_DATAFRAME__QUERY_PLANNING=False" >> $GITHUB_ENV
228-
229214
- name: Print host info
230215
# host_info.py imports numpy, which isn't a direct dependency of distributed
231216
if: matrix.environment != 'mindeps'

distributed/shuffle/__init__.py

-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
from __future__ import annotations
22

33
from distributed.shuffle._arrow import check_minimal_arrow_version
4-
from distributed.shuffle._merge import HashJoinP2PLayer, hash_join_p2p
54
from distributed.shuffle._rechunk import rechunk_p2p
65
from distributed.shuffle._scheduler_plugin import ShuffleSchedulerPlugin
7-
from distributed.shuffle._shuffle import P2PShuffleLayer, rearrange_by_column_p2p
86
from distributed.shuffle._worker_plugin import ShuffleWorkerPlugin
97

108
__all__ = [
119
"check_minimal_arrow_version",
12-
"hash_join_p2p",
13-
"HashJoinP2PLayer",
14-
"P2PShuffleLayer",
15-
"rearrange_by_column_p2p",
1610
"rechunk_p2p",
1711
"ShuffleSchedulerPlugin",
1812
"ShuffleWorkerPlugin",

0 commit comments

Comments
 (0)