[NSE-1156] fix concat codegen (#1163)

* fix concat codegen Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * disable on unsupported case Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix count distinct Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * revert Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
oap-project · Nov 14, 2022 · e636428 · e636428
1 parent a8b38cd
commit e636428
Show file tree

Hide file tree

Showing 3 changed files with 17 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
@@ -545,6 +545,9 @@ case class ColumnarHashAggregateExec(
           }
         case Count(_) =>
           mode match {
+            case Final if (exp.isDistinct) =>
+                throw new UnsupportedOperationException(
+                s"Count distinct is not supported in Columnar Count")
             case Partial | PartialMerge | Final =>
               res_index += 1
             case other =>

diff --git a/...ve-sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarCoalesceOperator.scala b/...ve-sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarCoalesceOperator.scala
@@ -46,6 +46,16 @@ class ColumnarCoalesce(exps: Seq[Expression], original: Expression)
     with ColumnarExpression
     with Logging {
 
+  override def supportColumnarCodegen(args: java.lang.Object): Boolean = {
+    for (expr <- exps) {
+      val colExpr = ColumnarExpressionConverter.replaceWithColumnarExpression(expr)
+      if (!colExpr.asInstanceOf[ColumnarExpression].supportColumnarCodegen(Lists.newArrayList())) {
+        return false
+      }
+    }
+    return true
+  }
+
   buildCheck()
 
   def buildCheck(): Unit = {

diff --git a/native-sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarConcatOperator.scala b/native-sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarConcatOperator.scala
@@ -34,6 +34,10 @@ class ColumnarConcat(exps: Seq[Expression], original: Expression)
     with ColumnarExpression
     with Logging {
 
+  override def supportColumnarCodegen(args: java.lang.Object): Boolean = {
+    false
+  }
+
   buildCheck()
 
   def buildCheck(): Unit = {