Adapt remaining SQL plugin callers to Java helpers

Author: gerashegalov

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

@@ -23,7 +23,6 @@ import java.util.regex.Pattern
 
 import com.nvidia.spark.rapids.Arm.withResource
 
-import org.apache.spark.internal.Logging
 
 /**
  * Memory allocation kind for retry coverage tracking.
@@ -62,7 +61,17 @@ object AllocationKind extends Enumeration {
  * 
  * See: https://github.com/NVIDIA/spark-rapids/issues/13672
  */
-object AllocationRetryCoverageTracker extends Logging {
+object AllocationRetryCoverageTracker {
+  private val log = org.slf4j.LoggerFactory.getLogger(getClass.getName.stripSuffix("$"))
+
+  private def logWarning(msg: => String): Unit = {
+    log.warn(msg)
+  }
+
+  private def logError(msg: => String, throwable: Throwable): Unit = {
+    log.error(msg, throwable)
+  }
+
   import AllocationKind._
 
   // Environment variable to enable retry coverage tracking (debug-only).

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025-2025, NVIDIA CORPORATION.
+ * Copyright (c) 2025-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.
@@ -19,7 +19,7 @@ package com.nvidia.spark.rapids
 import org.apache.spark.sql.catalyst.expressions.{ArrayDistinct, Expression}
 import org.apache.spark.sql.rapids.GpuArrayDistinct
 
-case class GpuArrayDistinctMeta(
+class GpuArrayDistinctMeta(
   expr: ArrayDistinct,
   override val conf: RapidsConf,
   parentMetaOpt: Option[RapidsMeta[_, _, _]],

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

@@ -16,13 +16,12 @@
 
 package com.nvidia.spark.rapids
 
-import java.time.LocalDate
+import java.time.{Instant, LocalDate}
 
 import scala.collection.mutable.ListBuffer
 
 import ai.rapids.cudf.{DType, Scalar}
 import com.nvidia.spark.rapids.VersionUtils.isSpark320OrLater
-import com.nvidia.spark.rapids.shims.DateTimeUtilsShims
 
 import org.apache.spark.sql.catalyst.util.DateTimeUtils.localDateToDays
 import org.apache.spark.sql.internal.SQLConf
@@ -53,6 +52,11 @@ object DateUtils {
 
   val ONE_SECOND_MICROSECONDS = 1000000
 
+  private def currentTimestampMicros: Long = {
+    val instant = Instant.now()
+    instant.getEpochSecond * ONE_SECOND_MICROSECONDS + instant.getNano / 1000
+  }
+
   val ONE_DAY_SECONDS = 86400L
 
   val ONE_DAY_MICROSECONDS = 86400000000L
@@ -80,7 +84,7 @@ object DateUtils {
     Map.empty
   } else {
     val today = currentDate()
-    val now = DateTimeUtilsShims.currentTimestamp
+    val now = currentTimestampMicros
     Map(
       EPOCH -> 0,
       NOW -> now / 1000000L,
@@ -94,7 +98,7 @@ object DateUtils {
     Map.empty
   } else {
     val today = currentDate()
-    val now = DateTimeUtilsShims.currentTimestamp
+    val now = currentTimestampMicros
     Map(
       EPOCH -> 0,
       NOW -> now,

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/GpuInSet.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025, NVIDIA CORPORATION.
+ * Copyright (c) 2020-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.
@@ -18,14 +18,15 @@ package com.nvidia.spark.rapids
 
 import ai.rapids.cudf.{ColumnVector, DType, Scalar}
 import com.nvidia.spark.rapids.Arm.{closeOnExcept, withResource}
+import com.nvidia.spark.rapids.shims.ShimPredicate
 
-import org.apache.spark.sql.catalyst.expressions.{Expression, Literal, Predicate}
+import org.apache.spark.sql.catalyst.expressions.{Expression, Literal}
 import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.types.{DoubleType, FloatType}
 
 case class GpuInSet(
     child: Expression,
-    list: Seq[Any]) extends GpuUnaryExpression with Predicate {
+    list: Seq[Any]) extends GpuUnaryExpression with ShimPredicate {
   require(list != null, "list should not be null")
 
   @transient private[this] lazy val hasNull: Boolean = list.contains(null)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024, NVIDIA CORPORATION.
+ * Copyright (c) 2021-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.
@@ -177,7 +177,7 @@ object GpuMapUtils {
 
 }
 
-case class GpuMapFromArraysMeta(expr: MapFromArrays,
+class GpuMapFromArraysMeta(expr: MapFromArrays,
                                 override val conf: RapidsConf,
                                 override val parent: Option[RapidsMeta[_, _, _]],
                                 rule: DataFromReplacementRule)

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

@@ -21,7 +21,6 @@ import scala.collection.immutable.TreeMap
 import com.nvidia.spark.rapids.metrics.GpuBubbleTimerManager
 
 import org.apache.spark.{SparkContext, TaskContext}
-import org.apache.spark.internal.Logging
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.catalyst.expressions.Expression
 import org.apache.spark.sql.execution.metric.{SQLMetric, SQLMetrics}
@@ -86,7 +85,7 @@ class GpuMetricFactory(metricsConf: MetricsLevel, context: SparkContext) {
     createInternal(level, SQLMetrics.createTimingMetric(context, name))
 }
 
-object GpuMetric extends Logging {
+object GpuMetric {
   // Metric names.
   val BUFFER_TIME = "bufferTime"
   val BUFFER_TIME_BUBBLE = "bufferTimeBubble"

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, NVIDIA CORPORATION.
+ * Copyright (c) 2025-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.
@@ -25,7 +25,6 @@ import scala.util.{Failure, Success, Try}
 import com.nvidia.spark.rapids.Arm.withResource
 
 import org.apache.spark.SparkConf
-import org.apache.spark.internal.Logging
 
 trait MemoryChecker {
   def getAvailableMemoryBytes(rapidsConf: RapidsConf): Option[Long]
@@ -38,7 +37,19 @@ trait MemoryChecker {
  * on which it checks corresponding files, env variables, etc. for memory usage
  * and limits.
  */
-object MemoryCheckerImpl extends MemoryChecker with Logging {
+object MemoryCheckerImpl extends MemoryChecker {
+  private val log = org.slf4j.LoggerFactory.getLogger(getClass.getName.stripSuffix("$"))
+
+  private def logInfo(msg: => String): Unit = {
+    if (log.isInfoEnabled) {
+      log.info(msg)
+    }
+  }
+
+  private def logWarning(msg: => String): Unit = {
+    log.warn(msg)
+  }
+
   def main(args: Array[String]): Unit = {
     val conf = new RapidsConf(new SparkConf())
     println(s"Available memory: ${getAvailableMemoryBytes(conf)} bytes")

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, NVIDIA CORPORATION.
+ * Copyright (c) 2025-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.
@@ -22,18 +22,17 @@ import scala.collection.mutable
 
 import ai.rapids.cudf.{NvtxColor, NvtxRange}
 
-import org.apache.spark.internal.Logging
-
-object RangeDebugger extends Logging {
+object RangeDebugger {
+  private val log = org.slf4j.LoggerFactory.getLogger(getClass.getName.stripSuffix("$"))
   val threadLocalStack = new ThreadLocal[mutable.ArrayStack[NvtxId]] {
     override def initialValue(): mutable.ArrayStack[NvtxId] = mutable.ArrayStack[NvtxId]()
   }
 
   private def dumpOrderErrorMessage(popped: Option[NvtxId], elem: NvtxId): Unit = {
-    logError(s"OUT OF ORDER POP of $elem")
-    logError(s"TOP OF STACK IS ${popped.getOrElse("<nil>")}")
+    log.error(s"OUT OF ORDER POP of $elem")
+    log.error(s"TOP OF STACK IS ${popped.getOrElse("<nil>")}")
     val stackTrace = Thread.currentThread.getStackTrace
-    stackTrace.foreach(elem => logError(elem.toString))
+    stackTrace.foreach(elem => log.error(elem.toString))
   }
 
   def push(elem: NvtxId): Unit = {

sql-plugin/src/main/scala/com/nvidia/spark/rapids/NvtxWithMetrics.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.
@@ -76,11 +76,11 @@ object NvtxIdWithMetrics {
   }
 }
 
-class MetricRange(val metrics: Seq[GpuMetric], val excludeMetric: Seq[GpuMetric] = Seq.empty)
+class MetricRange(val metrics: Seq[GpuMetric], val excludeMetric: Seq[GpuMetric])
   extends AutoCloseable {
 
   // add a convenient constructor
-  def this(metrics: GpuMetric*) = this(metrics.toSeq)
+  def this(metrics: GpuMetric*) = this(metrics.toSeq, Seq.empty)
 
   val needTracks = metrics.map(_.tryActivateTimer(excludeMetric))
   private val start = System.nanoTime()