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 7c1b9f7a fix(java): subclass without fields will encode superclass
(#1626)
7c1b9f7a is described below
commit 7c1b9f7ab6964dd17dd430e5534710b8c7d3ea9a
Author: Shuchang Li <[email protected]>
AuthorDate: Mon May 13 17:24:00 2024 +0800
fix(java): subclass without fields will encode superclass (#1626)
## What does this PR do?
<!-- Describe the purpose of this PR. -->
when subclass without fields.
`org.apache.fury.meta.ClassDefEncoder#getClassFields` will skip subclass
so className will be superclass. however we should save class even
fields is empty.
## 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/meta/ClassDefEncoder.java | 2 ++
.../org/apache/fury/meta/ClassDefEncoderTest.java | 20 ++++++++++++
.../fury/serializer/MetaSharedCompatibleTest.java | 37 ++++++++++++++++++++++
3 files changed, 59 insertions(+)
diff --git
a/java/fury-core/src/main/java/org/apache/fury/meta/ClassDefEncoder.java
b/java/fury-core/src/main/java/org/apache/fury/meta/ClassDefEncoder.java
index f154aa5a..1d0c2e4a 100644
--- a/java/fury-core/src/main/java/org/apache/fury/meta/ClassDefEncoder.java
+++ b/java/fury-core/src/main/java/org/apache/fury/meta/ClassDefEncoder.java
@@ -199,6 +199,8 @@ class ClassDefEncoder {
List<FieldInfo> fieldInfos = classFields.get(clz.getName());
if (fieldInfos != null) {
sortedClassFields.put(clz.getName(), fieldInfos);
+ } else if (type.getName().equals(clz.getName())) {
+ sortedClassFields.put(clz.getName(), new ArrayList<>());
}
}
classFields = sortedClassFields;
diff --git
a/java/fury-core/src/test/java/org/apache/fury/meta/ClassDefEncoderTest.java
b/java/fury-core/src/test/java/org/apache/fury/meta/ClassDefEncoderTest.java
index 6baa2149..918916d6 100644
--- a/java/fury-core/src/test/java/org/apache/fury/meta/ClassDefEncoderTest.java
+++ b/java/fury-core/src/test/java/org/apache/fury/meta/ClassDefEncoderTest.java
@@ -24,7 +24,9 @@ import static
org.apache.fury.meta.ClassDefEncoder.getClassFields;
import java.util.HashMap;
import java.util.List;
+import lombok.Data;
import org.apache.fury.Fury;
+import org.apache.fury.config.Language;
import org.apache.fury.memory.MemoryBuffer;
import org.apache.fury.test.bean.BeanA;
import org.apache.fury.test.bean.MapFields;
@@ -62,4 +64,22 @@ public class ClassDefEncoderTest {
Assert.assertEquals(classDef1, classDef);
}
}
+
+ @Data
+ public static class Foo1 {
+ private int f1;
+ }
+
+ public static class Foo2 extends Foo1 {}
+
+ @Test
+ public void testEmptySubClassSerializer() {
+ Fury fury =
Fury.builder().withLanguage(Language.JAVA).requireClassRegistration(true).build();
+ ClassDef classDef = ClassDef.buildClassDef(fury, Foo2.class);
+ ClassDef classDef1 =
+ ClassDef.readClassDef(
+ fury.getClassResolver(),
MemoryBuffer.fromByteArray(classDef.getEncoded()));
+
+ Assert.assertEquals(classDef, classDef1);
+ }
}
diff --git
a/java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java
b/java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java
index 3f5cf8ee..d68ca016 100644
---
a/java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java
+++
b/java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java
@@ -673,4 +673,41 @@ public class MetaSharedCompatibleTest extends FuryTestBase
{
}
}
}
+
+ @Test(dataProvider = "config1")
+ void testEmptySubClass(boolean referenceTracking, boolean compressNumber,
boolean enableCodegen)
+ throws Exception {
+ String pkg = DuplicateFieldsClass1.class.getPackage().getName();
+ Class<?> cls1 =
+ loadClass(
+ pkg,
+ "DuplicateFieldsClass2",
+ ""
+ + "package "
+ + pkg
+ + ";\n"
+ + "import java.util.*;\n"
+ + "import java.math.*;\n"
+ + "public class DuplicateFieldsClass2 extends
MetaSharedCompatibleTest.DuplicateFieldsClass1 {\n"
+ + "}");
+ Fury fury =
+ Fury.builder()
+ .withLanguage(Language.JAVA)
+ .withRefTracking(referenceTracking)
+ .withNumberCompressed(compressNumber)
+ .withCodegen(enableCodegen)
+ .withMetaContextShare(true)
+ .withCompatibleMode(CompatibleMode.COMPATIBLE)
+ .requireClassRegistration(false)
+ .withClassLoader(cls1.getClassLoader())
+ .build();
+ Object o1 = cls1.newInstance();
+ for (Field field : ReflectionUtils.getFields(cls1, true)) {
+ field.setAccessible(true);
+ field.setInt(o1, 10);
+ }
+ Object o = serDeMetaShared(fury, o1);
+ Assert.assertEquals(o.getClass(), o1.getClass());
+ Assert.assertTrue(ReflectionUtils.objectFieldsEquals(o, o1));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
