From cd5cf0c2482976d25fb60638a796aaccabb821b5 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Thu, 18 Jul 2019 10:39:20 +0800 Subject: [PATCH] Remove incorrect assertions in scala tests We ran unit tests of spark on aarch64 server, then found the values of floatToRawIntBits(0.0f / 0.0f) and floatToRawIntBits(Float.NaN) on aarch64 are same, after discuss with jdk-dev and scala community, we believe the value should depend on the architecture. This removes the incorrect assertions to make sure the tests fit all architectures. --- .../org/apache/spark/sql/DataFrameAggregateSuite.scala | 7 ------- .../apache/spark/sql/DataFrameWindowFunctionsSuite.scala | 7 ------- 2 files changed, 14 deletions(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala index e005a3e9a258e..e49ef012f5ebb 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala @@ -725,13 +725,6 @@ class DataFrameAggregateSuite extends QueryTest with SharedSQLContext { } test("SPARK-26021: NaN and -0.0 in grouping expressions") { - import java.lang.Float.floatToRawIntBits - import java.lang.Double.doubleToRawLongBits - - // 0.0/0.0 and NaN are different values. - assert(floatToRawIntBits(0.0f/0.0f) != floatToRawIntBits(Float.NaN)) - assert(doubleToRawLongBits(0.0/0.0) != doubleToRawLongBits(Double.NaN)) - checkAnswer( Seq(0.0f, -0.0f, 0.0f/0.0f, Float.NaN).toDF("f").groupBy("f").count(), Row(0.0f, 2) :: Row(Float.NaN, 2) :: Nil) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameWindowFunctionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameWindowFunctionsSuite.scala index f4ba2f0673c0a..a07553008fd78 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameWindowFunctionsSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameWindowFunctionsSuite.scala @@ -697,13 +697,6 @@ class DataFrameWindowFunctionsSuite extends QueryTest with SharedSQLContext { } test("NaN and -0.0 in window partition keys") { - import java.lang.Float.floatToRawIntBits - import java.lang.Double.doubleToRawLongBits - - // 0.0/0.0 and NaN are different values. - assert(floatToRawIntBits(0.0f/0.0f) != floatToRawIntBits(Float.NaN)) - assert(doubleToRawLongBits(0.0/0.0) != doubleToRawLongBits(Double.NaN)) - val df = Seq( (Float.NaN, Double.NaN), (0.0f/0.0f, 0.0/0.0),