From c1f6a57c74b412b7ab50e626bc7314bd5364f85c Mon Sep 17 00:00:00 2001 From: Gera Shegalov Date: Thu, 16 Nov 2023 23:31:45 -0800 Subject: [PATCH 1/2] Use withGpuSparkSession to customize SparkConf (Ansi)CastOpSuite @ (ansi) cast decimal to string Signed-off-by: Gera Shegalov --- .../nvidia/spark/rapids/AnsiCastOpSuite.scala | 19 ++++++++----------- .../com/nvidia/spark/rapids/CastOpSuite.scala | 14 +++++++------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/tests/src/test/scala/com/nvidia/spark/rapids/AnsiCastOpSuite.scala b/tests/src/test/scala/com/nvidia/spark/rapids/AnsiCastOpSuite.scala index d99b79bb0ad..0f09b53298d 100644 --- a/tests/src/test/scala/com/nvidia/spark/rapids/AnsiCastOpSuite.scala +++ b/tests/src/test/scala/com/nvidia/spark/rapids/AnsiCastOpSuite.scala @@ -18,11 +18,8 @@ package com.nvidia.spark.rapids import java.sql.Timestamp import java.time.DateTimeException - import scala.util.Random - import com.nvidia.spark.rapids.shims.{CastingConfigShim, SparkShimImpl} - import org.apache.spark.{SparkConf, SparkException} import org.apache.spark.sql.{DataFrame, Row, SparkSession} import org.apache.spark.sql.catalyst.expressions.{Alias, Expression, NamedExpression} @@ -458,14 +455,14 @@ class AnsiCastOpSuite extends GpuExpressionTestSuite { } test("ansi_cast decimal to string") { - val sqlCtx = SparkSession.getActiveSession.get.sqlContext - sqlCtx.setConf("spark.sql.legacy.allowNegativeScaleOfDecimal", "true") - - Seq(10, 15, 18).foreach { precision => - Seq(-precision, -5, 0, 5, precision).foreach { scale => - testCastToString(DataTypes.createDecimalType(precision, scale), - ansiMode = true, - comparisonFunc = None) + withGpuSparkSession { spark => + spark.conf.set("spark.sql.legacy.allowNegativeScaleOfDecimal", true.toString) + Seq(10, 15, 18).foreach { precision => + Seq(-precision, -5, 0, 5, precision).foreach { scale => + testCastToString(DataTypes.createDecimalType(precision, scale), + ansiMode = true, + comparisonFunc = None) + } } } } diff --git a/tests/src/test/scala/com/nvidia/spark/rapids/CastOpSuite.scala b/tests/src/test/scala/com/nvidia/spark/rapids/CastOpSuite.scala index 8e7eb00579c..5fe42a6539c 100644 --- a/tests/src/test/scala/com/nvidia/spark/rapids/CastOpSuite.scala +++ b/tests/src/test/scala/com/nvidia/spark/rapids/CastOpSuite.scala @@ -445,13 +445,13 @@ class CastOpSuite extends GpuExpressionTestSuite { } test("cast decimal to string") { - val sqlCtx = SparkSession.getActiveSession.get.sqlContext - sqlCtx.setConf("spark.sql.legacy.allowNegativeScaleOfDecimal", "true") - - Seq(10, 15, 28).foreach { precision => - Seq(-precision, -5, 0, 5, precision).foreach { scale => - testCastToString(DataTypes.createDecimalType(precision, scale), - comparisonFunc = None) + withGpuSparkSession { spark => + spark.conf.set("spark.sql.legacy.allowNegativeScaleOfDecimal", true.toString) + Seq(10, 15, 28).foreach { precision => + Seq(-precision, -5, 0, 5, precision).foreach { scale => + testCastToString(DataTypes.createDecimalType(precision, scale), + comparisonFunc = None) + } } } } From 9f9a8311c8fe375ca3a1653cea232905d0989950 Mon Sep 17 00:00:00 2001 From: Gera Shegalov Date: Thu, 16 Nov 2023 23:46:10 -0800 Subject: [PATCH 2/2] scalastyle Signed-off-by: Gera Shegalov --- .../test/scala/com/nvidia/spark/rapids/AnsiCastOpSuite.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/src/test/scala/com/nvidia/spark/rapids/AnsiCastOpSuite.scala b/tests/src/test/scala/com/nvidia/spark/rapids/AnsiCastOpSuite.scala index 0f09b53298d..00683d5bc65 100644 --- a/tests/src/test/scala/com/nvidia/spark/rapids/AnsiCastOpSuite.scala +++ b/tests/src/test/scala/com/nvidia/spark/rapids/AnsiCastOpSuite.scala @@ -18,8 +18,11 @@ package com.nvidia.spark.rapids import java.sql.Timestamp import java.time.DateTimeException + import scala.util.Random + import com.nvidia.spark.rapids.shims.{CastingConfigShim, SparkShimImpl} + import org.apache.spark.{SparkConf, SparkException} import org.apache.spark.sql.{DataFrame, Row, SparkSession} import org.apache.spark.sql.catalyst.expressions.{Alias, Expression, NamedExpression}