mustafasrepo commented on code in PR #3916:
URL: https://github.com/apache/arrow-datafusion/pull/3916#discussion_r1002931293
##########
datafusion/expr/src/window_frame.rs:
##########
@@ -132,70 +125,72 @@ pub enum WindowFrameBound {
///
/// 5. UNBOUNDED FOLLOWING
/// The frame boundary is the last row in the partition.
- Following(Option<u64>),
+ Following(ScalarValue),
}
-impl From<ast::WindowFrameBound> for WindowFrameBound {
- fn from(value: ast::WindowFrameBound) -> Self {
- match value {
- ast::WindowFrameBound::Preceding(v) => Self::Preceding(v),
- ast::WindowFrameBound::Following(v) => Self::Following(v),
+impl TryFrom<ast::WindowFrameBound> for WindowFrameBound {
+ type Error = DataFusionError;
+
+ fn try_from(value: ast::WindowFrameBound) -> Result<Self> {
+ Ok(match value {
+ ast::WindowFrameBound::Preceding(Some(v)) => {
+ Self::Preceding(convert_frame_bound_to_scalar_value(*v)?)
+ }
+ ast::WindowFrameBound::Preceding(None) => {
+ Self::Preceding(ScalarValue::Utf8(None))
+ }
+ ast::WindowFrameBound::Following(Some(v)) => {
+ Self::Following(convert_frame_bound_to_scalar_value(*v)?)
+ }
+ ast::WindowFrameBound::Following(None) => {
+ Self::Following(ScalarValue::Utf8(None))
+ }
ast::WindowFrameBound::CurrentRow => Self::CurrentRow,
- }
+ })
}
}
-impl fmt::Display for WindowFrameBound {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- match self {
- WindowFrameBound::CurrentRow => f.write_str("CURRENT ROW"),
- WindowFrameBound::Preceding(None) => f.write_str("UNBOUNDED
PRECEDING"),
- WindowFrameBound::Following(None) => f.write_str("UNBOUNDED
FOLLOWING"),
- WindowFrameBound::Preceding(Some(n)) => write!(f, "{} PRECEDING",
n),
- WindowFrameBound::Following(Some(n)) => write!(f, "{} FOLLOWING",
n),
+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 {
+ value,
+ leading_field,
+ ..
+ } => {
+ let result = match *value {
+ ast::Expr::Value(ast::Value::SingleQuotedString(item)) => item,
+ e => {
+ let msg = format!("INTERVAL expression cannot be {:?}", e);
+ return Err(DataFusionError::Internal(msg));
Review Comment:
I have changed the error type to ParserError, thanks for pointing it out.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
