[NSE-784] fallback Sort after SortHashAgg (#780)

* fallback Sort after SortHashAgg Signed-off-by: Yuan Zhou <[email protected]> * Revert "fallback Sort after SortHashAgg" This reverts commit 7e2788e. * fix sort with expand Signed-off-by: Yuan Zhou <[email protected]>
oap-project · Mar 22, 2022 · 1f25067 · 1f25067
1 parent a75bd1c
commit 1f25067
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/native-sql-engine/core/src/main/scala/com/intel/oap/extension/ColumnarOverrides.scala b/native-sql-engine/core/src/main/scala/com/intel/oap/extension/ColumnarOverrides.scala
@@ -162,6 +162,10 @@ case class ColumnarPreOverrides() extends Rule[SparkPlan] {
     case plan: SortExec =>
       val child = replaceWithColumnarPlan(plan.child)
       logDebug(s"Columnar Processing for ${plan.getClass} is currently supported.")
+      if (child.isInstanceOf[ExpandExec]) {
+        //FIXME: quick for Sort spill bug
+        return plan.withNewChildren(Seq(child))
+      }
       child match {
         case p: CoalesceBatchesExec =>
           ColumnarSortExec(plan.sortOrder, plan.global, p.child, plan.testSpillFrequency)