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

fix(udf): allow udaf as window function #18181

Merged
merged 2 commits into from
Aug 22, 2024
Merged

fix(udf): allow udaf as window function #18181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde6578
infer return type for udaf
stdrc Aug 22, 2024
41a1a96
add e2e test
stdrc Aug 22, 2024
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
19 changes: 19 additions & 0 deletions e2e_test/udf/bug_fixes/17560_udaf_as_win_func.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# https://github.com/risingwavelabs/risingwave/issues/17560

statement ok
create aggregate sum00(value int) returns int language python as $$
def create_state():
return 0
def accumulate(state, value):
return state + value
def retract(state, value):
return state - value
def finish(state):
return state
$$;

query ii
select t.value, sum00(weight) OVER (PARTITION BY value) from (values (1, 1), (null, 2), (3, 3)) as t(value, weight);
----
1 1
3 3
20 changes: 10 additions & 10 deletions src/frontend/src/expr/window_function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ use itertools::Itertools;
use risingwave_common::bail_not_implemented;
use risingwave_common::types::DataType;
use risingwave_expr::aggregate::AggKind;
use risingwave_expr::sig::FUNCTION_REGISTRY;
use risingwave_expr::window_function::{Frame, WindowFuncKind};

use super::{Expr, ExprImpl, OrderBy, RwResult};
use crate::error::{ErrorCode, RwError};
use crate::expr::infer_type;

/// A window function performs a calculation across a set of table rows that are somehow related to
/// the current row, according to the window spec `OVER (PARTITION BY .. ORDER BY ..)`.
Expand All @@ -45,10 +45,10 @@ impl WindowFunction {
kind: WindowFuncKind,
partition_by: Vec<ExprImpl>,
order_by: OrderBy,
args: Vec<ExprImpl>,
mut args: Vec<ExprImpl>,
frame: Option<Frame>,
) -> RwResult<Self> {
let return_type = Self::infer_return_type(&kind, &args)?;
let return_type = Self::infer_return_type(&kind, &mut args)?;
Ok(Self {
kind,
args,
Expand All @@ -59,7 +59,7 @@ impl WindowFunction {
})
}

fn infer_return_type(kind: &WindowFuncKind, args: &[ExprImpl]) -> RwResult<DataType> {
fn infer_return_type(kind: &WindowFuncKind, args: &mut [ExprImpl]) -> RwResult<DataType> {
use WindowFuncKind::*;
match (kind, args) {
(RowNumber, []) => Ok(DataType::Int64),
Expand Down Expand Up @@ -87,13 +87,13 @@ impl WindowFunction {
);
}

(Aggregate(AggKind::Builtin(agg_kind)), args) => {
let arg_types = args.iter().map(ExprImpl::return_type).collect::<Vec<_>>();
let return_type = FUNCTION_REGISTRY.get_return_type(*agg_kind, &arg_types)?;
Ok(return_type)
}
(Aggregate(agg_kind), args) => Ok(match agg_kind {
AggKind::Builtin(kind) => infer_type((*kind).into(), args)?,
AggKind::UserDefined(udf) => udf.return_type.as_ref().unwrap().into(),
AggKind::WrapScalar(expr) => expr.return_type.as_ref().unwrap().into(),
}),

_ => {
(_, args) => {
let args = args
.iter()
.map(|e| format!("{}", e.return_type()))
Expand Down
Loading