fix per comment

Author: Jiayu Liu

datafusion/src/physical_plan/planner.rs

@@ -22,7 +22,6 @@ use super::{
     functions, hash_join::PartitionMode, udaf, union::UnionExec, windows,
 };
 use crate::execution::context::ExecutionContextState;
-use crate::logical_plan::window_frames::WindowFrame;
 use crate::logical_plan::{
     DFSchema, Expr, LogicalPlan, Operator, Partitioning as LogicalPartitioning, PlanType,
     StringifiedPlan, UserDefinedLogicalNode,
@@ -781,14 +780,31 @@ impl DefaultPhysicalPlanner {
                         )),
                     })
                     .collect::<Result<Vec<_>>>()?;
-                let window_frame = window_frame.unwrap_or_else(WindowFrame::default);
+                if !partition_by.is_empty() {
+                    return Err(DataFusionError::NotImplemented(
+                            "window expression with non-empty partition by clause is not yet supported"
+                                .to_owned(),
+                        ));
+                }
+                if !order_by.is_empty() {
+                    return Err(DataFusionError::NotImplemented(
+                            "window expression with non-empty order by clause is not yet supported"
+                                .to_owned(),
+                        ));
+                }
+                if window_frame.is_some() {
+                    return Err(DataFusionError::NotImplemented(
+                            "window expression with window frame definition is not yet supported"
+                                .to_owned(),
+                        ));
+                }
                 windows::create_window_expr(
                     fun,
                     name,
                     &args,
                     &partition_by,
                     &order_by,
-                    window_frame,
+                    *window_frame,
                     physical_input_schema,
                 )
             }

datafusion/src/physical_plan/windows.rs

@@ -65,9 +65,12 @@ pub fn create_window_expr(
     fun: &WindowFunction,
     name: String,
     args: &[Arc<dyn PhysicalExpr>],
+    // https://github.com/apache/arrow-datafusion/issues/299
     _partition_by: &[Arc<dyn PhysicalExpr>],
+    // https://github.com/apache/arrow-datafusion/issues/360
     _order_by: &[PhysicalSortExpr],
-    _window_frame: WindowFrame,
+    // https://github.com/apache/arrow-datafusion/issues/361
+    _window_frame: Option<WindowFrame>,
     input_schema: &Schema,
 ) -> Result<Arc<dyn WindowExpr>> {
     Ok(match fun {
@@ -546,7 +549,7 @@ mod tests {
                 &[col("c3")],
                 &[],
                 &[],
-                WindowFrame::default(),
+                Some(WindowFrame::default()),
                 schema.as_ref(),
             )?],
             input,
@@ -579,7 +582,7 @@ mod tests {
                     &[col("c3")],
                     &[],
                     &[],
-                    WindowFrame::default(),
+                    Some(WindowFrame::default()),
                     schema.as_ref(),
                 )?,
                 create_window_expr(
@@ -588,7 +591,7 @@ mod tests {
                     &[col("c3")],
                     &[],
                     &[],
-                    WindowFrame::default(),
+                    Some(WindowFrame::default()),
                     schema.as_ref(),
                 )?,
                 create_window_expr(
@@ -597,7 +600,7 @@ mod tests {
                     &[col("c3")],
                     &[],
                     &[],
-                    WindowFrame::default(),
+                    Some(WindowFrame::default()),
                     schema.as_ref(),
                 )?,
             ],