From 1f25067a7a003ca1b769f5da30e896589796f4eb Mon Sep 17 00:00:00 2001 From: Yuan Date: Tue, 22 Mar 2022 16:25:00 +0800 Subject: [PATCH] [NSE-784] fallback Sort after SortHashAgg (#780) * fallback Sort after SortHashAgg Signed-off-by: Yuan Zhou * Revert "fallback Sort after SortHashAgg" This reverts commit 7e2788e941bd17007cda711930a8a7aa0b6c0173. * fix sort with expand Signed-off-by: Yuan Zhou --- .../scala/com/intel/oap/extension/ColumnarOverrides.scala | 4 ++++ 1 file changed, 4 insertions(+) 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 index 71c2fbda4..9a0410d6d 100644 --- 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)