This is an automated email from the ASF dual-hosted git repository.
suiliangliang 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 2a75704f fix(java): fix xlang container field deserialization type
error (#2161)
2a75704f is described below
commit 2a75704f7dd9f4d9547d5dbcc624b099313fee63
Author: Shawn Yang <[email protected]>
AuthorDate: Sat Apr 19 22:33:01 2025 +0800
fix(java): fix xlang container field deserialization type error (#2161)
## What does this PR do?
fix xlang container field deserialization type error
## Related issues
Closes #2105
## 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.
-->
---
.../org/apache/fury/resolver/XtypeResolver.java | 41 +++++++++++-
.../fury/serializer/AbstractObjectSerializer.java | 4 +-
.../collection/CollectionSerializers.java | 76 +++++++++++++---------
.../fury/serializer/collection/MapSerializers.java | 35 +++++-----
.../collection/XlangCollectionSerializerTest.java | 63 ++++++++++++++++++
5 files changed, 164 insertions(+), 55 deletions(-)
diff --git
a/java/fury-core/src/main/java/org/apache/fury/resolver/XtypeResolver.java
b/java/fury-core/src/main/java/org/apache/fury/resolver/XtypeResolver.java
index 51bcae8e..bc962d8a 100644
--- a/java/fury-core/src/main/java/org/apache/fury/resolver/XtypeResolver.java
+++ b/java/fury-core/src/main/java/org/apache/fury/resolver/XtypeResolver.java
@@ -26,6 +26,7 @@ import static org.apache.fury.meta.Encoders.PACKAGE_DECODER;
import static org.apache.fury.meta.Encoders.PACKAGE_ENCODER;
import static org.apache.fury.meta.Encoders.TYPE_NAME_DECODER;
import static org.apache.fury.resolver.ClassResolver.NO_CLASS_ID;
+import static
org.apache.fury.serializer.collection.MapSerializers.HashMapSerializer;
import static org.apache.fury.type.TypeUtils.qualifiedName;
import java.lang.reflect.Type;
@@ -69,7 +70,11 @@ import
org.apache.fury.serializer.NonexistentClassSerializers;
import org.apache.fury.serializer.ObjectSerializer;
import org.apache.fury.serializer.Serializer;
import org.apache.fury.serializer.Serializers;
+import org.apache.fury.serializer.collection.AbstractCollectionSerializer;
+import org.apache.fury.serializer.collection.AbstractMapSerializer;
import org.apache.fury.serializer.collection.CollectionSerializer;
+import
org.apache.fury.serializer.collection.CollectionSerializers.ArrayListSerializer;
+import
org.apache.fury.serializer.collection.CollectionSerializers.HashSetSerializer;
import org.apache.fury.serializer.collection.MapSerializer;
import org.apache.fury.type.GenericType;
import org.apache.fury.type.Generics;
@@ -320,13 +325,20 @@ public class XtypeResolver implements TypeResolver {
Serializer serializer;
int xtypeId;
if (classResolver.isSet(cls)) {
- serializer = new CollectionSerializer(fury, cls);
+ if (cls.isAssignableFrom(HashSet.class)) {
+ cls = HashSet.class;
+ serializer = new HashSetSerializer(fury);
+ } else {
+ serializer = getCollectionSerializer(cls);
+ }
xtypeId = Types.SET;
} else if (classResolver.isCollection(cls)) {
if (cls.isAssignableFrom(ArrayList.class)) {
cls = ArrayList.class;
+ serializer = new ArrayListSerializer(fury);
+ } else {
+ serializer = getCollectionSerializer(cls);
}
- serializer = new CollectionSerializer(fury, cls);
xtypeId = Types.LIST;
} else if (cls.isArray() &&
!TypeUtils.getArrayComponent(cls).isPrimitive()) {
serializer = new ArraySerializers.ObjectArraySerializer(fury, cls);
@@ -334,8 +346,20 @@ public class XtypeResolver implements TypeResolver {
} else if (classResolver.isMap(cls)) {
if (cls.isAssignableFrom(HashMap.class)) {
cls = HashMap.class;
+ serializer = new HashMapSerializer(fury);
+ } else {
+ ClassInfo classInfo = classResolver.getClassInfo(cls, false);
+ if (classInfo != null && classInfo.serializer != null) {
+ if (classInfo.serializer instanceof AbstractMapSerializer
+ && ((AbstractMapSerializer)
classInfo.serializer).supportCodegenHook()) {
+ serializer = classInfo.serializer;
+ } else {
+ serializer = new MapSerializer(fury, cls);
+ }
+ } else {
+ serializer = new MapSerializer(fury, cls);
+ }
}
- serializer = new MapSerializer(fury, cls);
xtypeId = Types.MAP;
} else {
Class<Enum> enclosingClass = (Class<Enum>) cls.getEnclosingClass();
@@ -351,6 +375,17 @@ public class XtypeResolver implements TypeResolver {
return info;
}
+ private Serializer<?> getCollectionSerializer(Class<?> cls) {
+ ClassInfo classInfo = classResolver.getClassInfo(cls, false);
+ if (classInfo != null && classInfo.serializer != null) {
+ if (classInfo.serializer instanceof AbstractCollectionSerializer
+ && ((AbstractCollectionSerializer)
(classInfo.serializer)).supportCodegenHook()) {
+ return classInfo.serializer;
+ }
+ }
+ return new CollectionSerializer(fury, cls);
+ }
+
private void registerDefaultTypes() {
registerDefaultTypes(Types.BOOL, Boolean.class, boolean.class,
AtomicBoolean.class);
registerDefaultTypes(Types.INT8, Byte.class, byte.class);
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/AbstractObjectSerializer.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/AbstractObjectSerializer.java
index 317df9e8..0514d084 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/AbstractObjectSerializer.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/AbstractObjectSerializer.java
@@ -939,7 +939,9 @@ public abstract class AbstractObjectSerializer<T> extends
Serializer<T> {
if (!fury.isCrossLanguage()) {
containerClassInfo = null;
} else {
- if (classResolver.isMap(cls) || classResolver.isCollection(cls)) {
+ if (classResolver.isMap(cls)
+ || classResolver.isCollection(cls)
+ || classResolver.isSet(cls)) {
containerClassInfo = fury.getXtypeResolver().getClassInfo(cls);
} else {
containerClassInfo = null;
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java
index 80ae21ce..f9bdc060 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java
@@ -97,7 +97,7 @@ public class CollectionSerializers {
}
public ArraysAsListSerializer(Fury fury, Class<List<?>> cls) {
- super(fury, cls, false);
+ super(fury, cls, fury.isCrossLanguage());
}
@Override
@@ -121,12 +121,6 @@ public class CollectionSerializers {
}
}
- @Override
- public void xwrite(MemoryBuffer buffer, List<?> value) {
- // FIXME this may cause array data got duplicated when reference
tracking enabled.
- super.xwrite(buffer, value);
- }
-
@Override
public List<?> read(MemoryBuffer buffer) {
final Object[] array = (Object[]) fury.readRef(buffer);
@@ -134,15 +128,23 @@ public class CollectionSerializers {
return Arrays.asList(array);
}
+ @Override
+ public void xwrite(MemoryBuffer buffer, List<?> value) {
+ super.write(buffer, value);
+ }
+
@Override
public List<?> xread(MemoryBuffer buffer) {
+ return super.read(buffer);
+ }
+
+ @Override
+ public ArrayList newCollection(MemoryBuffer buffer) {
int numElements = buffer.readVarUint32Small7();
- Object[] arr = new Object[numElements];
- for (int i = 0; i < numElements; i++) {
- Object elem = fury.xreadRef(buffer);
- arr[i] = elem;
- }
- return Arrays.asList(arr);
+ setNumElements(numElements);
+ ArrayList arrayList = new ArrayList(numElements);
+ fury.getRefResolver().reference(arrayList);
+ return arrayList;
}
}
@@ -193,13 +195,16 @@ public class CollectionSerializers {
@Override
public Collection onCollectionWrite(MemoryBuffer buffer, T value) {
buffer.writeVarUint32Small7(value.size());
- fury.writeRef(buffer, value.comparator());
+ if (!fury.isCrossLanguage()) {
+ fury.writeRef(buffer, value.comparator());
+ }
return value;
}
@SuppressWarnings("unchecked")
@Override
public T newCollection(MemoryBuffer buffer) {
+ assert !fury.isCrossLanguage();
int numElements = buffer.readVarUint32Small7();
setNumElements(numElements);
T collection;
@@ -290,7 +295,7 @@ public class CollectionSerializers {
public static final class EmptySetSerializer extends
CollectionSerializer<Set<?>> {
public EmptySetSerializer(Fury fury, Class<Set<?>> cls) {
- super(fury, cls, false, true);
+ super(fury, cls, fury.isCrossLanguage(), true);
}
@Override
@@ -298,8 +303,7 @@ public class CollectionSerializers {
@Override
public void xwrite(MemoryBuffer buffer, Set<?> value) {
- // write length
- buffer.writeVarUint32Small7(0);
+ super.write(buffer, value);
}
@Override
@@ -309,15 +313,14 @@ public class CollectionSerializers {
@Override
public Set<?> xread(MemoryBuffer buffer) {
- buffer.readVarUint32Small7();
- return Collections.EMPTY_SET;
+ throw new UnsupportedOperationException();
}
}
public static final class EmptySortedSetSerializer extends
CollectionSerializer<SortedSet<?>> {
public EmptySortedSetSerializer(Fury fury, Class<SortedSet<?>> cls) {
- super(fury, cls, false, true);
+ super(fury, cls, fury.isCrossLanguage(), true);
}
@Override
@@ -327,13 +330,23 @@ public class CollectionSerializers {
public SortedSet<?> read(MemoryBuffer buffer) {
return Collections.emptySortedSet();
}
+
+ @Override
+ public void xwrite(MemoryBuffer buffer, SortedSet<?> value) {
+ super.write(buffer, value);
+ }
+
+ @Override
+ public SortedSet<?> xread(MemoryBuffer buffer) {
+ throw new UnsupportedOperationException();
+ }
}
public static final class CollectionsSingletonListSerializer
extends CollectionSerializer<List<?>> {
public CollectionsSingletonListSerializer(Fury fury, Class<List<?>> cls) {
- super(fury, cls, false);
+ super(fury, cls, fury.isCrossLanguage());
}
@Override
@@ -348,8 +361,7 @@ public class CollectionSerializers {
@Override
public void xwrite(MemoryBuffer buffer, List<?> value) {
- buffer.writeVarUint32Small7(1);
- fury.xwriteRef(buffer, value.get(0));
+ super.write(buffer, value);
}
@Override
@@ -359,15 +371,14 @@ public class CollectionSerializers {
@Override
public List<?> xread(MemoryBuffer buffer) {
- buffer.readVarUint32Small7();
- return Collections.singletonList(fury.xreadRef(buffer));
+ throw new UnsupportedOperationException();
}
}
public static final class CollectionsSingletonSetSerializer extends
CollectionSerializer<Set<?>> {
public CollectionsSingletonSetSerializer(Fury fury, Class<Set<?>> cls) {
- super(fury, cls, false);
+ super(fury, cls, fury.isCrossLanguage());
}
@Override
@@ -382,8 +393,7 @@ public class CollectionSerializers {
@Override
public void xwrite(MemoryBuffer buffer, Set<?> value) {
- buffer.writeVarUint32Small7(1);
- fury.xwriteRef(buffer, value.iterator().next());
+ super.write(buffer, value);
}
@Override
@@ -393,8 +403,7 @@ public class CollectionSerializers {
@Override
public Set<?> xread(MemoryBuffer buffer) {
- buffer.readVarUint32Small7();
- return Collections.singleton(fury.xreadRef(buffer));
+ throw new UnsupportedOperationException();
}
}
@@ -409,6 +418,7 @@ public class CollectionSerializers {
public ConcurrentSkipListSet newCollection(MemoryBuffer buffer) {
int numElements = buffer.readVarUint32Small7();
setNumElements(numElements);
+ assert !fury.isCrossLanguage();
RefResolver refResolver = fury.getRefResolver();
int refId = refResolver.lastPreservedRefId();
// It's possible that comparator/elements has circular ref to set.
@@ -475,6 +485,7 @@ public class CollectionSerializers {
@Override
public Collection newCollection(Collection originCollection) {
+ assert !fury.isCrossLanguage();
Map<?, Boolean> map =
(Map<?, Boolean>) Platform.getObject(originCollection,
MAP_FIELD_OFFSET);
AbstractMapSerializer mapSerializer =
@@ -647,7 +658,9 @@ public class CollectionSerializers {
public Collection onCollectionWrite(MemoryBuffer buffer, PriorityQueue
value) {
buffer.writeVarUint32Small7(value.size());
- fury.writeRef(buffer, value.comparator());
+ if (!fury.isCrossLanguage()) {
+ fury.writeRef(buffer, value.comparator());
+ }
return value;
}
@@ -659,6 +672,7 @@ public class CollectionSerializers {
@Override
public PriorityQueue newCollection(MemoryBuffer buffer) {
+ assert !fury.isCrossLanguage();
int numElements = buffer.readVarUint32Small7();
setNumElements(numElements);
Comparator comparator = (Comparator) fury.readRef(buffer);
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java
index 2ca87870..33634a01 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java
@@ -124,13 +124,16 @@ public class MapSerializers {
@Override
public Map onMapWrite(MemoryBuffer buffer, T value) {
buffer.writeVarUint32Small7(value.size());
- fury.writeRef(buffer, value.comparator());
+ if (!fury.isCrossLanguage()) {
+ fury.writeRef(buffer, value.comparator());
+ }
return value;
}
@SuppressWarnings("unchecked")
@Override
public Map newMap(MemoryBuffer buffer) {
+ assert !fury.isCrossLanguage();
setNumElements(buffer.readVarUint32Small7());
T map;
Comparator comparator = (Comparator) fury.readRef(buffer);
@@ -167,7 +170,7 @@ public class MapSerializers {
public static final class EmptyMapSerializer extends MapSerializer<Map<?,
?>> {
public EmptyMapSerializer(Fury fury, Class<Map<?, ?>> cls) {
- super(fury, cls, false, true);
+ super(fury, cls, fury.isCrossLanguage(), true);
}
@Override
@@ -175,8 +178,7 @@ public class MapSerializers {
@Override
public void xwrite(MemoryBuffer buffer, Map<?, ?> value) {
- // write length
- buffer.writeVarUint32Small7(0);
+ super.write(buffer, value);
}
@Override
@@ -186,14 +188,13 @@ public class MapSerializers {
@Override
public Map<?, ?> xread(MemoryBuffer buffer) {
- buffer.readVarUint32Small7();
- return Collections.EMPTY_MAP;
+ throw new IllegalStateException();
}
}
public static final class EmptySortedMapSerializer extends
MapSerializer<SortedMap<?, ?>> {
public EmptySortedMapSerializer(Fury fury, Class<SortedMap<?, ?>> cls) {
- super(fury, cls, false, true);
+ super(fury, cls, fury.isCrossLanguage(), true);
}
@Override
@@ -208,7 +209,7 @@ public class MapSerializers {
public static final class SingletonMapSerializer extends
MapSerializer<Map<?, ?>> {
public SingletonMapSerializer(Fury fury, Class<Map<?, ?>> cls) {
- super(fury, cls, false);
+ super(fury, cls, fury.isCrossLanguage());
}
@Override
@@ -225,14 +226,6 @@ public class MapSerializers {
fury.writeRef(buffer, entry.getValue());
}
- @Override
- public void xwrite(MemoryBuffer buffer, Map<?, ?> value) {
- buffer.writeVarUint32Small7(1);
- Map.Entry entry = value.entrySet().iterator().next();
- fury.xwriteRef(buffer, entry.getKey());
- fury.xwriteRef(buffer, entry.getValue());
- }
-
@Override
public Map<?, ?> read(MemoryBuffer buffer) {
Object key = fury.readRef(buffer);
@@ -240,12 +233,14 @@ public class MapSerializers {
return Collections.singletonMap(key, value);
}
+ @Override
+ public void xwrite(MemoryBuffer buffer, Map<?, ?> value) {
+ super.write(buffer, value);
+ }
+
@Override
public Map<?, ?> xread(MemoryBuffer buffer) {
- buffer.readVarUint32Small7();
- Object key = fury.xreadRef(buffer);
- Object value = fury.xreadRef(buffer);
- return Collections.singletonMap(key, value);
+ throw new UnsupportedOperationException();
}
}
diff --git
a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/XlangCollectionSerializerTest.java
b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/XlangCollectionSerializerTest.java
new file mode 100644
index 00000000..44540d2b
--- /dev/null
+++
b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/XlangCollectionSerializerTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.collection;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.fury.Fury;
+import org.apache.fury.FuryTestBase;
+import org.apache.fury.config.Language;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class XlangCollectionSerializerTest extends FuryTestBase {
+ static class SomeClass {
+ Set<String> set = new HashSet<>();
+ List<String> list = new ArrayList<>();
+ Map<String, String> map = new HashMap<>();
+
+ LinkedHashSet<String> set1 = new LinkedHashSet<>();
+ LinkedList<String> list1 = new LinkedList<>();
+ LinkedHashMap<String, String> map1 = new LinkedHashMap<>();
+ }
+
+ @Test
+ public void testContainerType() {
+ Fury fury = Fury.builder().withLanguage(Language.XLANG).build();
+ fury.register(SomeClass.class, "SomeClass");
+
+ SomeClass someClass = new SomeClass();
+ byte[] bytes = fury.serialize(someClass);
+ SomeClass obj = (SomeClass) fury.deserialize(bytes);
+ Assert.assertEquals(obj.set.getClass(), HashSet.class);
+ Assert.assertEquals(obj.list.getClass(), ArrayList.class);
+ Assert.assertEquals(obj.map.getClass(), HashMap.class);
+ Assert.assertEquals(obj.set1.getClass(), LinkedHashSet.class);
+ Assert.assertEquals(obj.list1.getClass(), LinkedList.class);
+ Assert.assertEquals(obj.map1.getClass(), LinkedHashMap.class);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
