From 15fad2af9a35a936d271630671d197905a34e7e7 Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@nvidia.com>
Date: Tue, 31 May 2022 12:57:03 -0500
Subject: [PATCH] Temporarily allow 3.3.1 for 3.3.0 shims. (#5693) (#5700)

Temporarily allow 3.3.1 while 3.3.0 release candidates are being produced

Signed-off-by: Firestarman <firestarmanllc@gmail.com>

Co-authored-by: Liangcai Li <firestarmanllc@gmail.com>
---
 pom.xml                                                       | 2 +-
 .../rapids/shims/spark330/SparkShimServiceProvider.scala      | 4 +++-
 .../spark/rapids/shims/spark330/Spark330ShimsSuite.scala      | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 07879f57d6a..b5394391db1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -924,7 +924,7 @@
         <spark321cdh.version>3.2.1.3.2.7171000.0-3</spark321cdh.version>
         <spark321db.version>3.2.1-databricks</spark321db.version>
         <spark322.version>3.2.2-SNAPSHOT</spark322.version>
-        <spark330.version>3.3.0-SNAPSHOT</spark330.version>
+        <spark330.version>3.3.1-SNAPSHOT</spark330.version>
         <spark340.version>3.4.0-SNAPSHOT</spark340.version>
         <mockito.version>3.6.0</mockito.version>
         <scala.plugin.version>4.3.0</scala.plugin.version>
diff --git a/sql-plugin/src/main/330/scala/com/nvidia/spark/rapids/shims/spark330/SparkShimServiceProvider.scala b/sql-plugin/src/main/330/scala/com/nvidia/spark/rapids/shims/spark330/SparkShimServiceProvider.scala
index 547643aae83..18b52b9f319 100644
--- a/sql-plugin/src/main/330/scala/com/nvidia/spark/rapids/shims/spark330/SparkShimServiceProvider.scala
+++ b/sql-plugin/src/main/330/scala/com/nvidia/spark/rapids/shims/spark330/SparkShimServiceProvider.scala
@@ -20,7 +20,9 @@ import com.nvidia.spark.rapids.SparkShimVersion
 
 object SparkShimServiceProvider {
   val VERSION = SparkShimVersion(3, 3, 0)
-  val VERSIONNAMES = Seq(s"$VERSION", s"$VERSION-SNAPSHOT")
+  // temporarily allow 3.3.1 while 3.3.0 release candidates are being produced
+  private val VERSION331 = SparkShimVersion(3, 3, 1)
+  val VERSIONNAMES = Seq(VERSION, VERSION331).flatMap(v => Seq(s"$v", s"$v-SNAPSHOT"))
 }
 
 class SparkShimServiceProvider extends com.nvidia.spark.rapids.SparkShimServiceProvider {
diff --git a/sql-plugin/src/test/330/scala/com/nvidia/spark/rapids/shims/spark330/Spark330ShimsSuite.scala b/sql-plugin/src/test/330/scala/com/nvidia/spark/rapids/shims/spark330/Spark330ShimsSuite.scala
index 4691068b413..02ffb264921 100644
--- a/sql-plugin/src/test/330/scala/com/nvidia/spark/rapids/shims/spark330/Spark330ShimsSuite.scala
+++ b/sql-plugin/src/test/330/scala/com/nvidia/spark/rapids/shims/spark330/Spark330ShimsSuite.scala
@@ -24,7 +24,9 @@ import org.apache.spark.sql.types.{DayTimeIntervalType, YearMonthIntervalType}
 
 class Spark330ShimsSuite extends FunSuite {
   test("spark shims version") {
-    assert(SparkShimImpl.getSparkShimVersion === SparkShimVersion(3, 3, 0))
+    // temporarily allow 3.3.1 while 3.3.0 release candidates are being produced
+    assert(SparkShimImpl.getSparkShimVersion === SparkShimVersion(3, 3, 0) ||
+      SparkShimImpl.getSparkShimVersion === SparkShimVersion(3, 3, 1))
   }
 
   test("shuffle manager class") {