From d1f601ad24326216ebdf7475775a7a8792d53009 Mon Sep 17 00:00:00 2001
From: Peixin <pxli@nyu.edu>
Date: Thu, 16 Jun 2022 10:50:55 +0800
Subject: [PATCH] Update spark330shim to use released lib (#5848)

* Revert "Temporarily allow 3.3.1 for 3.3.0 shims. (#5693)"

This reverts commit 53cfa49db0567727cee600707d16f17bb0d75ab0.

* update shim330 dep to released spark 330 libs

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

* drop 330 from snapshot section in buildall
---
 build/buildall                                         |  3 ++-
 dist/pom.xml                                           | 10 +++++-----
 docs/additional-functionality/rapids-shuffle.md        |  1 +
 pom.xml                                                |  2 +-
 .../shims/spark330/SparkShimServiceProvider.scala      |  4 +---
 .../rapids/shims/spark330/Spark330ShimsSuite.scala     |  4 +---
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/build/buildall b/build/buildall
index 8c5bc33a03b..5d34b430b86 100755
--- a/build/buildall
+++ b/build/buildall
@@ -159,7 +159,6 @@ case $DIST_PROFILE in
       320
       321
       322
-      330
     )
     ;;
 
@@ -171,6 +170,7 @@ case $DIST_PROFILE in
       313
       320
       321
+      330
     )
     ;;
 
@@ -179,6 +179,7 @@ case $DIST_PROFILE in
       321cdh
       312
       320
+      330
     )
     ;;
 
diff --git a/dist/pom.xml b/dist/pom.xml
index e08972f08dc..d1e60353b61 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -46,12 +46,12 @@
             313,
             320,
             321,
-            321cdh
+            321cdh,
+            330
         </noSnapshot.buildvers>
         <snapshot.buildvers>
             314,
-            322,
-            330
+            322
         </snapshot.buildvers>
         <databricks.buildvers>
             312db,
@@ -91,14 +91,14 @@
                 - a downstream distro
                 - a snapshot
             for testing while minimizing the build time
-            TODO add 3.3.0-SNAPSHOT
             -->
             <id>minimumFeatureVersionMix</id>
             <properties>
                 <included_buildvers>
                     312,
                     320,
-                    321cdh
+                    321cdh,
+                    330
                 </included_buildvers>
             </properties>
         </profile>
diff --git a/docs/additional-functionality/rapids-shuffle.md b/docs/additional-functionality/rapids-shuffle.md
index 16e8eaeed25..d667f251ef8 100644
--- a/docs/additional-functionality/rapids-shuffle.md
+++ b/docs/additional-functionality/rapids-shuffle.md
@@ -286,6 +286,7 @@ In this section, we are using a docker container built using the sample dockerfi
    | 3.2.0           | com.nvidia.spark.rapids.spark320.RapidsShuffleManager    |
    | 3.2.1           | com.nvidia.spark.rapids.spark321.RapidsShuffleManager    |
    | 3.2.1 CDH       | com.nvidia.spark.rapids.spark321cdh.RapidsShuffleManager |
+   | 3.3.0           | com.nvidia.spark.rapids.spark330.RapidsShuffleManager    |
    | Databricks 9.1  | com.nvidia.spark.rapids.spark312db.RapidsShuffleManager  |
    | Databricks 10.4 | com.nvidia.spark.rapids.spark321db.RapidsShuffleManager  |
 
diff --git a/pom.xml b/pom.xml
index 21f45f3175b..6d327b37562 100644
--- a/pom.xml
+++ b/pom.xml
@@ -863,7 +863,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.1-SNAPSHOT</spark330.version>
+        <spark330.version>3.3.0</spark330.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/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 18b52b9f319..547643aae83 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,9 +20,7 @@ import com.nvidia.spark.rapids.SparkShimVersion
 
 object SparkShimServiceProvider {
   val VERSION = SparkShimVersion(3, 3, 0)
-  // 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"))
+  val VERSIONNAMES = Seq(s"$VERSION", s"$VERSION-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 02ffb264921..4691068b413 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,9 +24,7 @@ import org.apache.spark.sql.types.{DayTimeIntervalType, YearMonthIntervalType}
 
 class Spark330ShimsSuite extends FunSuite {
   test("spark shims version") {
-    // 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))
+    assert(SparkShimImpl.getSparkShimVersion === SparkShimVersion(3, 3, 0))
   }
 
   test("shuffle manager class") {