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

Jump to bottom

SNOW-1649528 Fix monotonic bug #2217

Merged
merged 1 commit into from
Sep 4, 2024
Merged

SNOW-1649528 Fix monotonic bug #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 22 additions & 8 deletions src/snowflake/snowpark/modin/plugin/compiler/snowflake_query_compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2344,7 +2344,7 @@ def _check_monotonic(self, increasing: bool) -> "SnowflakeQueryCompiler":
monotonic_decreasing_snowflake_quoted_identifier
)
new_modin_frame = new_qc._modin_frame
return SnowflakeQueryCompiler(
qc = SnowflakeQueryCompiler(
InternalFrame.create(
ordered_dataframe=new_modin_frame.ordered_dataframe.limit(
n=1, sort=False
Expand All @@ -2358,6 +2358,8 @@ def _check_monotonic(self, increasing: bool) -> "SnowflakeQueryCompiler":
index_column_types=None,
)
)
# use agg all to handle empty case
return qc.agg(func="all", args=(), kwargs={}, axis=0)

def _add_columns_for_monotonicity_checks(
self, col_to_check: str, columns_to_add: Optional[str] = None
Expand All @@ -2371,7 +2373,7 @@ def _add_columns_for_monotonicity_checks(
col_to_check : str
The Snowflake quoted identifier for the column whose monotonicity to check.
columns_to_add : str, optional
Whether or not to add all columns, and if not, which columns to add.
Whether to add all columns, and if not, which columns to add.

Returns
-------
Expand Down Expand Up @@ -2402,9 +2404,15 @@ def _add_columns_for_monotonicity_checks(
if columns_to_add in [None, "decreasing"]:
modin_frame = modin_frame.append_column(
"_is_monotonic_decreasing",
coalesce(
min_(col(col_to_check) <= col(lag_col_snowflake_quoted_id)).over(),
pandas_lit(False),
iff(
count("*").over() <= 1,
pandas_lit(True),
coalesce(
min_(
col(col_to_check) <= col(lag_col_snowflake_quoted_id)
).over(),
pandas_lit(False),
),
),
)
monotonic_decreasing_snowflake_quoted_id = (
Expand All @@ -2413,9 +2421,15 @@ def _add_columns_for_monotonicity_checks(
if columns_to_add in [None, "increasing"]:
modin_frame = modin_frame.append_column(
"_is_monotonic_increasing",
coalesce(
min_(col(col_to_check) >= col(lag_col_snowflake_quoted_id)).over(),
pandas_lit(False),
iff(
count("*").over() <= 1,
pandas_lit(True),
coalesce(
min_(
col(col_to_check) >= col(lag_col_snowflake_quoted_id)
).over(),
pandas_lit(False),
),
),
)
monotonic_increasing_snowflake_quoted_id = (
Expand Down
4 changes: 2 additions & 2 deletions tests/integ/modin/index/test_monotonic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@pytest.mark.parametrize(
"values", [[1, 2, 3], [3, 2, 1], [1, 3, 2], [1, 2, 2], [1, np.NaN, 3]]
"values", [[], [1], [3, 2], [1, 3, 2], [1, 2, 2], [1, np.NaN, 3]]
sfc-gh-mvashishtha marked this conversation as resolved.
Show resolved Hide resolved
)
@sql_count_checker(query_count=1)
def test_monotonic_increasing_numbers(values):
Expand All @@ -23,7 +23,7 @@ def test_monotonic_increasing_numbers(values):


@pytest.mark.parametrize(
"values", [[3, 2, 1], [1, 2, 3], [3, 1, 2], [2, 2, 1], [3, np.NaN, 1]]
"values", [[], [3], [1, 2], [3, 1, 2], [2, 2, 1], [3, np.NaN, 1]]
sfc-gh-mvashishtha marked this conversation as resolved.
Show resolved Hide resolved
)
@sql_count_checker(query_count=1)
def test_monotonic_decreasing_numbers(values):
Expand Down
14 changes: 12 additions & 2 deletions tests/integ/modin/series/test_monotonic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@pytest.mark.parametrize(
"values", [[1, 2, 3], [3, 2, 1], [1, 3, 2], [1, 2, 2], [1, np.NaN, 3]]
"values", [[], [1], [3, 2], [1, 3, 2], [1, 2, 2], [1, np.NaN, 3]]
sfc-gh-mvashishtha marked this conversation as resolved.
Show resolved Hide resolved
)
@sql_count_checker(query_count=1)
def test_monotonic_increasing_numbers(values):
Expand All @@ -23,7 +23,7 @@ def test_monotonic_increasing_numbers(values):


@pytest.mark.parametrize(
"values", [[3, 2, 1], [1, 2, 3], [3, 1, 2], [2, 2, 1], [3, np.NaN, 1]]
"values", [[], [3], [1, 2], [3, 1, 2], [2, 2, 1], [3, np.NaN, 1]]
sfc-gh-mvashishtha marked this conversation as resolved.
Show resolved Hide resolved
)
@sql_count_checker(query_count=1)
def test_monotonic_decreasing_numbers(values):
Expand Down Expand Up @@ -95,3 +95,13 @@ def test_monotonic_decreasing_dates(values):
pd.Series(values).is_monotonic_decreasing
== native_pd.Series(values).is_monotonic_decreasing
)


@sql_count_checker(query_count=2)
def test_monotonic_type_mismatch():
# Snowpark pandas may have different behavior when the column type is variant. pandas always returns False while
# Snowflake engine does implicit casting (“coercion”) and then check monotonic
assert not native_pd.Series([0, "a"]).is_monotonic_increasing
assert pd.Series([0, "a"]).is_monotonic_increasing
assert not native_pd.Series(["a", 0]).is_monotonic_decreasing
assert pd.Series(["a", 0]).is_monotonic_decreasing
Loading