cloud-fan commented on a change in pull request #33955:
URL: https://github.com/apache/spark/pull/33955#discussion_r706158509
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala
##########
@@ -3649,61 +3643,37 @@ case class ArrayUnion(left: Expression, right:
Expression) extends ArrayBinaryLi
val ptName = CodeGenerator.primitiveTypeName(jt)
nullSafeCodeGen(ctx, ev, (array1, array2) => {
- val foundNullElement = ctx.freshName("foundNullElement")
val nullElementIndex = ctx.freshName("nullElementIndex")
val builder = ctx.freshName("builder")
val array = ctx.freshName("array")
val arrays = ctx.freshName("arrays")
val arrayDataIdx = ctx.freshName("arrayDataIdx")
- val openHashSet = classOf[OpenHashSet[_]].getName
+ val openHashSet = classOf[SQLOpenHashSet[_]].getName
val classTag = s"scala.reflect.ClassTag$$.MODULE$$.$hsTypeName()"
val hashSet = ctx.freshName("hashSet")
val arrayBuilder = classOf[mutable.ArrayBuilder[_]].getName
val arrayBuilderClass = s"$arrayBuilder$$of$ptName"
- def withArrayNullAssignment(body: String) =
- if (dataType.asInstanceOf[ArrayType].containsNull) {
- s"""
- |if ($array.isNullAt($i)) {
- | if (!$foundNullElement) {
- | $nullElementIndex = $size;
- | $foundNullElement = true;
- | $size++;
- | $builder.$$plus$$eq($nullValueHolder);
- | }
- |} else {
- | $body
- |}
- """.stripMargin
- } else {
- body
- }
-
- val processArray = withArrayNullAssignment(
+ val processArray =
s"""
|$jt $value = ${genGetValue(array, i)};
Review comment:
The value can be primitive type, and we should make sure it's not null
before calling `SQLOpenHashSet.add/contains`. We should still follow the
previous code style.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
