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/incubator-fury.git
The following commit(s) were added to refs/heads/main by this push:
new 48361cb7 fix(java): fix getClassDef thead safety (#1597)
48361cb7 is described below
commit 48361cb7b7c13e703f0d5e1a10d5d104c9cd78a2
Author: Shawn Yang <[email protected]>
AuthorDate: Fri May 3 14:05:42 2024 +0800
fix(java): fix getClassDef thead safety (#1597)
## What does this PR do?
Fix ci failuure introduced in #1556 :
## 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/incubator-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.
-->
---
.../java/org/apache/fury/builder/BaseObjectCodecBuilder.java | 11 ++++-------
.../java/org/apache/fury/builder/CompatibleCodecBuilder.java | 9 ++-------
.../main/java/org/apache/fury/builder/ObjectCodecBuilder.java | 9 ++++++---
.../src/main/java/org/apache/fury/meta/ClassDef.java | 8 ++++++++
.../src/main/java/org/apache/fury/resolver/ClassResolver.java | 2 +-
.../java/org/apache/fury/serializer/MetaSharedSerializer.java | 9 ---------
6 files changed, 21 insertions(+), 27 deletions(-)
diff --git
a/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java
b/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java
index d0112d0c..4dd315d2 100644
---
a/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java
+++
b/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java
@@ -189,7 +189,7 @@ public abstract class BaseObjectCodecBuilder extends
CodecBuilder {
protected abstract String codecSuffix();
- <T> T visitFury(Function<Fury, T> function) {
+ protected <T> T visitFury(Function<Fury, T> function) {
return fury.getJITContext().asyncVisitFury(function);
}
@@ -441,8 +441,7 @@ public abstract class BaseObjectCodecBuilder extends
CodecBuilder {
classInfo,
inlineInvoke(classResolverRef, "getClassInfo",
classInfoTypeRef, clsExpr))));
}
- writeClassAndObject.add(
- fury.getClassResolver().writeClassExpr(classResolverRef, buffer,
classInfo));
+ writeClassAndObject.add(classResolver.writeClassExpr(classResolverRef,
buffer, classInfo));
writeClassAndObject.add(
new Invoke(
inlineInvoke(classInfo, "getSerializer", SERIALIZER_TYPE),
@@ -659,8 +658,7 @@ public abstract class BaseObjectCodecBuilder extends
CodecBuilder {
new Assign(
classInfo,
inlineInvoke(classResolverRef, "getClassInfo",
classInfoTypeRef, clsExpr))));
- writeClassAction.add(
- fury.getClassResolver().writeClassExpr(classResolverRef, buffer,
classInfo));
+ writeClassAction.add(classResolver.writeClassExpr(classResolverRef,
buffer, classInfo));
serializer = new Invoke(classInfo, "getSerializer", "serializer",
SERIALIZER_TYPE, false);
serializer = new Cast(serializer,
TypeRef.of(AbstractCollectionSerializer.class));
writeClassAction.add(serializer, new Return(serializer));
@@ -965,8 +963,7 @@ public abstract class BaseObjectCodecBuilder extends
CodecBuilder {
classInfo,
inlineInvoke(classResolverRef, "getClassInfo",
classInfoTypeRef, clsExpr))));
// Note: writeClassExpr is thread safe.
- writeClassAction.add(
- fury.getClassResolver().writeClassExpr(classResolverRef, buffer,
classInfo));
+ writeClassAction.add(classResolver.writeClassExpr(classResolverRef,
buffer, classInfo));
serializer = new Invoke(classInfo, "getSerializer", "serializer",
SERIALIZER_TYPE, false);
serializer = new Cast(serializer,
TypeRef.of(AbstractMapSerializer.class));
writeClassAction.add(serializer, new Return(serializer));
diff --git
a/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java
b/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java
index 445a425e..92c79527 100644
---
a/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java
+++
b/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java
@@ -41,7 +41,6 @@ import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import org.apache.fury.Fury;
import org.apache.fury.builder.Generated.GeneratedCompatibleSerializer;
import org.apache.fury.codegen.CodegenContext;
@@ -97,10 +96,6 @@ public class CompatibleCodecBuilder extends
BaseObjectCodecBuilder {
super(beanType, fury, superSerializerClass);
this.fieldResolver = fieldResolver;
if (isRecord) {
- List<String> fieldNames =
- fieldResolver.getAllFieldsList().stream()
- .map(FieldResolver.FieldInfo::getName)
- .collect(Collectors.toList());
recordReversedMapping =
RecordUtils.buildFieldToComponentMapping(beanClass);
}
ctx.reserveName(FIELD_RESOLVER_NAME);
@@ -879,7 +874,7 @@ public class CompatibleCodecBuilder extends
BaseObjectCodecBuilder {
Preconditions.checkArgument(ReflectionUtils.isMonomorphic(cls));
ClassInfo classInfo = visitFury(f ->
f.getClassResolver().getClassInfo(cls, false));
if (classInfo != null && classInfo.getClassId() !=
ClassResolver.NO_CLASS_ID) {
- return fury.getClassResolver().writeClassExpr(buffer,
classInfo.getClassId());
+ return classResolver.writeClassExpr(buffer, classInfo.getClassId());
}
Expression classInfoExpr = getFinalClassInfo(cls);
return new Invoke(classResolverRef, "writeClass", buffer, classInfoExpr);
@@ -889,7 +884,7 @@ public class CompatibleCodecBuilder extends
BaseObjectCodecBuilder {
Preconditions.checkArgument(ReflectionUtils.isMonomorphic(cls));
ClassInfo classInfo = visitFury(f ->
f.getClassResolver().getClassInfo(cls, false));
if (classInfo != null && classInfo.getClassId() !=
ClassResolver.NO_CLASS_ID) {
- return fury.getClassResolver().skipRegisteredClassExpr(buffer);
+ return classResolver.skipRegisteredClassExpr(buffer);
}
// read `ClassInfo` is not used, set `inlineReadClassInfo` false,
// to avoid read doesn't happen in generated code.
diff --git
a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java
b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java
index dede0043..2e2df420 100644
---
a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java
+++
b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java
@@ -56,7 +56,6 @@ import org.apache.fury.codegen.Expression.ReplaceStub;
import org.apache.fury.codegen.Expression.StaticInvoke;
import org.apache.fury.codegen.ExpressionVisitor;
import org.apache.fury.memory.Platform;
-import org.apache.fury.meta.ClassDef;
import org.apache.fury.reflect.TypeRef;
import org.apache.fury.serializer.ObjectSerializer;
import org.apache.fury.serializer.PrimitiveSerializers.LongSerializer;
@@ -91,8 +90,12 @@ public class ObjectCodecBuilder extends
BaseObjectCodecBuilder {
Collection<Descriptor> descriptors;
boolean shareMeta = fury.getConfig().shareMetaContext();
if (shareMeta) {
- ClassDef classDef = classResolver.getClassDef(beanClass, true);
- descriptors = classDef.getDescriptors(classResolver, beanClass);
+ descriptors =
+ visitFury(
+ f ->
+ f.getClassResolver()
+ .getClassDef(beanClass, true)
+ .getDescriptors(classResolver, beanClass));
} else {
descriptors = fury.getClassResolver().getAllDescriptorsMap(beanClass,
true).values();
}
diff --git a/java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java
b/java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java
index 53e73844..24897ae1 100644
--- a/java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java
+++ b/java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java
@@ -203,6 +203,14 @@ public class ClassDef implements Serializable {
return ClassDefDecoder.decodeClassDef(classResolver, buffer, header);
}
+ /**
+ * Consolidate fields of <code>classDef</code> with <code>cls</code>. If
some field exists in
+ * <code>cls</code> but not in <code>classDef</code>, it won't be returned
in final collection. If
+ * some field exists in <code>classDef</code> but not in <code> cls</code>,
it will be added to
+ * final collection.
+ *
+ * @param cls class load in current process.
+ */
public List<Descriptor> getDescriptors(ClassResolver resolver, Class<?> cls)
{
if (descriptors == null) {
SortedMap<Field, Descriptor> allDescriptorsMap =
resolver.getAllDescriptorsMap(cls, true);
diff --git
a/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java
b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java
index e44af810..7e45b1a0 100644
--- a/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java
+++ b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java
@@ -510,7 +510,7 @@ public class ClassResolver {
/**
* Mark non-inner registered final types as non-final to write class def for
those types. Note if
* a class is registered but not an inner class with inner serializer, it
will still be taken as
- * non-final to write class def, so that it can be deserialized by the peer
still..
+ * non-final to write class def, so that it can be deserialized by the peer
still.
*/
public boolean isMonomorphic(Class<?> clz) {
if (fury.getConfig().shareMetaContext()) {
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java
index 87f1a91b..6d2c38c6 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java
@@ -287,15 +287,6 @@ public class MetaSharedSerializer<T> extends Serializer<T>
{
}
}
- /**
- * Consolidate fields of <code>classDef</code> with <code>cls</code>. If
some field exists in
- * <code>cls</code> but not in <code>classDef</code>, it won't be returned
in final collection. If
- * some field exists in <code>classDef</code> but not in <code> cls</code>,
it will be added to
- * final collection.
- *
- * @param cls class load in current process.
- * @param classDef class definition sent from peer.
- */
public static Collection<Descriptor> consolidateFields(
ClassResolver classResolver, Class<?> cls, ClassDef classDef) {
return classDef.getDescriptors(classResolver, cls);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
