Skip to content

REF: reindex_indexer up-front to simplify JoinUnit #43384

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

Merged
merged 12 commits into from
Sep 8, 2021
Merged

REF: reindex_indexer up-front to simplify JoinUnit #43384

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3d84ddb
REF: reindex_indexer use np.void to avoid JoinUnit
jbrockmendel Sep 3, 2021
e0c3f9c
REF: remove no-longer reachable cases from internals.concat
jbrockmendel Sep 3, 2021
1b5472f
fix incorrect assertion
jbrockmendel Sep 3, 2021
31c9e33
Merge branch 'master' into ref-concat-void
jbrockmendel Sep 4, 2021
6042866
Merge branch 'master' into ref-concat-void-2
jbrockmendel Sep 4, 2021
72a8e82
typo fixup
jbrockmendel Sep 4, 2021
3974849
Merge branch 'master' into ref-concat-void
jbrockmendel Sep 5, 2021
7b7002f
refactor out _reindex_columns_void
jbrockmendel Sep 5, 2021
674ada4
Merge branch 'master' into ref-concat-void
jbrockmendel Sep 6, 2021
32d9d86
_reindex_columns_void -> _maybe_reindex_columns_na_proxy
jbrockmendel Sep 6, 2021
f2695e9
Merge branch 'ref-concat-void' into ref-concat-void-2
jbrockmendel Sep 6, 2021
fb538c0
Merge branch 'master' into ref-concat-void-2
jbrockmendel Sep 8, 2021
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
Prev Previous commit
Next Next commit
_reindex_columns_void -> _maybe_reindex_columns_na_proxy
  • Loading branch information
@jbrockmendel
jbrockmendel committed Sep 6, 2021
commit 32d9d86f919fbbabe6c8d907e29aa05682e8cec0
4 changes: 2 additions & 2 deletions pandas/core/internals/concat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def concatenate_managers(
if isinstance(mgrs_indexers[0][0], ArrayManager):
return _concatenate_array_managers(mgrs_indexers, axes, concat_axis, copy)

mgrs_indexers = _reindex_columns_void(axes, mgrs_indexers)
mgrs_indexers = _maybe_reindex_columns_na_proxy(axes, mgrs_indexers)

concat_plans = [
_get_mgr_concatenation_plan(mgr, indexers) for mgr, indexers in mgrs_indexers
Expand Down Expand Up @@ -247,7 +247,7 @@ def concatenate_managers(
return BlockManager(tuple(blocks), axes)


def _reindex_columns_void(
def _maybe_reindex_columns_na_proxy(
axes: list[Index], mgrs_indexers: list[tuple[BlockManager, dict[int, np.ndarray]]]
) -> list[tuple[BlockManager, dict[int, np.ndarray]]]:
"""
Expand Down