Skip to content

feat(scala): support copy for scala collections #2018

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions MYCONTRIBUTION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
```Clean up PR descriptions by removing comments #2017```
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could we remove MYCONTRIBUTION.md file? Apache fury use git history to credit the contributors

Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,56 @@ class ScalaSeqSerializer[A, T <: scala.collection.Seq[A]](fury: Fury, cls: Class
new ListAdapter[Any](value)
}
}
abstract class AbstractScalaCollectionSerializer[A, T <: Iterable[A]](fury: Fury, cls: Class[T])
extends AbstractCollectionSerializer[T](fury, cls) {

// Existing methods

// Add copy method
def copy(value: T): T = {
val builder = value.iterableFactory.newBuilder[A]
builder ++= value
builder.result()
}
}

class ScalaCollectionSerializer[A, T <: Iterable[A]] (fury: Fury, cls: Class[T])
extends AbstractScalaCollectionSerializer[A, T](fury, cls) {
override def onCollectionWrite(buffer: MemoryBuffer, value: T): util.Collection[_] = {
val factory: Factory[A, Any] = value.iterableFactory.iterableFactory
val adapter = new CollectionAdapter[A, T](value)
buffer.writeVarUint32Small7(adapter.size)
fury.writeRef(buffer, factory)
adapter
}

// Implement copy method
override def copy(value: T): T = super.copy(value)
}

class ScalaSortedSetSerializer[A, T <: scala.collection.SortedSet[A]](fury: Fury, cls: Class[T])
extends AbstractScalaCollectionSerializer[A, T](fury, cls) {
override def onCollectionWrite(buffer: MemoryBuffer, value: T): util.Collection[_] = {
buffer.writeVarUint32Small7(value.size)
val factory = value.sortedIterableFactory.evidenceIterableFactory[Any](
value.ordering.asInstanceOf[Ordering[Any]])
fury.writeRef(buffer, factory)
new CollectionAdapter[A, T](value)
}

// Implement copy method
override def copy(value: T): T = super.copy(value)
}

class ScalaSeqSerializer[A, T <: scala.collection.Seq[A]](fury: Fury, cls: Class[T])
extends AbstractScalaCollectionSerializer[A, T](fury, cls) {
override def onCollectionWrite(buffer: MemoryBuffer, value: T): util.Collection[_] = {
buffer.writeVarUint32Small7(value.size)
val factory: Factory[A, Any] = value.iterableFactory.iterableFactory
fury.writeRef(buffer, factory)
new ListAdapter[Any](value)
}

// Implement copy method
override def copy(value: T): T = super.copy(value)
}
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,44 @@ class ScalaSortedMapSerializer[K, V, T <: scala.collection.SortedMap[K, V]](fury
new MapAdapter[K, V](value)
}
}

abstract class AbstractScalaMapSerializer[K, V, T](fury: Fury, cls: Class[T])
extends AbstractMapSerializer[T](fury, cls) {

// Existing methods

// Add copy method
def copy(value: T): T = {
val builder = value.mapFactory.newBuilder[K, V]
builder ++= value
builder.result()
}
}

class ScalaMapSerializer[K, V, T <: scala.collection.Map[K, V]](fury: Fury, cls: Class[T])
extends AbstractScalaMapSerializer[K, V, T](fury, cls) {

override def onMapWrite(buffer: MemoryBuffer, value: T): util.Map[_, _] = {
buffer.writeVarUint32Small7(value.size)
val factory = value.mapFactory.mapFactory[Any, Any].asInstanceOf[Factory[Any, Any]]
fury.writeRef(buffer, factory)
new MapAdapter[K, V](value)
}

// Implement copy method
override def copy(value: T): T = super.copy(value)
}

class ScalaSortedMapSerializer[K, V, T <: scala.collection.SortedMap[K, V]](fury: Fury, cls: Class[T])
extends AbstractScalaMapSerializer[K, V, T](fury, cls) {
override def onMapWrite(buffer: MemoryBuffer, value: T): util.Map[_, _] = {
buffer.writeVarUint32Small7(value.size)
val factory = value.sortedMapFactory.sortedMapFactory[Any, Any](
value.ordering.asInstanceOf[Ordering[Any]]).asInstanceOf[Factory[Any, Any]]
fury.writeRef(buffer, factory)
new MapAdapter[K, V](value)
}

// Implement copy method
override def copy(value: T): T = super.copy(value)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class SerializerTest extends AnyFlatSpec with Matchers {
"ScalaCollectionSerializer" should "copy collections correctly" in {
val fury = new Fury()
val original = Seq(1, 2, 3)
val serializer = new ScalaCollectionSerializer[Int, Seq[Int]](fury, classOf[Seq[Int]])

val copy = serializer.copy(original)
copy shouldEqual original
copy should not be theSameInstanceAs (original)
}

"ScalaMapSerializer" should "copy maps correctly" in {
val fury = new Fury()
val original = Map("a" -> 1, "b" -> 2)
val serializer = new ScalaMapSerializer[String, Int, Map[String, Int]](fury, classOf[Map[String, Int]])

val copy = serializer.copy(original)
copy shouldEqual original
copy should not be theSameInstanceAs (original)
}
}
Loading