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
NVIDIA · Oct 13, 2021 · 04d208a · 04d208a
1 parent 877fbd9
commit 04d208a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git 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
@@ -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/...k320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/SparkShimServiceProvider.scala b/...k320/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/...s/spark320/src/test/scala/com/nvidia/spark/rapids/shims/spark320/Spark320ShimsSuite.scala b/...s/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") {