From 04d208a07c271ac906e313858e891679a95ee861 Mon Sep 17 00:00:00 2001
From: Peixin <pxli@nyu.edu>
Date: Wed, 13 Oct 2021 21:08:35 +0800
Subject: [PATCH] Update spark320.version to 3.2.0 (#3806)

* Update spark320 version to 3.2.0

Signed-off-by: Peixin Li <pxli@nyu.edu>

* fix version check

* fix rename error
---
 pom.xml                                                    | 2 +-
 .../nvidia/spark/rapids/shims/spark320/Spark320Shims.scala | 2 +-
 .../rapids/shims/spark320/SparkShimServiceProvider.scala   | 7 ++-----
 .../spark/rapids/shims/spark320/Spark320ShimsSuite.scala   | 4 +---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5e22fd20b9c..b79b50cc168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -664,7 +664,7 @@
         <spark311cdh.version>3.1.1.3.1.7270.0-253</spark311cdh.version>
         <spark312.version>3.1.2</spark312.version>
         <spark313.version>3.1.3-SNAPSHOT</spark313.version>
-        <spark320.version>3.2.1-SNAPSHOT</spark320.version>
+        <spark320.version>3.2.0</spark320.version>
         <mockito.version>3.6.0</mockito.version>
         <scala.plugin.version>4.3.0</scala.plugin.version>
         <maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
diff --git a/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/Spark320Shims.scala b/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/Spark320Shims.scala
index a8318e7d4d8..69c80c7d34f 100644
--- a/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/Spark320Shims.scala
+++ b/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/Spark320Shims.scala
@@ -70,7 +70,7 @@ import org.apache.spark.storage.{BlockId, BlockManagerId}
 import org.apache.spark.unsafe.types.CalendarInterval
 
 class Spark320Shims extends Spark32XShims {
-  override def getSparkShimVersion: ShimVersion = SparkShimServiceProvider.VERSION320
+  override def getSparkShimVersion: ShimVersion = SparkShimServiceProvider.VERSION
 
   override def getRapidsShuffleManagerClass: String = {
     classOf[RapidsShuffleManager].getCanonicalName
diff --git a/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/SparkShimServiceProvider.scala b/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/SparkShimServiceProvider.scala
index bccd846c596..93d2a8c327d 100644
--- a/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/SparkShimServiceProvider.scala
+++ b/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/SparkShimServiceProvider.scala
@@ -19,11 +19,8 @@ package com.nvidia.spark.rapids.shims.spark320
 import com.nvidia.spark.rapids.{SparkShims, SparkShimVersion}
 
 object SparkShimServiceProvider {
-  // temporarily allow 3.2.1 while 3.2.0 release candidates are being produced
-  val VERSION320 = SparkShimVersion(3, 2, 0)
-  val VERSION321 = SparkShimVersion(3, 2, 1)
-  val VERSIONNAMES: Seq[String] = Seq(VERSION320, VERSION321)
-    .flatMap(v => Seq(s"$v", s"$v-SNAPSHOT"))
+  val VERSION = SparkShimVersion(3, 2, 0)
+  val VERSIONNAMES = Seq(s"$VERSION")
 }
 
 class SparkShimServiceProvider extends com.nvidia.spark.rapids.SparkShimServiceProvider {
diff --git a/shims/spark320/src/test/scala/com/nvidia/spark/rapids/shims/spark320/Spark320ShimsSuite.scala b/shims/spark320/src/test/scala/com/nvidia/spark/rapids/shims/spark320/Spark320ShimsSuite.scala
index cec24e4e9a9..3820b4ce058 100644
--- a/shims/spark320/src/test/scala/com/nvidia/spark/rapids/shims/spark320/Spark320ShimsSuite.scala
+++ b/shims/spark320/src/test/scala/com/nvidia/spark/rapids/shims/spark320/Spark320ShimsSuite.scala
@@ -24,9 +24,7 @@ import org.apache.spark.sql.types.{DayTimeIntervalType, YearMonthIntervalType}
 class Spark320ShimsSuite extends FunSuite {
   val sparkShims: SparkShims = new SparkShimServiceProvider().buildShim
   test("spark shims version") {
-    // temporarily allow 3.2.1 while 3.2.0 release candidates are being produced
-    assert(sparkShims.getSparkShimVersion === SparkShimVersion(3, 2, 0) ||
-      sparkShims.getSparkShimVersion === SparkShimVersion(3, 2, 1))
+    assert(sparkShims.getSparkShimVersion === SparkShimVersion(3, 2, 0))
   }
 
   test("shuffle manager class") {