Fix spark330 build due to removal of isElementAt parameter from mapKe…

…yNotExistError (#5296) Signed-off-by: Jason Lowe <jlowe@nvidia.com>
NVIDIA · Apr 21, 2022 · 80ad204 · 80ad204
1 parent 04b8ea9
commit 80ad204
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 10 deletions.
diff --git a/...gin/src/main/311until330-nondb/scala/com/nvidia/spark/rapids/shims/RapidsErrorUtils.scala b/...gin/src/main/311until330-nondb/scala/com/nvidia/spark/rapids/shims/RapidsErrorUtils.scala
@@ -27,7 +27,6 @@ object RapidsErrorUtils {
 
   def mapKeyNotExistError(
       key: String,
-      isElementAtFunction: Boolean = false,
       origin: Origin): NoSuchElementException = {
     // Follow the Spark string format before 3.3.0
     new NoSuchElementException(s"Key $key does not exist.")

diff --git a/sql-plugin/src/main/31xdb/scala/com/nvidia/spark/rapids/shims/RapidsErrorUtils.scala b/sql-plugin/src/main/31xdb/scala/com/nvidia/spark/rapids/shims/RapidsErrorUtils.scala
@@ -27,7 +27,6 @@ object RapidsErrorUtils {
 
   def mapKeyNotExistError(
       key: String,
-      isElementAtFunction: Boolean,
       origin: Origin): NoSuchElementException = {
     // Follow the Spark string format before 3.3.0
     new NoSuchElementException(s"Key $key does not exist.")

diff --git a/sql-plugin/src/main/321db/scala/com/nvidia/spark/rapids/shims/RapidsErrorUtils.scala b/sql-plugin/src/main/321db/scala/com/nvidia/spark/rapids/shims/RapidsErrorUtils.scala
@@ -31,7 +31,6 @@ object RapidsErrorUtils {
 
   def mapKeyNotExistError(
       key: String,
-      isElementAtFunction: Boolean,
       origin: Origin): NoSuchElementException = {
     // For now, the default argument is false. The caller sets the correct value accordingly.
     QueryExecutionErrors.mapKeyNotExistError(key)

diff --git a/sql-plugin/src/main/330+/scala/com/nvidia/spark/rapids/shims/RapidsErrorUtils.scala b/sql-plugin/src/main/330+/scala/com/nvidia/spark/rapids/shims/RapidsErrorUtils.scala
@@ -31,10 +31,8 @@ object RapidsErrorUtils {
 
   def mapKeyNotExistError(
       key: String,
-      isElementAtFunction: Boolean,
       origin: Origin): NoSuchElementException = {
-    // For now, the default argument is false. The caller sets the correct value accordingly.
-    QueryExecutionErrors.mapKeyNotExistError(key, isElementAtFunction, origin.context)
+    QueryExecutionErrors.mapKeyNotExistError(key, origin.context)
   }
 
   def sqlArrayIndexNotStartAtOneError(): ArrayIndexOutOfBoundsException = {

diff --git a/sql-plugin/src/main/scala/org/apache/spark/sql/rapids/collectionOperations.scala b/sql-plugin/src/main/scala/org/apache/spark/sql/rapids/collectionOperations.scala
@@ -231,8 +231,7 @@ case class GpuElementAt(left: Expression, right: Expression, failOnError: Boolea
                 if (!exist.isValid || exist.getBoolean) {
                   map.getMapValue(key)
                 } else {
-                  throw RapidsErrorUtils.mapKeyNotExistError(keyS.getValue.toString,
-                    isElementAtFunction = true, origin)
+                  throw RapidsErrorUtils.mapKeyNotExistError(keyS.getValue.toString, origin)
                 }
               }
             }

diff --git a/sql-plugin/src/main/scala/org/apache/spark/sql/rapids/complexTypeExtractors.scala b/sql-plugin/src/main/scala/org/apache/spark/sql/rapids/complexTypeExtractors.scala
@@ -212,8 +212,7 @@ case class GpuGetMapValue(child: Expression, key: Expression, failOnError: Boole
       withResource(lhs.getBase.getMapKeyExistence(rhs.getBase)) { keyExistenceColumn =>
         withResource(keyExistenceColumn.all) { exist =>
           if (exist.isValid && !exist.getBoolean) {
-            throw RapidsErrorUtils.mapKeyNotExistError(rhs.getValue.toString,
-              isElementAtFunction = false, origin)
+            throw RapidsErrorUtils.mapKeyNotExistError(rhs.getValue.toString, origin)
           }
         }
       }