-
Notifications
You must be signed in to change notification settings - Fork 258
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(java): fix fastutil Object2ObjectOpenHashMap serialization (#1618)
## What does this PR do? fix fastutil Object2ObjectOpenHashMap serialization ## Related issues Closes #1615 ## 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. -->
- Loading branch information
1 parent
b2fdd68
commit 06a74a1
Showing
5 changed files
with
136 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
java/fury-testsuite/src/test/java/org/apache/fury/TestBase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fury; | ||
|
|
||
| import org.apache.fury.config.FuryBuilder; | ||
| import org.apache.fury.config.Language; | ||
| import org.testng.Assert; | ||
| import org.testng.annotations.DataProvider; | ||
|
|
||
| /** Fury unit test base class. */ | ||
| @SuppressWarnings("unchecked") | ||
| public abstract class TestBase { | ||
|
|
||
| public static FuryBuilder builder() { | ||
| return Fury.builder().withLanguage(Language.JAVA).requireClassRegistration(false); | ||
| } | ||
|
|
||
| @DataProvider | ||
| public static Object[][] trackingRef() { | ||
| return new Object[][] {{false}, {true}}; | ||
| } | ||
|
|
||
| @DataProvider | ||
| public static Object[][] enableCodegen() { | ||
| return new Object[][] {{false}, {true}}; | ||
| } | ||
|
|
||
| @DataProvider | ||
| public static Object[][] compressNumber() { | ||
| return new Object[][] {{false}, {true}}; | ||
| } | ||
|
|
||
| public static Object serDeCheck(Fury fury, Object obj) { | ||
| Object o = serDe(fury, obj); | ||
| Assert.assertEquals(o, obj); | ||
| return o; | ||
| } | ||
|
|
||
| public static <T> T serDe(Fury fury, T obj) { | ||
| try { | ||
| byte[] bytes = fury.serialize(obj); | ||
| return (T) (fury.deserialize(bytes)); | ||
| } catch (Throwable t) { | ||
| // Catch for add breakpoint for debugging. | ||
| throw t; | ||
| } | ||
| } | ||
| } |
46 changes: 46 additions & 0 deletions
46
java/fury-testsuite/src/test/java/org/apache/fury/test/Object2ObjectOpenHashMapTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fury.test; | ||
|
|
||
| import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; | ||
| import java.util.Map; | ||
| import lombok.Data; | ||
| import org.apache.fury.Fury; | ||
| import org.apache.fury.TestBase; | ||
| import org.apache.fury.config.CompatibleMode; | ||
| import org.testng.Assert; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| public class Object2ObjectOpenHashMapTest extends TestBase { | ||
| @Data | ||
| public static class TestObject2ObjectOpenHashMap { | ||
| Map<String, String> ext = new Object2ObjectOpenHashMap<>(); | ||
| } | ||
|
|
||
| @Test(dataProvider = "enableCodegen") | ||
| public void testObject2ObjectOpenHashMap(boolean enableCodegen) { | ||
| Fury fury = | ||
| builder().withCompatibleMode(CompatibleMode.COMPATIBLE).withCodegen(enableCodegen).build(); | ||
|
|
||
| TestObject2ObjectOpenHashMap o = new TestObject2ObjectOpenHashMap(); | ||
| byte[] bytes = fury.serializeJavaObject(o); | ||
| Assert.assertEquals(fury.deserializeJavaObject(bytes, TestObject2ObjectOpenHashMap.class), o); | ||
| } | ||
| } |