Skip to content

Upgrade to Kryo 4.0.0 #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnynek merged 2 commits into from
Nov 6, 2016
Merged

Upgrade to Kryo 4.0.0 #258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
382a8d1
Upgrade to Kryo 4.0.0
chermenin Aug 24, 2016
efdd9be
Restore ClassManifestSerializer.
Aug 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
import scala.collection.JavaConverters._
import scalariform.formatter.preferences._

val kryoVersion = "3.0.3"
val kryoVersion = "4.0.0"
val bijectionVersion = "0.9.0"
val algebirdVersion = "0.12.0"

Expand Down
14 changes: 8 additions & 6 deletions ...itter/chill/ClassManifestSerializer.scala → ...om/twitter/chill/ClassTagSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ limitations under the License.

package com.twitter.chill

class ClassManifestSerializer[T] extends KSerializer[ClassManifest[T]] {
import scala.reflect.ClassTag

def write(kser: Kryo, out: Output, obj: ClassManifest[T]) {
kser.writeObject(out, obj.erasure)
class ClassTagSerializer[T] extends KSerializer[ClassTag[T]] {
Copy link
Collaborator

@johnynek johnynek Aug 24, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove the old one? This will break people, no?


def write(kser: Kryo, out: Output, obj: ClassTag[T]) {
kser.writeObject(out, obj.runtimeClass)
}

def read(kser: Kryo, in: Input, cls: Class[ClassManifest[T]]): ClassManifest[T] = {
val clazz = kser.readObject(in, classOf[Class[T]]).asInstanceOf[Class[T]]
ClassManifest.fromClass[T](clazz)
def read(kser: Kryo, in: Input, cls: Class[ClassTag[T]]): ClassTag[T] = {
val clazz = kser.readObject(in, classOf[Class[T]])
ClassTag(clazz)
}
}
2 changes: 1 addition & 1 deletion chill-scala/src/main/scala/com/twitter/chill/ManifestSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ManifestSerializer[T] extends KSerializer[Manifest[T]] {
out.writeInt(idxOpt.get + 1, true)
} else {
out.writeInt(0, true)
kser.writeObject(out, obj.erasure)
kser.writeObject(out, obj.runtimeClass)
//write the type arguments:
val targs = obj.typeArguments
out.writeInt(targs.size, true)
Expand Down
3 changes: 2 additions & 1 deletion chill-scala/src/main/scala/com/twitter/chill/ScalaKryoInstantiator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import com.twitter.chill.java.PackageRegistrar
import _root_.java.io.Serializable

import scala.collection.JavaConverters._
import scala.reflect.ClassTag

/**
* This class has a no-arg constructor, suitable for use with reflection instantiation
Expand Down Expand Up @@ -193,7 +194,7 @@ class AllScalaRegistrar extends IKryoRegistrar {
def read(k: Kryo, in: Input, cls: Class[Symbol]) = Symbol(in.readString)
})
.forSubclass[Regex](new RegexSerializer)
.forClass[ClassManifest[Any]](new ClassManifestSerializer[Any])
.forClass[ClassTag[Any]](new ClassTagSerializer[Any])
.forSubclass[Manifest[Any]](new ManifestSerializer[Any])
.forSubclass[scala.Enumeration#Value](new EnumerationSerializer)

Expand Down
2 changes: 1 addition & 1 deletion chill-scala/src/main/scala/com/twitter/chill/WrappedArraySerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class WrappedArraySerializer[T] extends KSerializer[WrappedArray[T]] {
def write(kser: Kryo, out: Output, obj: WrappedArray[T]) {
// Write the class-manifest, we don't use writeClass because it
// uses the registration system, and this class might not be registered
kser.writeObject(out, obj.elemManifest.runtimeClass)
kser.writeObject(out, obj.elemTag.runtimeClass)
kser.writeClassAndObject(out, obj.array)
}

Expand Down