Skip to content

Commit eb29b30

Browse files
committed
address comments
1 parent 84c1dfb commit eb29b30

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ case class ConcatWs(children: Seq[Expression])
122122
val (varargCount, varargBuild) = children.tail.zip(evals.tail).map { case (child, eval) =>
123123
child.dataType match {
124124
case StringType =>
125-
(s"$varargNum ++;",
125+
("", // we count all the StringType arguments num at once below.
126126
s"$array[$idxInVararg ++] = ${eval.isNull} ? (UTF8String) null : ${eval.primitive};")
127127
case _: ArrayType =>
128128
val size = ctx.freshName("n")
@@ -144,7 +144,7 @@ case class ConcatWs(children: Seq[Expression])
144144

145145
evals.map(_.code).mkString("\n") +
146146
s"""
147-
int $varargNum = 0;
147+
int $varargNum = ${children.count(_.dataType == StringType) - 1};
148148
int $idxInVararg = 0;
149149
${varargCount.mkString("\n")}
150150
UTF8String[] $array = new UTF8String[$varargNum];

0 commit comments

Comments
 (0)