This is an automated email from the ASF dual-hosted git repository.
chaokunyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fury.git
The following commit(s) were added to refs/heads/main by this push:
new d6698b0b feat(scala): add scala range serializer (#1899)
d6698b0b is described below
commit d6698b0bab04288349626a4d4098edeb90992868
Author: Shawn Yang <[email protected]>
AuthorDate: Tue Oct 22 21:01:16 2024 +0800
feat(scala): add scala range serializer (#1899)
## What does this PR do?
add scala range serializer
## Related issues
<!--
Is there any related issue? Please attach here.
- #xxxx0
- #xxxx1
- #xxxx2
-->
## Does this PR introduce any user-facing change?
<!--
If any user-facing interface changes, please [open an
issue](https://github.com/apache/fury/issues/new/choose) describing the
need to do so and update the document if necessary.
-->
- [ ] Does this PR introduce any public API change?
- [ ] Does this PR introduce any binary protocol compatibility change?
## Benchmark
<!--
When the PR has an impact on performance (if you don't know whether the
PR will have an impact on performance, you can submit the PR first, and
if it will have impact on performance, the code reviewer will explain
it), be sure to attach a benchmark data here.
-->
---
.../fury/serializer/scala/ScalaSerializers.java | 14 ++--
.../fury/serializer/scala/RangeSerializer.scala | 98 ++++++++++++++++++++++
.../apache/fury/serializer/scala/RangeTest.scala | 59 +++++++++++++
3 files changed, 166 insertions(+), 5 deletions(-)
diff --git
a/scala/src/main/java/org/apache/fury/serializer/scala/ScalaSerializers.java
b/scala/src/main/java/org/apache/fury/serializer/scala/ScalaSerializers.java
index 41d56b5d..3faebc55 100644
--- a/scala/src/main/java/org/apache/fury/serializer/scala/ScalaSerializers.java
+++ b/scala/src/main/java/org/apache/fury/serializer/scala/ScalaSerializers.java
@@ -112,11 +112,15 @@ public class ScalaSerializers {
resolver.register(scala.collection.immutable.LongMap$.class);
// Range
- resolver.register(Range.Inclusive.class);
- resolver.register(Range.Exclusive.class);
- resolver.register(NumericRange.class);
- resolver.register(NumericRange.Inclusive.class);
- resolver.register(NumericRange.Exclusive.class);
+ resolver.register("scala.math.Numeric$IntIsIntegral$");
+ resolver.register("scala.math.Numeric$LongIsIntegral$");
+ resolver.registerSerializer(Range.Inclusive.class, new
RangeSerializer(fury, Range.Inclusive.class));
+ resolver.registerSerializer(Range.Exclusive.class, new
RangeSerializer(fury, Range.Exclusive.class));
+ resolver.registerSerializer(NumericRange.class, new
NumericRangeSerializer<>(fury, NumericRange.class));
+ resolver.registerSerializer(NumericRange.Exclusive.class,
+ new NumericRangeSerializer<>(fury, NumericRange.Exclusive.class));
+ resolver.registerSerializer(NumericRange.Inclusive.class,
+ new NumericRangeSerializer<>(fury, NumericRange.Inclusive.class));
resolver.register(scala.collection.generic.SerializeEnd$.class);
resolver.register(scala.collection.generic.DefaultSerializationProxy.class);
diff --git
a/scala/src/main/scala/org/apache/fury/serializer/scala/RangeSerializer.scala
b/scala/src/main/scala/org/apache/fury/serializer/scala/RangeSerializer.scala
new file mode 100644
index 00000000..7e40b66e
--- /dev/null
+++
b/scala/src/main/scala/org/apache/fury/serializer/scala/RangeSerializer.scala
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.fury.serializer.scala
+
+import org.apache.fury.Fury
+import org.apache.fury.memory.MemoryBuffer
+import org.apache.fury.reflect.FieldAccessor
+import org.apache.fury.serializer.Serializer
+import org.apache.fury.serializer.collection.AbstractCollectionSerializer
+import org.apache.fury.util.unsafe._JDKAccess
+
+import java.lang.invoke.{MethodHandle, MethodHandles}
+import java.util
+import scala.collection.immutable.NumericRange
+
+class RangeSerializer[T <: Range](fury: Fury, cls: Class[T])
+ extends AbstractCollectionSerializer[T](fury, cls, false) {
+
+ override def write(buffer: MemoryBuffer, value: T): Unit = {
+ buffer.writeVarInt32(value.start)
+ buffer.writeVarInt32(value.end)
+ buffer.writeVarInt32(value.step)
+ }
+ override def read(buffer: MemoryBuffer): T = {
+ val start = buffer.readVarInt32()
+ val end = buffer.readVarInt32()
+ val step = buffer.readVarInt32()
+ if (this.cls == classOf[Range.Exclusive]) {
+ Range.apply(start, end, step).asInstanceOf[T]
+ } else {
+ Range.inclusive(start, end, step).asInstanceOf[T]
+ }
+ }
+
+ override def onCollectionWrite(memoryBuffer: MemoryBuffer, t: T):
util.Collection[_] = ???
+
+ override def onCollectionRead(collection: util.Collection[_]): T = ???
+}
+
+
+private object RangeUtils {
+ val lookupCache: ClassValue[MethodHandle] = new ClassValue[MethodHandle]() {
+ override protected def computeValue(cls: Class[_]): MethodHandle = {
+ val lookup: MethodHandles.Lookup = _JDKAccess._trustedLookup(cls)
+ lookup.unreflectConstructor(cls.getDeclaredConstructors()(0))
+ }
+ }
+}
+
+
+class NumericRangeSerializer[A, T <: NumericRange[A]](fury: Fury, cls:
Class[T])
+ extends AbstractCollectionSerializer[T](fury, cls, false) {
+ private val ctr = RangeUtils.lookupCache.get(cls)
+ private val getter =
FieldAccessor.createAccessor(cls.getDeclaredFields.find(f => f.getType ==
classOf[Integral[?]]).get)
+
+ override def write(buffer: MemoryBuffer, value: T): Unit = {
+ val cls = value.start.getClass
+ val resolver = fury.getClassResolver
+ val classInfo = resolver.getClassInfo(cls)
+ resolver.writeClass(buffer, classInfo)
+ val serializer = classInfo.getSerializer.asInstanceOf[Serializer[A]]
+ serializer.write(buffer, value.start)
+ serializer.write(buffer, value.end)
+ serializer.write(buffer, value.step)
+ fury.writeRef(buffer, getter.get(value))
+ }
+
+ override def read(buffer: MemoryBuffer) = {
+ val resolver = fury.getClassResolver
+ val classInfo = resolver.readClassInfo(buffer)
+ val serializer = classInfo.getSerializer.asInstanceOf[Serializer[A]]
+ val start = serializer.read(buffer)
+ val end = serializer.read(buffer)
+ val step = serializer.read(buffer)
+ ctr.invoke(start, end, step, fury.readRef(buffer))
+ }
+
+ override def onCollectionRead(collection: util.Collection[_]) = ???
+
+ override def onCollectionWrite(memoryBuffer: MemoryBuffer, t: T) = ???
+}
diff --git
a/scala/src/test/scala/org/apache/fury/serializer/scala/RangeTest.scala
b/scala/src/test/scala/org/apache/fury/serializer/scala/RangeTest.scala
new file mode 100644
index 00000000..c452152d
--- /dev/null
+++ b/scala/src/test/scala/org/apache/fury/serializer/scala/RangeTest.scala
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.fury.serializer.scala
+
+import org.apache.fury.Fury
+import org.apache.fury.config.Language
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
+import scala.collection.immutable.NumericRange
+
+class RangeTest extends AnyWordSpec with Matchers {
+ def fury: Fury = {
+ val fury = Fury.builder()
+ .withLanguage(Language.JAVA)
+ .withRefTracking(true)
+ .withScalaOptimizationEnabled(true)
+ .requireClassRegistration(true)
+ .suppressClassRegistrationWarnings(false).build()
+ ScalaSerializers.registerSerializers(fury)
+ fury
+ }
+
+ "fury scala range support" should {
+ "serialize/deserialize range object" in {
+ val v = Range.inclusive(1, 10)
+ fury.deserialize(fury.serialize(v)) shouldEqual v
+ (fury.serialize(v).length < 8) shouldBe true
+ val v1 = Range.apply(1, 10)
+ fury.deserialize(fury.serialize(v1)) shouldEqual v1
+ (fury.serialize(v1).length < 8) shouldBe true
+ }
+ "serialize/deserialize numeric range object" in {
+ val v = NumericRange.inclusive(1, 10, 1)
+ fury.deserialize(fury.serialize(v)) shouldEqual v
+ (fury.serialize(v).length < 12) shouldBe true
+ val v1 = NumericRange.apply(1, 10, 1)
+ fury.deserialize(fury.serialize(v1)) shouldEqual v1
+ (fury.serialize(v1).length < 12) shouldBe true
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
