Skip to content
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

support mutable BitSet #185

Merged
merged 1 commit into from
Jun 2, 2014
Merged

support mutable BitSet #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions 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 @@ -31,6 +31,7 @@ import scala.collection.immutable.{

import scala.collection.mutable.{
WrappedArray,
BitSet => MBitSet,
Map => MMap,
HashMap => MHashMap,
Set => MSet,
Expand Down Expand Up @@ -150,6 +151,7 @@ class ScalaCollectionsRegistrar extends IKryoRegistrar {
// The above ListMap/HashMap must appear before this:
.forTraversableSubclass(Map.empty[Any,Any])
// here are the mutable ones:
.forTraversableClass(MBitSet.empty, isImmutable = false)
.forTraversableClass(MHashMap.empty[Any,Any], isImmutable = false)
.forTraversableClass(MHashSet.empty[Any], isImmutable = false)
.forTraversableSubclass(MQueue.empty[Any], isImmutable = false)
Expand Down
4 changes: 3 additions & 1 deletion chill-scala/src/test/scala/com/twitter/chill/KryoSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import org.specs._
import org.specs.matcher.Matcher

import scala.collection.immutable.{SortedSet, BitSet, ListSet, HashSet, SortedMap, ListMap, HashMap}
import scala.collection.mutable.{ArrayBuffer => MArrayBuffer, HashMap => MHashMap}
import scala.collection.mutable.{ArrayBuffer => MArrayBuffer, BitSet => MBitSet, HashMap => MHashMap}
import _root_.java.util.PriorityQueue
import _root_.java.util.Locale
import scala.collection.mutable
Expand Down Expand Up @@ -83,6 +83,8 @@ class KryoSpec extends Specification with BaseProperties {
SortedSet(1L, 2L, 3L, 4L),
BitSet(),
BitSet((0 until 1000).map{ x : Int => x*x } : _*),
MBitSet(),
MBitSet((0 until 1000).map{ x : Int => x*x } : _*),
SortedMap[Long, String](),
SortedMap("b" -> 2, "a" -> 1),
ListMap("good" -> 0.5, "bad" -> -1.0),
Expand Down