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 Ignore inconsistent types deserialize #1737

Merged
merged 28 commits into from
Jul 24, 2024
Merged

feat(java): support Ignore inconsistent types deserialize #1737

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
502e00a
add IgnoreTypeInconsistentSerializer
Weijiangd Jul 18, 2024
b56868d
Merge branch 'apache:main' into main
weijiang157152688 Jul 18, 2024
e3840d2
Merge branch 'apache:main' into main
weijiang157152688 Jul 18, 2024
41b6ac2
fix code style
Weijiangd Jul 18, 2024
2cb6ae4
Merge branch 'main' of github.com:157152688/incubator-fury into main
Weijiangd Jul 18, 2024
0b7b1b9
Merge branch 'main' of github.com:157152688/incubator-fury into main
Weijiangd Jul 18, 2024
f992e29
Merge branch 'main' of github.com:157152688/incubator-fury into main
Weijiangd Jul 18, 2024
e8c6dd9
Merge branch 'main' of github.com:157152688/incubator-fury into main
Weijiangd Jul 18, 2024
79cf39f
Merge branch 'main' of github.com:157152688/incubator-fury into main
Weijiangd Jul 18, 2024
e80ba01
Merge branch 'main' of github.com:157152688/incubator-fury into main
Weijiangd Jul 18, 2024
e1bffff
Merge branch 'main' of github.com:157152688/incubator-fury into main
Weijiangd Jul 18, 2024
9f50d1c
Merge branch 'apache:main' into main
weijiang157152688 Jul 19, 2024
a05760b
fix
Weijiangd Jul 19, 2024
1e2f686
fix code style
Weijiangd Jul 19, 2024
6a16362
fix code style
Weijiangd Jul 19, 2024
ae8e57d
Update java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java
chaokunyang Jul 19, 2024
9773d76
Merge remote-tracking branch 'upstream/main' into main
Weijiangd Jul 21, 2024
e92f1a7
fix
Weijiangd Jul 21, 2024
bef3307
fix
Weijiangd Jul 21, 2024
e711fd2
Merge branch 'apache:main' into main
weijiang157152688 Jul 23, 2024
9c84718
fix
Weijiangd Jul 24, 2024
5358657
Merge branch 'apache:main' into main
weijiang157152688 Jul 24, 2024
43dc955
fix
Weijiangd Jul 24, 2024
2ec3195
Merge branch 'main' of github.com:157152688/incubator-fury into main
Weijiangd Jul 24, 2024
4e4666e
fix code style
Weijiangd Jul 24, 2024
a2a1751
Merge branch 'apache:main' into main
weijiang157152688 Jul 24, 2024
9d6f232
fix code style
Weijiangd Jul 24, 2024
29208b1
Merge branch 'main' of github.com:157152688/incubator-fury into main
Weijiangd Jul 24, 2024
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
15 changes: 13 additions & 2 deletions java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,19 @@ public List<Descriptor> getDescriptors(ClassResolver resolver, Class<?> cls) {
if (descriptor != null) {
// Make DescriptorGrouper have consistent order whether field exist or not
// fury builtin types skip
if (newDesc.getRawType().getTypeName().contains("apache.fury")
|| newDesc.getRawType().isAssignableFrom(descriptor.getRawType())) {
if (newDesc.getRawType().isEnum()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you make newDesc.getRawType() as a local variable?

|| newDesc.getRawType().isAssignableFrom(descriptor.getRawType())
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.NonexistentEnum.class)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use org.apache.fury.serializer.NonexistentClass#isNonexistent instead

|| newDesc.getRawType().isAssignableFrom(FinalObjectTypeStub.class)
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.NonexistentEnum1DArray)
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.NonexistentEnum2DArray)
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.NonexistentEnum3DArray)
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.NonexistentSkip1DArray)
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.NonexistentSkip2DArray)
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.NonexistentSkip3DArray)
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.Nonexistent1DArray)
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.Nonexistent2DArray)
|| newDesc.getRawType().isAssignableFrom(NonexistentClass.Nonexistent3DArray)) {
descriptor = descriptor.copyWithTypeName(newDesc.getTypeName());
descriptors.add(descriptor);
} else {
Expand Down
Loading