merge

Author: comphead

core/src/execution/datafusion/planner.rs

@@ -870,11 +870,11 @@ impl PhysicalPlanner {
                 ))
             }
             OpStruct::Window(wnd) => {
-                dbg!(&inputs);
-                //dbg!(&children);
+                dbg!(&children[0]);
                 let (scans, child) = self.create_plan(&children[0], inputs)?;
+                //dbg!(&child);
                 let input_schema = child.schema();
-                //dbg!(&input_schema);
+                dbg!(&input_schema);
                 let sort_exprs: Result<Vec<PhysicalSortExpr>, ExecutionError> = wnd
                     .order_by_list
                     .iter()

core/src/execution/jni_api.rs

@@ -310,6 +310,7 @@ pub unsafe extern "system" fn Java_org_apache_comet_Native_executePlan(
     try_unwrap_or_throw(&e, |mut env| {
         // Retrieve the query
         let exec_context = get_execution_context(exec_context);
+        //dbg!(&exec_context.spark_plan.children[0]);
 
         let exec_context_id = exec_context.id;
 

spark/src/main/scala/org/apache/comet/CometSparkSessionExtensions.scala

@@ -537,9 +537,9 @@ class CometSparkSessionExtensions
         case w: WindowExec =>
           QueryPlanSerde.operator2Proto(w) match {
             case Some(nativeOp) =>
-              val bosonOp =
+              val cometOp =
                 CometWindowExec(w, w.windowExpression, w.partitionSpec, w.orderSpec, w.child)
-              CometSinkPlaceHolder(nativeOp, w, bosonOp)
+              CometSinkPlaceHolder(nativeOp, w, cometOp)
             case None =>
               w
           }

spark/src/main/scala/org/apache/spark/sql/comet/CometWindowExec.scala

@@ -104,7 +104,9 @@ object CometWindowExec {
     }
 
     val windowExprs = windowExpression.map(w =>
-      windowExprToProto(w.asInstanceOf[Alias].child.asInstanceOf[WindowExpression], child.output))
+      windowExprToProto(
+        w.asInstanceOf[Alias].child.asInstanceOf[WindowExpression],
+        outputAttributes))
 
     val windowBuilder = OperatorOuterClass.Window
       .newBuilder()