Fix SQL caller unshim compile fallout

Author: gerashegalov

sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuGetJsonObject.scala

@@ -280,7 +280,7 @@ class GetJsonObjectCombiner(private val exp: GpuGetJsonObject) extends GpuExpres
   override def addExpression(e: Expression): Unit = {
     val localOutputLocation = outputLocation
     outputLocation += 1
-    val key = GpuExpressionEquals(e)
+    val key = new GpuExpressionEquals(e)
     if (!toCombine.contains(key)) {
       toCombine.put(key, localOutputLocation)
     }
@@ -329,7 +329,7 @@ class GetJsonObjectCombiner(private val exp: GpuGetJsonObject) extends GpuExpres
   }
 
   override def getReplacementExpression(e: Expression): Option[Expression] = {
-    toCombine.get(GpuExpressionEquals(e)).map { localId =>
+    toCombine.get(new GpuExpressionEquals(e)).map { localId =>
       GpuGetStructField(multiGet, localId, Some(fieldName(localId)))
     }
   }

sql-plugin/src/main/scala/com/nvidia/spark/rapids/literals.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2025, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2026, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import com.nvidia.spark.rapids.Arm.withResource
 import com.nvidia.spark.rapids.RapidsPluginImplicits.AutoCloseableProducingArray
 import com.nvidia.spark.rapids.shims.{GpuTypeShims, SparkShimImpl}
 import org.apache.commons.codec.binary.{Hex => ApacheHex}
-import org.json4s.JsonAST.{JField, JNull, JString}
+import org.json4s.JsonAST.{JField, JNull, JString, JValue}
 
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.catalyst.InternalRow
@@ -685,7 +685,7 @@ case class GpuLiteral (value: Any, dataType: DataType) extends GpuLeafExpression
       case (l: Long, TimestampType) => JString(DateTimeUtils.toJavaTimestamp(l).toString)
       case (other, _) => JString(other.toString)
     }
-    ("value" -> jsonValue) :: ("dataType" -> TrampolineUtil.jsonValue(dataType)) :: Nil
+    ("value" -> jsonValue) :: ("dataType" -> TrampolineUtil.jsonValue(dataType).asInstanceOf[JValue]) :: Nil
   }
 
   override def sql: String = (value, dataType) match {

sql-plugin/src/main/scala/com/nvidia/spark/rapids/shims/BucketingUtilsShim.scala

@@ -43,7 +43,7 @@ object BucketingUtilsShim {
         // table and a normal one.
         val bucketIdExpression = GpuHashPartitioning(bucketColumns, spec.numBuckets)
           .partitionIdExpression
-        GpuWriterBucketSpec(bucketIdExpression, (_: Int) => "")
+        new GpuWriterBucketSpec(bucketIdExpression, (_: Int) => "")
       }
     }
   }

sql-plugin/src/main/scala/com/nvidia/spark/rapids/shims/TreeNode.scala

@@ -16,7 +16,7 @@
 
 package com.nvidia.spark.rapids.shims
 
-import org.apache.spark.sql.catalyst.expressions.{BinaryExpression, Expression, TernaryExpression, UnaryExpression}
+import org.apache.spark.sql.catalyst.expressions.{BinaryExpression, Expression, Predicate, TernaryExpression, UnaryExpression}
 import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, UnaryCommand}
 import org.apache.spark.sql.execution.{BinaryExecNode, SparkPlan, UnaryExecNode}
 import org.apache.spark.sql.execution.command.DataWritingCommand
@@ -49,6 +49,10 @@ trait ShimTernaryExpression extends TernaryExpression {
   }
 }
 
