diff --git a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala index 12ac706612..e7ff3a5f4b 100644 --- a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala +++ b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala @@ -597,7 +597,9 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter { "correlationoptimizer4", "multiMapJoin1", "orc_dictionary_threshold", - "udf_hash" + "udf_hash", + // Moved to HiveQuerySuite + "udf_radians" ) private def commonWhiteList = Seq( @@ -1057,7 +1059,6 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter { "udf_positive", "udf_pow", "udf_power", - "udf_radians", "udf_rand", "udf_regexp", "udf_regexp_extract", diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala index 6986963ecc..53798e0ac2 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala @@ -24,6 +24,7 @@ import java.util.{Locale, TimeZone} import scala.util.Try +import org.apache.commons.lang3.{JavaVersion, SystemUtils} import org.apache.hadoop.hive.conf.HiveConf.ConfVars import org.scalatest.BeforeAndAfter @@ -1207,6 +1208,22 @@ class HiveQuerySuite extends HiveComparisonTest with SQLTestUtils with BeforeAnd } } } + + // This test case is moved from HiveCompatibilitySuite to make it easy to test with JDK 11. + test("udf_radians") { + withSQLConf("hive.fetch.task.conversion" -> "more") { + val result = sql("select radians(57.2958) FROM src tablesample (1 rows)").collect() + if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)) { + assertResult(Array(Row(1.0000003575641672))) (result) + } else { + assertResult(Array(Row(1.000000357564167))) (result) + } + + assertResult(Array(Row(2.4999991485811655))) { + sql("select radians(143.2394) FROM src tablesample (1 rows)").collect() + } + } + } } // for SPARK-2180 test