remove project from wscg when it's the child of window (#1136)

oap-project · Oct 21, 2022 · 00ed950 · 00ed950
1 parent e143acb
commit 00ed950
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...ne/core/src/main/scala/org/apache/spark/sql/execution/ColumnarCollapseCodegenStages.scala b/...ne/core/src/main/scala/org/apache/spark/sql/execution/ColumnarCollapseCodegenStages.scala
@@ -329,6 +329,12 @@ case class ColumnarCollapseCodegenStages(
       case plan: ColumnarCodegenSupport if enableProjectionCodegen && supportCodegen(plan) =>
         ColumnarWholeStageCodegenExec(insertInputAdapter(plan))(
           codegenStageCounter.incrementAndGet())
+      // Remove ColumnarConditionProjectExec from WSCG,
+      // otherwise ColumnarWindowExec will receive empty RecordBatch and run failed.
+      case plan @ ColumnarWindowExec(_, _, _, _, child: ColumnarConditionProjectExec)
+        if supportCodegen(child) && existsJoins(child) =>
+        val newChild = child.withNewChildren(child.children.map(insertWholeStageCodegen))
+        plan.withNewChildren(Seq(newChild))
       case plan: ColumnarCodegenSupport if supportCodegen(plan) && existsJoins(plan) =>
         ColumnarWholeStageCodegenExec(insertInputAdapter(plan))(
           codegenStageCounter.incrementAndGet())