-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-36702][SQL] ArrayUnion handle duplicated Double.NaN and Float.Nan #33955
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
AngersZhuuuu
wants to merge
24
commits into
apache:master
from
AngersZhuuuu:SPARK-36702-WrapOpenHashSet
Closed
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
8579c97
[SPARK-36702][SQL] ArrayUnion handle duplicated Double.NaN and Float.Nan
AngersZhuuuu d6e4f39
follow comment
AngersZhuuuu a481196
Update collectionOperations.scala
AngersZhuuuu 1857988
Update collectionOperations.scala
AngersZhuuuu 4e533fd
Update collectionOperations.scala
AngersZhuuuu 119679c
update
AngersZhuuuu 45d1fee
Update SQLOpenHashSet.scala
AngersZhuuuu 08cc967
update
AngersZhuuuu 8d0e4a9
Merge branch 'SPARK-36702-WrapOpenHashSet' of https://github.com/Ange…
AngersZhuuuu 36758d1
update
AngersZhuuuu 5b077a5
Update collectionOperations.scala
AngersZhuuuu 89a4263
Update collectionOperations.scala
AngersZhuuuu 1ac5ab3
Update collectionOperations.scala
AngersZhuuuu 08da413
Update collectionOperations.scala
AngersZhuuuu 0da6ea5
Update collectionOperations.scala
AngersZhuuuu 3059ea1
Update collectionOperations.scala
AngersZhuuuu 991fddd
Update sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expr…
AngersZhuuuu db8159e
trigger
AngersZhuuuu eb1f028
Update SQLOpenHashSet.scala
AngersZhuuuu f59c0a8
Merge branch 'master' into SPARK-36702-WrapOpenHashSet
AngersZhuuuu f27c4e1
Update SQLOpenHashSet.scala
AngersZhuuuu affd31a
Revert "Update SQLOpenHashSet.scala"
AngersZhuuuu fe407c9
Update SQLOpenHashSet.scala
AngersZhuuuu 4e5e085
trigger
AngersZhuuuu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
sql/catalyst/src/main/scala/org/apache/spark/sql/util/SQLOpenHashSet.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * 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.sql.types.{DataType, DoubleType, FloatType} | ||
| import org.apache.spark.util.collection.OpenHashSet | ||
|
|
||
| // A wrap of OpenHashSet that can handle null, Double.NaN and Float.NaN w.r.t. the SQL semantic. | ||
| @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 containNull = false | ||
| private var containNaN = false | ||
|
|
||
| def addNull(): Unit = { | ||
| containNull = true | ||
| } | ||
|
|
||
| def addNaN(): Unit = { | ||
| containNaN = true | ||
| } | ||
|
|
||
| def add(k: T): Unit = { | ||
| hashSet.add(k) | ||
| } | ||
|
|
||
| def contains(k: T): Boolean = { | ||
AngersZhuuuu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| hashSet.contains(k) | ||
| } | ||
|
|
||
| def containsNull(): Boolean = containNull | ||
|
|
||
| def containsNaN(): Boolean = containNaN | ||
| } | ||
|
|
||
| object SQLOpenHashSet { | ||
| def isNaN(dataType: DataType): Any => Boolean = { | ||
| dataType match { | ||
| case DoubleType => | ||
| (value: Any) => java.lang.Double.isNaN(value.asInstanceOf[java.lang.Double]) | ||
| case FloatType => | ||
| (value: Any) => java.lang.Float.isNaN(value.asInstanceOf[java.lang.Float]) | ||
| case _ => (_: Any) => false | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ur, BTW, there are multiple
NaNvalues which has different bytes fromDouble.NaN. So, this new semantic is adding the firstNaNvalue into the result, right?@cloud-fan and @AngersZhuuuu . Do we need to normalize the NaN value by adding
Double.NaNorFloat.NaNalways?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good point!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, @cloud-fan and @AngersZhuuuu .