Skip to content

[SPARK-32688][SQL][TEST] Add special values to LiteralGenerator for float and double #29515

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.

Sign up for GitHub

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
tanelk wants to merge 8 commits into from
Closed

[SPARK-32688][SQL][TEST] Add special values to LiteralGenerator for float and double #29515

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8c8313c
Add special values to LiteralGenerator for float and double
tanelk Aug 22, 2020
77d63ac
Add 'MaxValue' to LiteralGenerator for float and double
tanelk Aug 23, 2020
818abe2
Ensure -0.0 and 0.0 comparison consistency
tanelk Aug 23, 2020
1116d3d
Revert equality check
tanelk Aug 23, 2020
2dce36e
test -0.0 equality for complex types
tanelk Aug 23, 2020
9a3b983
Add -0.0 as special value to RandomDataGenerator
tanelk Aug 24, 2020
d20a2ed
revert test -0.0 equality for complex types
tanelk Sep 4, 2020
529aba8
revert test -0.0 equality for complex types
tanelk Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test -0.0 equality for complex types
  • Loading branch information
@tanelk
tanelk committed Aug 23, 2020
commit 2dce36e9afac3b1b0e8abdc63836e8c48143a46c
2 changes: 2 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/LiteralGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ object LiteralGenerator {
case BinaryType => binaryLiteralGen
case CalendarIntervalType => calendarIntervalLiterGen
case DecimalType.Fixed(precision, scale) => decimalLiteralGen(precision, scale)
case ArrayType(et, _) => randomGen(et).map(
lit => Literal.create(Array(lit.value), ArrayType(et)))
case dt => throw new IllegalArgumentException(s"not supported type $dt")
}
}
Expand Down
35 changes: 29 additions & 6 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/PredicateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.sql.{Date, Timestamp}
import scala.collection.immutable.HashSet

import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.RandomDataGenerator
import org.apache.spark.sql.{RandomDataGenerator, Row}
import org.apache.spark.sql.catalyst.{CatalystTypeConverters, InternalRow}
import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
import org.apache.spark.sql.catalyst.encoders.ExamplePointUDT
Expand Down Expand Up @@ -91,6 +91,10 @@ class PredicateSuite extends SparkFunSuite with ExpressionEvalHelper {
DataTypeTestUtils.propertyCheckSupported.foreach { dt =>
checkConsistencyBetweenInterpretedAndCodegen(EqualTo, dt, dt)
checkConsistencyBetweenInterpretedAndCodegen(EqualNullSafe, dt, dt)

val arrayType = ArrayType(dt)
checkConsistencyBetweenInterpretedAndCodegen(EqualTo, arrayType, arrayType)
checkConsistencyBetweenInterpretedAndCodegen(EqualNullSafe, arrayType, arrayType)
}
}

Expand Down Expand Up @@ -496,11 +500,30 @@ class PredicateSuite extends SparkFunSuite with ExpressionEvalHelper {
checkEvaluation(EqualTo(infinity, infinity), true)
}

test("SPARK-32688: 0.0 and -0.0 should be considered equal") {
checkEvaluation(EqualTo(Literal(0.0), Literal(-0.0)), true)
checkEvaluation(EqualNullSafe(Literal(0.0), Literal(-0.0)), true)
checkEvaluation(EqualTo(Literal(0.0f), Literal(-0.0f)), true)
checkEvaluation(EqualNullSafe(Literal(0.0f), Literal(-0.0f)), true)
private def testEquality(literals: Seq[Literal]): Unit = {
literals.foreach(left => {
literals.foreach(right => {
checkEvaluation(EqualTo(left, right), true)
checkEvaluation(EqualNullSafe(left, right), true)

val leftArray = Literal.create(Array(left.value), ArrayType(left.dataType))
val rightArray = Literal.create(Array(right.value), ArrayType(right.dataType))
checkEvaluation(EqualTo(leftArray, rightArray), true)
checkEvaluation(EqualNullSafe(leftArray, rightArray), true)

val leftStruct = Literal.create(
Row(left.value), new StructType().add("a", left.dataType))
val rightStruct = Literal.create(
Row(right.value), new StructType().add("a", right.dataType))
checkEvaluation(EqualTo(leftStruct, rightStruct), true)
checkEvaluation(EqualNullSafe(leftStruct, rightStruct), true)
})
})
}

test("SPARK-32688: 0.0 and -0.0 should be equal") {
testEquality(Seq(Literal(0.0), Literal(-0.0)))
testEquality(Seq(Literal(0.0f), Literal(-0.0f)))
}

test("SPARK-22693: InSet should not use global variables") {
Expand Down