AngersZhuuuu commented on a change in pull request #33955: URL: https://github.com/apache/spark/pull/33955#discussion_r706276531
########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/util/SQLOpenHashSet.scala ########## @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.util + +import scala.reflect._ + +import org.apache.spark.annotation.Private +import org.apache.spark.util.collection.OpenHashSet + +/** + * A wrap of [[OpenHashSet]] that can handle null, Double.NaN and Float.NaN. + */ +@Private +class SQLOpenHashSet[@specialized(Long, Int, Double, Float) T: ClassTag]( + initialCapacity: Int, + loadFactor: Double) { + + def this(initialCapacity: Int) = this(initialCapacity, 0.7) + + def this() = this(64) + + private val hashSet = new OpenHashSet[T](initialCapacity, loadFactor) + + private var containsNull = false + private var containsDoubleNaN = false + private var containsFloatNaN = false Review comment: How about current ########## 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: Done -- 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]
