goldmedal commented on code in PR #13059:
URL: https://github.com/apache/datafusion/pull/13059#discussion_r1814765591
##########
datafusion/expr/src/window_frame.rs:
##########
@@ -334,51 +335,69 @@ impl WindowFrameBound {
}
}
-impl TryFrom<ast::WindowFrameBound> for WindowFrameBound {
- type Error = DataFusionError;
-
- fn try_from(value: ast::WindowFrameBound) -> Result<Self> {
+impl WindowFrameBound {
+ fn try_parse(
+ value: ast::WindowFrameBound,
+ units: &ast::WindowFrameUnits,
+ ) -> Result<Self> {
Ok(match value {
ast::WindowFrameBound::Preceding(Some(v)) => {
- Self::Preceding(convert_frame_bound_to_scalar_value(*v)?)
+ Self::Preceding(convert_frame_bound_to_scalar_value(*v,
units)?)
}
ast::WindowFrameBound::Preceding(None) =>
Self::Preceding(ScalarValue::Null),
ast::WindowFrameBound::Following(Some(v)) => {
- Self::Following(convert_frame_bound_to_scalar_value(*v)?)
+ Self::Following(convert_frame_bound_to_scalar_value(*v,
units)?)
}
ast::WindowFrameBound::Following(None) =>
Self::Following(ScalarValue::Null),
ast::WindowFrameBound::CurrentRow => Self::CurrentRow,
})
}
}
-pub fn convert_frame_bound_to_scalar_value(v: ast::Expr) ->
Result<ScalarValue> {
- Ok(ScalarValue::Utf8(Some(match v {
- ast::Expr::Value(ast::Value::Number(value, false))
- | ast::Expr::Value(ast::Value::SingleQuotedString(value)) => value,
- ast::Expr::Interval(ast::Interval {
- value,
- leading_field,
- ..
- }) => {
- let result = match *value {
- ast::Expr::Value(ast::Value::SingleQuotedString(item)) => item,
- e => {
- return sql_err!(ParserError(format!(
- "INTERVAL expression cannot be {e:?}"
- )));
+pub fn convert_frame_bound_to_scalar_value(
+ v: ast::Expr,
+ units: &ast::WindowFrameUnits,
+) -> Result<ScalarValue> {
+ match units {
+ // For ROWS and GROUPS we are sure that the ScalarValue must be a
non-negative integer ...
+ ast::WindowFrameUnits::Rows | ast::WindowFrameUnits::Groups => match v
{
+ ast::Expr::Value(ast::Value::Number(value, false))
+ | ast::Expr::Value(ast::Value::SingleQuotedString(value)) => {
Review Comment:
Curiously, do you know what SQL (or substrait?) will generate this case,
Rows with SingleQuotedString? I'm wondering if we should keep this matching
rule or remove it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
