Skip to content

CLN: simplify join take call #27531

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 4 commits into from
Jul 24, 2019
Merged

CLN: simplify join take call #27531

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a4e242
CLN: simplify join take call
jbrockmendel Jul 23, 2019
bfc1cfb
Merge branch 'master' of https://github.com/pandas-dev/pandas into deps3
jbrockmendel Jul 23, 2019
d65e45f
Merge branch 'master' of https://github.com/pandas-dev/pandas into deps3
jbrockmendel Jul 23, 2019
5d58ea7
avoid TypeError
jbrockmendel Jul 23, 2019
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
20 changes: 11 additions & 9 deletions pandas/_libs/join.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ from numpy cimport (ndarray,
uint32_t, uint64_t, float32_t, float64_t)
cnp.import_array()

from pandas._libs.algos import groupsort_indexer, ensure_platform_int
from pandas.core.algorithms import take_nd
from pandas._libs.algos import (
groupsort_indexer, ensure_platform_int, take_1d_int64_int64
)


def inner_join(const int64_t[:] left, const int64_t[:] right,
Expand Down Expand Up @@ -67,8 +68,8 @@ def left_outer_join(const int64_t[:] left, const int64_t[:] right,
Py_ssize_t max_groups, sort=True):
cdef:
Py_ssize_t i, j, k, count = 0
ndarray[int64_t] left_count, right_count
ndarray left_sorter, right_sorter, rev
ndarray[int64_t] left_count, right_count, left_sorter, right_sorter
ndarray rev
ndarray[int64_t] left_indexer, right_indexer
int64_t lc, rc

Expand Down Expand Up @@ -124,10 +125,8 @@ def left_outer_join(const int64_t[:] left, const int64_t[:] right,
# no multiple matches for any row on the left
# this is a short-cut to avoid groupsort_indexer
# otherwise, the `else` path also works in this case
left_sorter = ensure_platform_int(left_sorter)

rev = np.empty(len(left), dtype=np.intp)
rev.put(left_sorter, np.arange(len(left)))
rev.put(ensure_platform_int(left_sorter), np.arange(len(left)))
else:
rev, _ = groupsort_indexer(left_indexer, len(left))

Expand Down Expand Up @@ -201,9 +200,12 @@ def full_outer_join(const int64_t[:] left, const int64_t[:] right,
_get_result_indexer(right_sorter, right_indexer))


def _get_result_indexer(sorter, indexer):
cdef _get_result_indexer(ndarray[int64_t] sorter, ndarray[int64_t] indexer):
if len(sorter) > 0:
res = take_nd(sorter, indexer, fill_value=-1)
# cython-only equivalent to
# `res = algos.take_nd(sorter, indexer, fill_value=-1)`
res = np.empty(len(indexer), dtype=np.int64)
take_1d_int64_int64(sorter, indexer, res, -1)
else:
# length-0 case
res = np.empty(len(indexer), dtype=np.int64)
Expand Down