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

feat(java): support jdk9+ java.util.ImmutableCollections copy #1800

Merged
merged 1 commit into from
Aug 15, 2024
Merged

feat(java): support jdk9+ java.util.ImmutableCollections copy #1800

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
24 changes: 24 additions & 0 deletions .../fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,30 @@ protected <K, V> void copyEntry(Map<K, V> originMap, Builder<K, V> builder) {
}
}

protected <K, V> void copyEntry(Map<K, V> originMap, Object[] elements) {
ClassResolver classResolver = fury.getClassResolver();
int index = 0;
for (Entry<K, V> entry : originMap.entrySet()) {
K key = entry.getKey();
if (key != null) {
ClassInfo classInfo = classResolver.getClassInfo(key.getClass(), keyClassInfoWriteCache);
if (!classInfo.getSerializer().isImmutable()) {
key = fury.copyObject(key, classInfo.getClassId());
}
}
V value = entry.getValue();
if (value != null) {
ClassInfo classInfo =
classResolver.getClassInfo(value.getClass(), valueClassInfoWriteCache);
if (!classInfo.getSerializer().isImmutable()) {
value = fury.copyObject(value, classInfo.getClassId());
}
}
elements[index++] = key;
elements[index++] = value;
}
}

@SuppressWarnings("unchecked")
protected final void readElements(MemoryBuffer buffer, int size, Map map) {
Serializer keySerializer = this.keySerializer;
Expand Down
63 changes: 52 additions & 11 deletions ...e/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,23 @@ public Collection newCollection(MemoryBuffer buffer) {
}
}

@Override
public Collection copy(Collection originCollection) {
if (Platform.JAVA_VERSION <= 8) {
throw new UnsupportedOperationException(
String.format(
"Only support jdk9+ java.util.ImmutableCollections deep copy. %s",
originCollection.getClass()));
}
Object[] elements = new Object[originCollection.size()];
copyElements(originCollection, elements);
try {
return (List) listFactory.invoke(elements);
} catch (Throwable e) {
throw new RuntimeException(e);
}
}

@Override
public Collection onCollectionRead(Collection collection) {
if (Platform.JAVA_VERSION > 8) {
Expand Down Expand Up @@ -150,6 +167,23 @@ public Collection newCollection(MemoryBuffer buffer) {
}
}

@Override
public Collection copy(Collection originCollection) {
if (Platform.JAVA_VERSION <= 8) {
throw new UnsupportedOperationException(
String.format(
"Only support jdk9+ java.util.ImmutableCollections deep copy. %s",
originCollection.getClass()));
}
Object[] elements = new Object[originCollection.size()];
copyElements(originCollection, elements);
try {
return (Set) setFactory.invoke(elements);
} catch (Throwable e) {
throw new RuntimeException(e);
}
}

@Override
public Collection onCollectionRead(Collection collection) {
if (Platform.JAVA_VERSION > 8) {
Expand Down Expand Up @@ -183,18 +217,25 @@ public Map newMap(MemoryBuffer buffer) {
}

@Override
public Map newMap(Map map) {
int numElements = map.size();
if (Platform.JAVA_VERSION > 8) {
return new JDKImmutableMapContainer(numElements);
} else {
return new HashMap(numElements);
public Map copy(Map originMap) {
if (Platform.JAVA_VERSION <= 8) {
throw new UnsupportedOperationException(
String.format(
"Only support jdk9+ java.util.ImmutableCollections deep copy. %s",
originMap.getClass()));
}
int size = originMap.size();
Object[] elements = new Object[size * 2];
copyEntry(originMap, elements);
try {
if (size == 1) {
return (Map) map1Factory.invoke(elements[0], elements[1]);
} else {
return (Map) mapNFactory.invoke(elements);
}
} catch (Throwable e) {
throw new RuntimeException(e);
}
}

@Override
public Map onMapCopy(Map map) {
return onMapRead(map);
}

@Override
Expand Down
12 changes: 11 additions & 1 deletion java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.fury.memory.MemoryBuffer;
import org.apache.fury.memory.Platform;
import org.apache.fury.reflect.ReflectionUtils;
import org.apache.fury.resolver.ClassInfo;
import org.apache.fury.resolver.ClassResolver;
import org.apache.fury.serializer.ReplaceResolveSerializer;
import org.apache.fury.serializer.Serializer;
Expand Down Expand Up @@ -398,8 +399,17 @@ public Map<String, T> read(MemoryBuffer buffer) {

@Override
protected <K, V> void copyEntry(Map<K, V> originMap, Map<K, V> newMap) {
ClassResolver classResolver = fury.getClassResolver();
for (Entry<K, V> entry : originMap.entrySet()) {
newMap.put(entry.getKey(), fury.copyObject(entry.getValue()));
V value = entry.getValue();
if (value != null) {
ClassInfo classInfo =
classResolver.getClassInfo(value.getClass(), valueClassInfoWriteCache);
if (!classInfo.getSerializer().isImmutable()) {
value = fury.copyObject(value, classInfo.getClassId());
}
}
newMap.put(entry.getKey(), value);
}
}
}
Expand Down
Loading