Skip to content

Commit

Permalink
fix(java): fix nested map serialization codegen (#1713)
Browse files Browse the repository at this point in the history
## What does this PR do?

Closes #1700

## Related issues




## 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.
-->
  • Loading branch information
chaokunyang authored Jun 30, 2024
1 parent d4641b3 commit a7c45f3
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,44 @@
package org.apache.fury.benchmark.state;

import com.alibaba.fastjson2.JSONObject;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import java.util.List;
import org.apache.fury.Fury;
import org.apache.fury.collection.Collections;
import org.apache.fury.config.CompatibleMode;
import org.apache.fury.config.Language;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

public class JsonTest {
public static class DemoResponse {
private JSONObject json;
private List<JSONObject> objects;

public DemoResponse(JSONObject json) {
this.json = json;
objects = Collections.ofArrayList(json);
}
}

@Test
public void testSerializeJson() {
@DataProvider
public static Object[][] config() {
return Sets.cartesianProduct(
ImmutableSet.of(true, false), // referenceTracking
ImmutableSet.of(true, false), // compatible mode
ImmutableSet.of(true, false), // scoped meta share mode
ImmutableSet.of(true, false) // fury enable codegen
)
.stream()
.map(List::toArray)
.toArray(Object[][]::new);
}

@Test(dataProvider = "config")
public void testSerializeJson(
boolean trackingRef, boolean compatible, boolean scoped, boolean codegen) {
// For issue: https://github.com/apache/fury/issues/1604
JSONObject jsonObject = new JSONObject();
jsonObject.put("k1", "v1");
Expand All @@ -46,12 +67,17 @@ public void testSerializeJson() {
Fury.builder()
.withLanguage(Language.JAVA)
.requireClassRegistration(false)
.withRefTracking(true)
.withRefTracking(trackingRef)
.withCompatibleMode(
compatible ? CompatibleMode.COMPATIBLE : CompatibleMode.SCHEMA_CONSISTENT)
.withScopedMetaShare(scoped)
.withCodegen(codegen)
.registerGuavaTypes(false)
.withCompatibleMode(CompatibleMode.COMPATIBLE)
.build();
byte[] serialized = fury.serialize(resp);
DemoResponse o = (DemoResponse) fury.deserialize(serialized);
Assert.assertEquals(o.json, jsonObject);
Assert.assertEquals(o.objects, Collections.ofArrayList(jsonObject));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ protected Expression serializeForMap(
jitWriteMap(buffer, map, serializer, typeRef),
new Invoke(serializer, "write", buffer, map));
if (generateNewMethod) {
return invokeGenerated(ctx, ofHashSet(buffer, map), write, "writeMap", false);
return invokeGenerated(ctx, ofHashSet(buffer, map, serializer), write, "writeMap", false);
}
return write;
}
Expand Down

0 comments on commit a7c45f3

Please sign in to comment.