Skip to content

Commit

Permalink
feat(risingwave): support include_null in first/last aggs
Browse files Browse the repository at this point in the history
  • Loading branch information
cpcloud committed Dec 16, 2024
1 parent 214dad8 commit bdbde08
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 18 deletions.
15 changes: 7 additions & 8 deletions ibis/backends/sql/compilers/risingwave.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

import sqlglot as sg
import sqlglot.expressions as sge

import ibis.common.exceptions as com
Expand Down Expand Up @@ -40,25 +41,23 @@ def visit_DateNow(self, op):
return self.cast(sge.CurrentTimestamp(), dt.date)

def visit_First(self, op, *, arg, where, order_by, include_null):
if include_null:
raise com.UnsupportedOperationError(
"`include_null=True` is not supported by the risingwave backend"
)
if not order_by:
raise com.UnsupportedOperationError(
"RisingWave requires an `order_by` be specified in `first`"
)
if not include_null:
cond = arg.is_(sg.not_(NULL, copy=False))
where = cond if where is None else sge.And(this=cond, expression=where)

Check warning on line 50 in ibis/backends/sql/compilers/risingwave.py

View check run for this annotation

Codecov / codecov/patch

ibis/backends/sql/compilers/risingwave.py#L49-L50

Added lines #L49 - L50 were not covered by tests
return self.agg.first_value(arg, where=where, order_by=order_by)

def visit_Last(self, op, *, arg, where, order_by, include_null):
if include_null:
raise com.UnsupportedOperationError(
"`include_null=True` is not supported by the risingwave backend"
)
if not order_by:
raise com.UnsupportedOperationError(
"RisingWave requires an `order_by` be specified in `last`"
)
if not include_null:
cond = arg.is_(sg.not_(NULL, copy=False))
where = cond if where is None else sge.And(this=cond, expression=where)

Check warning on line 60 in ibis/backends/sql/compilers/risingwave.py

View check run for this annotation

Codecov / codecov/patch

ibis/backends/sql/compilers/risingwave.py#L59-L60

Added lines #L59 - L60 were not covered by tests
return self.agg.last_value(arg, where=where, order_by=order_by)

def visit_Correlation(self, op, *, left, right, how, where):
Expand Down
14 changes: 4 additions & 10 deletions ibis/backends/tests/test_aggregation.py
Original file line number Diff line number Diff line change
Expand Up @@ -647,23 +647,16 @@ def test_first_last(alltypes, method, filtered, include_null):
raises=com.OperationNotDefinedError,
)
@pytest.mark.parametrize("method", ["first", "last"])
@pytest.mark.parametrize("filtered", [False, True])
@pytest.mark.parametrize("filtered", [False, True], ids=["not-filtered", "filtered"])
@pytest.mark.parametrize(
"include_null",
[
False,
param(False, id="exclude-null"),
param(
True,
marks=[
pytest.mark.notimpl(
[
"clickhouse",
"exasol",
"flink",
"postgres",
"risingwave",
"snowflake",
],
["clickhouse", "exasol", "flink", "postgres", "snowflake"],
raises=com.UnsupportedOperationError,
reason="`include_null=True` is not supported",
),
Expand All @@ -674,6 +667,7 @@ def test_first_last(alltypes, method, filtered, include_null):
strict=False,
),
],
id="include-null",
),
],
)
Expand Down

0 comments on commit bdbde08

Please sign in to comment.