[NSE-984] fix concat_ws (#992)

* fix concat_ws Signed-off-by: Yuan Zhou <[email protected]> * fix Signed-off-by: Yuan Zhou <[email protected]>
oap-project · Jun 28, 2022 · 3bef6d4 · 3bef6d4
1 parent b973977
commit 3bef6d4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
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
@@ -49,6 +49,16 @@ class ColumnarConcatWs(exps: Seq[Expression], original: Expression)
   }
 
   override def doColumnarCodeGen(args: java.lang.Object): (TreeNode, ArrowType) = {
+    if (exps.size == 2) {
+      // return 2nd param, ignore spliter
+      val (exp_node, expType): (TreeNode, ArrowType) =
+        exps.last.asInstanceOf[ColumnarExpression].doColumnarCodeGen(args)
+      return (exp_node, expType)
+    } else if (exps.size == 1) {
+      // Corner case, only spliter provided
+      return (TreeBuilder.makeNull(ArrowType.Utf8.INSTANCE), ArrowType.Utf8.INSTANCE)
+    }
+
     val iter: Iterator[Expression] = exps.iterator
     val exp = iter.next() // spliter
     val exp1 = iter.next()

diff --git a/...sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarExpressionConverter.scala b/...sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarExpressionConverter.scala
@@ -531,6 +531,8 @@ object ColumnarExpressionConverter extends Logging {
         return true
       case c: Concat =>
         c.children.map(containsSubquery).exists(_ == true)
+      case c: ConcatWs =>
+        c.children.map(containsSubquery).exists(_ == true)
       case getArrayItem: GetArrayItem =>
         getArrayItem.child match {
           case strSplit: StringSplit =>