+trait ShimPredicate extends Predicate {
+  def contextIndependentFoldable: Boolean = children.forall(_.foldable)
+}
+
 trait ShimSparkPlan extends SparkPlan {
   override def withNewChildrenInternal(newChildren: IndexedSeq[SparkPlan]): SparkPlan = {
     legacyWithNewChildren(newChildren)

sql-plugin/src/main/scala/com/nvidia/spark/rapids/shims/parquet/ParquetSchemaClipShims.scala

@@ -107,7 +107,7 @@ object ParquetSchemaClipShims {
       val scale = decimalLogicalTypeAnnotation.getScale
 
       if (!(maxPrecision == -1 || 1 <= precision && precision <= maxPrecision)) {
-        throw new RapidsAnalysisException(s"Invalid decimal precision: $typeName " +
+        throw RapidsAnalysisException(s"Invalid decimal precision: $typeName " +
             s"cannot store $precision digits (max $maxPrecision)")
       }
 
@@ -166,14 +166,14 @@ object ParquetSchemaClipShims {
               ParquetTimestampAnnotationShims.timestampTypeForMillisOrMicros(timestamp)
           case timestamp: TimestampLogicalTypeAnnotation if timestamp.getUnit == TimeUnit.NANOS &&
               ParquetLegacyNanoAsLongShims.legacyParquetNanosAsLong =>
-            throw new RapidsAnalysisException(
+            throw RapidsAnalysisException(
               "GPU does not support spark.sql.legacy.parquet.nanosAsLong")
           case _ => illegalType()
         }
 
       case INT96 =>
         if (!SQLConf.get.isParquetINT96AsTimestamp) {
-          throw new RapidsAnalysisException(
+          throw RapidsAnalysisException(
             "INT96 is not supported unless it's interpreted as timestamp. " +
               s"Please try to set ${SQLConf.PARQUET_INT96_AS_TIMESTAMP.key} to true.")
         }

sql-plugin/src/main/spark330/scala/org/apache/spark/sql/rapids/execution/python/shims/PythonArgumentUtils.scala

@@ -64,6 +64,6 @@ object PythonArgumentUtils {
         }
       }.toArray
     }.toArray
-    GpuPythonArguments(allInputs.toSeq, dataTypes.toSeq, argOffsets, None)
+    new GpuPythonArguments(allInputs.toSeq, dataTypes.toSeq, argOffsets, None)
   }
 }

sql-plugin/src/main/spark332db/scala/org/apache/spark/sql/rapids/GpuFileFormatWriter.scala

@@ -533,7 +533,7 @@ trait GpuFileFormatWriterBase extends Serializable with Logging {
   private def verifySchema(format: ColumnarFileFormat, schema: StructType): Unit = {
     schema.foreach { field =>
       if (!format.supportDataType(field.dataType)) {
-        throw new RapidsAnalysisException(
+        throw RapidsAnalysisException(
           s"$format data source does not support ${field.dataType.catalogString} data type.")
       }
     }

sql-plugin/src/main/spark350db143/scala/org/apache/spark/sql/rapids/execution/python/shims/PythonArgumentsUtils.scala

@@ -48,15 +48,15 @@ object PythonArgumentUtils {
             (None, e)
         }
         if (allInputs.exists(_.semanticEquals(value))) {
-          GpuArgumentMeta(allInputs.indexWhere(_.semanticEquals(value)), key)
+          new GpuArgumentMeta(allInputs.indexWhere(_.semanticEquals(value)), key)
         } else {
           allInputs += value
           dataTypes += value.dataType
-          GpuArgumentMeta(allInputs.length - 1, key)
+          new GpuArgumentMeta(allInputs.length - 1, key)
         }
       }.toArray
     }.toArray
-    GpuPythonArguments(allInputs.toSeq, dataTypes.toSeq,
+    new GpuPythonArguments(allInputs.toSeq, dataTypes.toSeq,
       argMetas.map(_.map(_.offset)), Some(argMetas.map(_.map(_.name))))
   }
 }

tests/src/test/scala/com/nvidia/spark/rapids/GpuSemaphoreSuite.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2024, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2026, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,15 +86,15 @@ class GpuSemaphoreSuite extends AnyFunSuite
 
   def assertAcquired(result: TryAcquireResult): Unit = result match {
     case SemaphoreAcquired => // NOOP
-    case AcquireFailed(_) =>
+    case _: AcquireFailed =>
       fail("The Semaphore was not acquired")
   }
 
   def assertNotAcquired(numExpectedWaiting: Int, result: TryAcquireResult): Unit = result match {
     case SemaphoreAcquired =>
       fail("The Semaphore was acquired when we didn't expect it")
-    case AcquireFailed(numWaiting) =>
-      assert(numWaiting == numExpectedWaiting, "The number of waiting tasks didn't match")
+    case failed: AcquireFailed =>
+      assert(failed.numWaitingTasks == numExpectedWaiting, "The number of waiting tasks didn't match")
   }
 
   test("multi tryAcquire") {

tests/src/test/scala/com/nvidia/spark/rapids/GpuSortRetrySuite.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2025, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2026, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -176,10 +176,14 @@ class GpuSortRetrySuite extends RmmSparkRetrySuiteBase with MockitoSugar {
   }
 
   test("GPU each batch sort with GpuRetryOOM") {
-    val eachBatchIter = GpuSortEachBatchIterator(
+    val eachBatchIter = new GpuSortEachBatchIterator(
       batchIter(2),
       gpuSorter,
-      singleBatch = false)
+      false,
+      NoopMetric,
+      NoopMetric,
+      NoopMetric,
+      NoopMetric)
     RmmSpark.forceRetryOOM(RmmSpark.getCurrentThreadId, 2,
       RmmSpark.OomInjectionType.GPU.ordinal, 0)
     while (eachBatchIter.hasNext) {
@@ -201,10 +205,14 @@ class GpuSortRetrySuite extends RmmSparkRetrySuiteBase with MockitoSugar {
   test("GPU each batch sort throws GpuSplitAndRetryOOM") {
     val inputIter = batchIter(2)
     try {
-      val eachBatchIter = GpuSortEachBatchIterator(
+      val eachBatchIter = new GpuSortEachBatchIterator(
         inputIter,
         gpuSorter,
-        singleBatch = false)
+        false,
+        NoopMetric,
+        NoopMetric,
+        NoopMetric,
+        NoopMetric)
       RmmSpark.forceSplitAndRetryOOM(RmmSpark.getCurrentThreadId, 1,
         RmmSpark.OomInjectionType.GPU.ordinal, 0)
       assertThrows[GpuSplitAndRetryOOM] {