[NSE-782] backport master changes to 1.3.1 branch (#803)

* [NSE-791] fix xchg reuse in Spark321 (#799) * fix xchg reuse Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * move to spark321 shim layer Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * Fix count() with decimal value (#802) Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
oap-project · Mar 28, 2022 · 219abf1 · 219abf1
1 parent 69363f3
commit 219abf1
Show file tree

Hide file tree

Showing 3 changed files with 816 additions and 1 deletion.
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
@@ -272,6 +272,10 @@ case class ColumnarHashAggregateExec(
               case t: BooleanType =>
                 vectors(idx)
                   .put(0, res.asInstanceOf[Boolean].booleanValue())
+              case t: DecimalType =>
+                // count() does not care the real value
+                vectors(idx)
+                  .put(0, res.asInstanceOf[Number].intValue())
               case other =>
                 throw new UnsupportedOperationException(s"$other is not supported.")
             }

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
@@ -385,7 +385,8 @@ case class ColumnarPostOverrides() extends Rule[SparkPlan] {
         s" See above override in BroadcastQueryStageExec")
       val localBroadcastXchg = broadcastQueryStageExec.plan.asInstanceOf[BroadcastExchangeExec]
       val dataToArrowColumnar = localBroadcastXchg.child.asInstanceOf[DataToArrowColumnarExec]
-      ColumnarBroadcastExchangeExec(localBroadcastXchg.mode, dataToArrowColumnar)
+      //ColumnarBroadcastExchangeExec(localBroadcastXchg.mode, dataToArrowColumnar)
+      dataToArrowColumnar.child
     case plan: RowToColumnarExec =>
       val child = replaceWithColumnarPlan(plan.child)
       if (columnarConf.enableArrowRowToColumnar) {