disable codegen on more cases

Signed-off-by: Yuan Zhou <[email protected]>
oap-project · Sep 27, 2022 · d13cbac · d13cbac
1 parent 8d0b5e0
commit d13cbac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...ve-sql-engine/core/src/main/scala/com/intel/oap/execution/ColumnarHashAggregateExec.scala b/...ve-sql-engine/core/src/main/scala/com/intel/oap/execution/ColumnarHashAggregateExec.scala
@@ -698,6 +698,9 @@ case class ColumnarHashAggregateExec(
       }
       val internalExpressionList = expr.aggregateFunction.children
       for (expr <- internalExpressionList) {
+        if (expr.isInstanceOf[Literal]) {
+          return false
+        }
         val colExpr = ColumnarExpressionConverter.replaceWithColumnarExpression(expr)
         if (!colExpr.asInstanceOf[ColumnarExpression].supportColumnarCodegen(
           Lists.newArrayList())) {

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
@@ -236,6 +236,13 @@ case class ColumnarCollapseCodegenStages(
     */
       case p: ColumnarSortMergeJoinExec if p.left.isInstanceOf[ColumnarLocalLimitExec] =>
         true
+    /**
+    * To filter Inner SMJ and its right child is Projection.
+    */
+      case p: ColumnarSortMergeJoinExec if p.right.isInstanceOf[ColumnarConditionProjectExec] 
+        && p.joinType == Inner
+        && (p.right.asInstanceOf[ColumnarConditionProjectExec].condition != null) =>
+        true
       case _ =>
         false
     }