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/fury.git
The following commit(s) were added to refs/heads/main by this push:
new 6aa76866 chore(java): Disallow writing meta classdef when obj is null
(#1686)
6aa76866 is described below
commit 6aa768665ebf06d5b374f64f7097a890bbf27f1a
Author: LiangliangSui <[email protected]>
AuthorDate: Mon Aug 5 10:30:12 2024 +0800
chore(java): Disallow writing meta classdef when obj is null (#1686)
## What does this PR do?
<!-- Describe the purpose of this PR. -->
When obj is null, if shareMeta is enabled, no need to write meta
classdef
## 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/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.
-->
---------
Signed-off-by: LiangliangSui <[email protected]>
Co-authored-by: Shawn Yang <[email protected]>
---
.../src/main/java/org/apache/fury/Fury.java | 22 ++++++++++++++++------
.../org/apache/fury/collection/ObjectArray.java | 4 ++++
.../org/apache/fury/resolver/ClassResolver.java | 1 +
.../src/test/java/org/apache/fury/FuryTest.java | 17 +++++++++++++++++
4 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/java/fury-core/src/main/java/org/apache/fury/Fury.java
b/java/fury-core/src/main/java/org/apache/fury/Fury.java
index e430a426..787d47be 100644
--- a/java/fury-core/src/main/java/org/apache/fury/Fury.java
+++ b/java/fury-core/src/main/java/org/apache/fury/Fury.java
@@ -48,6 +48,7 @@ import org.apache.fury.resolver.ClassInfo;
import org.apache.fury.resolver.ClassInfoHolder;
import org.apache.fury.resolver.ClassResolver;
import org.apache.fury.resolver.MapRefResolver;
+import org.apache.fury.resolver.MetaContext;
import org.apache.fury.resolver.MetaStringResolver;
import org.apache.fury.resolver.NoRefResolver;
import org.apache.fury.resolver.RefResolver;
@@ -155,6 +156,7 @@ public final class Fury implements BaseFury {
arrayListSerializer = new ArrayListSerializer(this);
hashMapSerializer = new HashMapSerializer(this);
originToCopyMap = new IdentityMap<>();
+ classDefEndOffset = -1;
LOG.info("Created new fury {}", this);
}
@@ -344,7 +346,8 @@ public final class Fury implements BaseFury {
classResolver.writeClass(buffer, classInfo);
writeData(buffer, classInfo, obj);
}
- if (shareMeta) {
+ MetaContext metaContext = serializationContext.getMetaContext();
+ if (shareMeta && metaContext != null &&
!metaContext.writingClassDefs.isEmpty()) {
buffer.putInt32(startOffset, buffer.writerIndex() - startOffset - 4);
classResolver.writeClassDefs(buffer);
}
@@ -792,7 +795,7 @@ public final class Fury implements BaseFury {
} catch (Throwable t) {
throw ExceptionUtils.handleReadFailed(this, t);
} finally {
- if (shareMeta) {
+ if (classDefEndOffset != -1) {
buffer.readerIndex(classDefEndOffset);
}
resetRead();
@@ -1063,9 +1066,12 @@ public final class Fury implements BaseFury {
if (!refResolver.writeRefOrNull(buffer, obj)) {
ClassInfo classInfo =
classResolver.getOrUpdateClassInfo(obj.getClass());
writeData(buffer, classInfo, obj);
+ MetaContext metaContext = serializationContext.getMetaContext();
+ if (metaContext != null && !metaContext.writingClassDefs.isEmpty()) {
+ buffer.putInt32(startOffset, buffer.writerIndex() - startOffset -
4);
+ classResolver.writeClassDefs(buffer);
+ }
}
- buffer.putInt32(startOffset, buffer.writerIndex() - startOffset - 4);
- classResolver.writeClassDefs(buffer);
} else {
if (!refResolver.writeRefOrNull(buffer, obj)) {
ClassInfo classInfo =
classResolver.getOrUpdateClassInfo(obj.getClass());
@@ -1116,7 +1122,7 @@ public final class Fury implements BaseFury {
} catch (Throwable t) {
throw ExceptionUtils.handleReadFailed(this, t);
} finally {
- if (shareMeta) {
+ if (classDefEndOffset != -1) {
buffer.readerIndex(classDefEndOffset);
}
resetRead();
@@ -1226,7 +1232,7 @@ public final class Fury implements BaseFury {
} catch (Throwable t) {
throw ExceptionUtils.handleReadFailed(this, t);
} finally {
- if (shareMeta) {
+ if (classDefEndOffset != -1) {
buffer.readerIndex(classDefEndOffset);
}
resetRead();
@@ -1437,6 +1443,9 @@ public final class Fury implements BaseFury {
private void readClassDefs(MemoryBuffer buffer) {
int relativeClassDefOffset = buffer.readInt32();
+ if (relativeClassDefOffset == -1) {
+ return;
+ }
int readerIndex = buffer.readerIndex();
buffer.readerIndex(readerIndex + relativeClassDefOffset);
classResolver.readClassDefs(buffer);
@@ -1474,6 +1483,7 @@ public final class Fury implements BaseFury {
nativeObjects.clear();
peerOutOfBandEnabled = false;
depth = 0;
+ classDefEndOffset = -1;
}
public void resetCopy() {
diff --git
a/java/fury-core/src/main/java/org/apache/fury/collection/ObjectArray.java
b/java/fury-core/src/main/java/org/apache/fury/collection/ObjectArray.java
index 94c08865..9f100e0e 100644
--- a/java/fury-core/src/main/java/org/apache/fury/collection/ObjectArray.java
+++ b/java/fury-core/src/main/java/org/apache/fury/collection/ObjectArray.java
@@ -90,6 +90,10 @@ public final class ObjectArray<T> {
return size;
}
+ public boolean isEmpty() {
+ return size == 0;
+ }
+
/**
* Set all object array elements to null. This method is faster than {@link
Arrays#fill} for large
* arrays (> 128).
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 883a63d0..186a60df 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
@@ -1470,6 +1470,7 @@ public class ClassResolver {
*/
public void readClassDefs(MemoryBuffer buffer) {
MetaContext metaContext = fury.getSerializationContext().getMetaContext();
+ assert metaContext != null : SET_META__CONTEXT_MSG;
int numClassDefs = buffer.readVarUint32Small14();
for (int i = 0; i < numClassDefs; i++) {
long id = buffer.readInt64();
diff --git a/java/fury-core/src/test/java/org/apache/fury/FuryTest.java
b/java/fury-core/src/test/java/org/apache/fury/FuryTest.java
index 032c609e..1e4b5a00 100644
--- a/java/fury-core/src/test/java/org/apache/fury/FuryTest.java
+++ b/java/fury-core/src/test/java/org/apache/fury/FuryTest.java
@@ -62,6 +62,7 @@ import org.apache.fury.exception.InsecureException;
import org.apache.fury.memory.MemoryBuffer;
import org.apache.fury.memory.MemoryUtils;
import org.apache.fury.memory.Platform;
+import org.apache.fury.resolver.MetaContext;
import org.apache.fury.serializer.ArraySerializersTest;
import org.apache.fury.serializer.EnumSerializerTest;
import org.apache.fury.serializer.ObjectSerializer;
@@ -598,4 +599,20 @@ public class FuryTest extends FuryTestBase {
Assert.assertTrue(e.getMessage().contains("[a, b]"));
}
}
+
+ @Test
+ public void testNullObjSerAndDe() {
+ Fury fury =
+ Fury.builder()
+ .withRefTracking(true)
+ .requireClassRegistration(false)
+ .withMetaShare(true)
+ .build();
+ MetaContext metaContext = new MetaContext();
+ fury.getSerializationContext().setMetaContext(metaContext);
+ byte[] bytes = fury.serializeJavaObjectAndClass(null);
+ fury.getSerializationContext().setMetaContext(metaContext);
+ Object obj = fury.deserializeJavaObjectAndClass(bytes);
+ assertNull(obj);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
