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.

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

fix: allow null index in list.get and array.get #15239

Merged
merged 2 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 crates/polars-ops/src/chunked_array/array/get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub fn array_get(ca: &ArrayChunked, index: &Int64Chunked) -> PolarsResult<Series
if let Some(index) = index {
array_get_literal(ca, index)
} else {
polars_bail!(ComputeError: "unexpected null index received in `arr.get`")
Ok(Series::full_null(ca.name(), ca.len(), &ca.inner_dtype()))
}
},
len if len == ca.len() => {
Expand Down
6 changes: 5 additions & 1 deletion crates/polars-plan/src/dsl/function_expr/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,11 @@ pub(super) fn get(s: &mut [Series]) -> PolarsResult<Option<Series>> {
if let Some(index) = index {
ca.lst_get(index).map(Some)
} else {
polars_bail!(ComputeError: "unexpected null index received in `list.get`")
Ok(Some(Series::full_null(
ca.name(),
ca.len(),
&ca.inner_dtype(),
)))
}
},
len if len == ca.len() => {
Expand Down
24 changes: 20 additions & 4 deletions py-polars/tests/unit/namespaces/array/test_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,22 +128,38 @@ def test_array_arg_min_max() -> None:


def test_array_get() -> None:
# test index literal
s = pl.Series(
"a",
[[1, 2, 3, 4], [5, 6, None, None], [7, 8, 9, 10]],
dtype=pl.Array(pl.Int64, 4),
)

# Test index literal.
out = s.arr.get(1)
expected = pl.Series("a", [2, 6, 8], dtype=pl.Int64)
assert_series_equal(out, expected)

# test index expr
out = s.arr.get(pl.Series([1, -2, 4]))
# Null index literal.
out_df = s.to_frame().select(pl.col.a.arr.get(pl.lit(None)))
expected_df = pl.Series("a", [None, None, None], dtype=pl.Int64).to_frame()
assert_frame_equal(out_df, expected_df)

# Out-of-bounds index literal.
out = s.arr.get(100)
expected = pl.Series("a", [None, None, None], dtype=pl.Int64)
assert_series_equal(out, expected)

# Negative index literal.
out = s.arr.get(-2)
expected = pl.Series("a", [3, None, 9], dtype=pl.Int64)
assert_series_equal(out, expected)

# Test index expr.
out = s.arr.get(pl.Series([1, -2, 100]))
expected = pl.Series("a", [2, None, None], dtype=pl.Int64)
assert_series_equal(out, expected)

# test logical type
# Test logical type.
s = pl.Series(
"a",
[
Expand Down
10 changes: 10 additions & 0 deletions py-polars/tests/unit/namespaces/list/test_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ def test_list_arr_get() -> None:
out = pl.select(pl.lit(a).list.last()).to_series()
assert_series_equal(out, expected)

# Out of bounds index.
out = a.list.get(3)
expected = pl.Series("a", [None, None, 9])
assert_series_equal(out, expected)

# Null index.
out_df = a.to_frame().select(pl.col.a.list.get(pl.lit(None)))
expected_df = pl.Series("a", [None, None, None], dtype=pl.Int64).to_frame()
assert_frame_equal(out_df, expected_df)

a = pl.Series("a", [[1, 2, 3], [4, 5], [6, 7, 8, 9]])
out = a.list.get(-3)
expected = pl.Series("a", [1, None, 7])
Expand Down
Loading