diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle index 066659ee2..acac5e4a5 100755 --- a/java/gradle/dependencies.gradle +++ b/java/gradle/dependencies.gradle @@ -54,12 +54,12 @@ versions += [ protobuf : "3.19.3", ranger : "2.1.0", scala211 : "2.11.12", - scala : "2.12.15", + scala : "2.12.17", scalatest : "3.2.10", scopt : "4.0.1", slf4j : "1.7.33", spark2 : "2.4.8", - spark : "3.1.2", + spark : "3.3.0", spotBugs : "4.1.1", yetus : "0.13.0" ] diff --git a/java/kudu-spark/src/main/scala/org/apache/kudu/spark/kudu/KuduContext.scala b/java/kudu-spark/src/main/scala/org/apache/kudu/spark/kudu/KuduContext.scala index 67533fda5..a0a150298 100644 --- a/java/kudu-spark/src/main/scala/org/apache/kudu/spark/kudu/KuduContext.scala +++ b/java/kudu-spark/src/main/scala/org/apache/kudu/spark/kudu/KuduContext.scala @@ -29,7 +29,7 @@ import org.apache.hadoop.util.ShutdownHookManager import org.apache.spark.Partitioner import org.apache.spark.SparkContext import org.apache.spark.rdd.RDD -import org.apache.spark.sql.catalyst.util.TypeUtils +import org.apache.spark.unsafe.types.ByteArray import org.apache.spark.sql.DataFrame import org.apache.spark.sql.Row import org.apache.spark.sql.types.DataType @@ -475,7 +475,7 @@ class KuduContext( // to enable rdd sorting functions below. implicit val byteArrayOrdering: Ordering[Array[Byte]] = new Ordering[Array[Byte]] { def compare(x: Array[Byte], y: Array[Byte]): Int = { - TypeUtils.compareBinary(x, y) + ByteArray.compareBinary(x, y) } }