From 2456542de6a1ac9bcfb34325b11339cf291629df Mon Sep 17 00:00:00 2001 From: Rob Reeves Date: Wed, 7 Aug 2024 15:12:01 -0700 Subject: [PATCH 1/3] make stable --- .../scala/org/apache/spark/serializer/KryoSerializer.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala index ec5d53e91b3e0..fc5914f042343 100644 --- a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala +++ b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala @@ -22,12 +22,10 @@ import java.lang.invoke.SerializedLambda import java.nio.ByteBuffer import java.util.Locale import javax.annotation.Nullable - import scala.collection.mutable.ArrayBuffer import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import scala.util.control.NonFatal - import com.esotericsoftware.kryo.{Kryo, KryoException, Serializer => KryoClassSerializer} import com.esotericsoftware.kryo.io.{Input => KryoInput, Output => KryoOutput} import com.esotericsoftware.kryo.io.{UnsafeInput => KryoUnsafeInput, UnsafeOutput => KryoUnsafeOutput} @@ -36,8 +34,8 @@ import com.esotericsoftware.kryo.serializers.{JavaSerializer => KryoJavaSerializ import com.twitter.chill.{AllScalaRegistrar, EmptyScalaKryoInstantiator} import org.apache.avro.generic.{GenericContainer, GenericData, GenericRecord} import org.roaringbitmap.RoaringBitmap - import org.apache.spark._ +import org.apache.spark.annotation.Stable import org.apache.spark.api.python.PythonBroadcast import org.apache.spark.internal.{Logging, MDC} import org.apache.spark.internal.LogKeys.CLASS_NAME @@ -519,6 +517,7 @@ private[spark] class KryoSerializerInstance( * Interface implemented by clients to register their classes with Kryo when using Kryo * serialization. */ +@Stable trait KryoRegistrator { def registerClasses(kryo: Kryo): Unit } From ba889b8a2f680717603cc1b7d99cb75f5f6e145b Mon Sep 17 00:00:00 2001 From: Rob Reeves Date: Wed, 7 Aug 2024 15:13:43 -0700 Subject: [PATCH 2/3] fix auto import changes --- .../scala/org/apache/spark/serializer/KryoSerializer.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala index fc5914f042343..1cace4649ebc1 100644 --- a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala +++ b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala @@ -22,10 +22,12 @@ import java.lang.invoke.SerializedLambda import java.nio.ByteBuffer import java.util.Locale import javax.annotation.Nullable + import scala.collection.mutable.ArrayBuffer import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import scala.util.control.NonFatal + import com.esotericsoftware.kryo.{Kryo, KryoException, Serializer => KryoClassSerializer} import com.esotericsoftware.kryo.io.{Input => KryoInput, Output => KryoOutput} import com.esotericsoftware.kryo.io.{UnsafeInput => KryoUnsafeInput, UnsafeOutput => KryoUnsafeOutput} @@ -34,6 +36,7 @@ import com.esotericsoftware.kryo.serializers.{JavaSerializer => KryoJavaSerializ import com.twitter.chill.{AllScalaRegistrar, EmptyScalaKryoInstantiator} import org.apache.avro.generic.{GenericContainer, GenericData, GenericRecord} import org.roaringbitmap.RoaringBitmap + import org.apache.spark._ import org.apache.spark.annotation.Stable import org.apache.spark.api.python.PythonBroadcast From 329cb480762db332ced272b5acaa875128fa7763 Mon Sep 17 00:00:00 2001 From: Rob Reeves Date: Wed, 7 Aug 2024 15:43:03 -0700 Subject: [PATCH 3/3] update api type --- .../scala/org/apache/spark/serializer/KryoSerializer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala index 1cace4649ebc1..783da1fa4c286 100644 --- a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala +++ b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala @@ -38,7 +38,7 @@ import org.apache.avro.generic.{GenericContainer, GenericData, GenericRecord} import org.roaringbitmap.RoaringBitmap import org.apache.spark._ -import org.apache.spark.annotation.Stable +import org.apache.spark.annotation.DeveloperApi import org.apache.spark.api.python.PythonBroadcast import org.apache.spark.internal.{Logging, MDC} import org.apache.spark.internal.LogKeys.CLASS_NAME @@ -520,7 +520,7 @@ private[spark] class KryoSerializerInstance( * Interface implemented by clients to register their classes with Kryo when using Kryo * serialization. */ -@Stable +@DeveloperApi trait KryoRegistrator { def registerClasses(kryo: Kryo): Unit }