Fixed merge conflicts and upmerged

NVIDIA · Oct 17, 2024 · 421a668 · 421a668
1 parent a60920c
commit 421a668
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/df_udf/src/main/spark320/scala/org/apache/spark/sql/nvidia/DFUDFShims.scala b/df_udf/src/main/spark320/scala/org/apache/spark/sql/nvidia/DFUDFShims.scala
@@ -38,6 +38,7 @@
 {"spark": "350"}
 {"spark": "351"}
 {"spark": "352"}
+{"spark": "353"}
 spark-rapids-shim-json-lines ***/
 package org.apache.spark.sql.nvidia
 

diff --git a/...scala/org/apache/spark/sql/rapids/shims/SequenceSizeTooLongUnsuccessfulErrorBuilder.scala b/...scala/org/apache/spark/sql/rapids/shims/SequenceSizeTooLongUnsuccessfulErrorBuilder.scala
@@ -20,6 +20,7 @@
 {"spark": "343"}
 {"spark": "351"}
 {"spark": "352"}
+{"spark": "353"}
 spark-rapids-shim-json-lines ***/
 package org.apache.spark.sql.rapids.shims
 

diff --git a/...c/main/spark340/scala/org/apache/spark/sql/rapids/shims/RapidsErrorUtils340PlusBase.scala b/...c/main/spark340/scala/org/apache/spark/sql/rapids/shims/RapidsErrorUtils340PlusBase.scala
@@ -22,6 +22,7 @@
 {"spark": "350"}
 {"spark": "351"}
 {"spark": "352"}
+{"spark": "353"}
 {"spark": "400"}
 spark-rapids-shim-json-lines ***/
 package org.apache.spark.sql.rapids.shims