feat(java): support graalvm 17/21/22 (#1845)

chaokunyang · web-flow · commit 1f1528fd832f · 2024-09-23T14:21:03.000+08:00
## What does this PR do? - Support graalvm 17/21/22 - Add ci for Fury graalvm 17/22 support ## Related issues #1813 ## Does this PR introduce any user-facing change?  - [ ] Does this PR introduce any public API change? - [ ] Does this PR introduce any binary protocol compatibility change? ## Benchmark
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,11 +89,14 @@ jobs:
   graalvm:
     name: GraalVM CI
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java-version: ["17", "21", "22"]
     steps:
       - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: "21"
+          java-version: ${{ matrix.java-version }}
           distribution: "graalvm"
           github-token: ${{ secrets.GITHUB_TOKEN }}
           native-image-job-reports: "true"
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/CollectionExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/CollectionExample.java
@@ -32,7 +32,11 @@ public class CollectionExample {
   static Fury fury;
 
   static {
-    fury = Fury.builder().requireClassRegistration(true).build();
+    fury =
+        Fury.builder()
+            .withName(CollectionExample.class.getName())
+            .requireClassRegistration(true)
+            .build();
   }
 
   static void test(Fury fury) {
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/CompatibleExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/CompatibleExample.java
@@ -26,17 +26,27 @@ public class CompatibleExample {
   static Fury fury;
 
   static {
-    fury =
+    fury = createFury();
+  }
+
+  private static Fury createFury() {
+    Fury fury =
         Fury.builder()
             .requireClassRegistration(true)
             .withCompatibleMode(CompatibleMode.COMPATIBLE)
             .withScopedMetaShare(false)
             .build();
     // register and generate serializer code.
     fury.register(Foo.class, true);
+    return fury;
   }
 
   public static void main(String[] args) {
+    System.out.println("CompatibleExample started");
+    Example.test(fury);
+    System.out.println("CompatibleExample succeed 1/2");
+    // Test new created Fury at runtime
+    fury = createFury();
     Example.test(fury);
     System.out.println("CompatibleExample succeed");
   }
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/CompatibleThreadSafeExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/CompatibleThreadSafeExample.java
@@ -33,6 +33,7 @@ public class CompatibleThreadSafeExample {
             classLoader -> {
               Fury f =
                   Fury.builder()
+                      .withName(CompatibleThreadSafeExample.class.getName())
                       .requireClassRegistration(true)
                       .withCompatibleMode(CompatibleMode.COMPATIBLE)
                       .build();
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Example.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Example.java
@@ -28,7 +28,7 @@ public class Example {
   static Fury fury;
 
   static {
-    fury = Fury.builder().requireClassRegistration(true).build();
+    fury = Fury.builder().withName(Example.class.getName()).requireClassRegistration(true).build();
     // register and generate serializer code.
     fury.register(Foo.class, true);
   }
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Main.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Main.java
@@ -31,6 +31,7 @@ public static void main(String[] args) throws Throwable {
     RecordExample.main(args);
     CompatibleRecordExample.main(args);
     RecordExample2.main(args);
+
     ThreadSafeExample.main(args);
     CompatibleThreadSafeExample.main(args);
     ProxyExample.main(args);
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ProxyExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ProxyExample.java
@@ -39,9 +39,18 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
   static Fury fury;
 
   static {
-    fury = Fury.builder().requireClassRegistration(true).build();
+    fury = createFury();
+  }
+
+  private static Fury createFury() {
+    Fury fury =
+        Fury.builder()
+            .withName(ProxyExample.class.getName())
+            .requireClassRegistration(true)
+            .build();
     // register and generate serializer code.
     fury.register(TestInvocationHandler.class, true);
+    return fury;
   }
 
   public static void main(String[] args) {
@@ -51,6 +60,9 @@ public static void main(String[] args) {
                 fury.getClassLoader(), new Class[] {Function.class}, new TestInvocationHandler());
     Function deserializedFunction = (Function) fury.deserialize(fury.serialize(function));
     Preconditions.checkArgument(deserializedFunction.apply(null).equals(1));
+    fury = createFury();
+    deserializedFunction = (Function) fury.deserialize(fury.serialize(function));
+    Preconditions.checkArgument(deserializedFunction.apply(null).equals(1));
     System.out.println("Proxy tests pass");
   }
 }
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ScopedCompatibleExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ScopedCompatibleExample.java
@@ -23,21 +23,31 @@
 import org.apache.fury.config.CompatibleMode;
 
 public class ScopedCompatibleExample {
-  static Fury fury;
+  private static Fury fury;
 
   static {
-    fury =
+    fury = createFury();
+  }
+
+  private static Fury createFury() {
+    Fury fury =
         Fury.builder()
+            .withName(ScopedCompatibleExample.class.getName())
             .requireClassRegistration(true)
             .withCompatibleMode(CompatibleMode.COMPATIBLE)
             .withScopedMetaShare(true)
             .build();
     // register and generate serializer code.
     fury.register(Foo.class, true);
+    return fury;
   }
 
   public static void main(String[] args) {
+    System.out.println("ScopedCompatibleExample started");
+    Example.test(fury);
+    System.out.println("ScopedCompatibleExample succeed 1/2");
+    fury = createFury();
     Example.test(fury);
-    System.out.println("CompatibleExample succeed");
+    System.out.println("ScopedCompatibleExample succeed");
   }
 }
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ThreadSafeExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ThreadSafeExample.java
@@ -37,7 +37,11 @@ public class ThreadSafeExample {
     fury =
         new ThreadLocalFury(
             classLoader -> {
-              Fury f = Fury.builder().requireClassRegistration(true).build();
+              Fury f =
+                  Fury.builder()
+                      .withName(ThreadSafeExample.class.getName())
+                      .requireClassRegistration(true)
+                      .build();
               // register and generate serializer code.
               f.register(Foo.class, true);
               return f;
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/CompatibleRecordExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/CompatibleRecordExample.java
@@ -26,16 +26,24 @@ public class CompatibleRecordExample {
   static Fury fury;
 
   static {
-    fury =
+    fury = createFury();
+  }
+
+  private static Fury createFury() {
+    Fury fury =
         Fury.builder()
+            .withName(CompatibleRecordExample.class.getName())
             .requireClassRegistration(true)
             .withCompatibleMode(CompatibleMode.COMPATIBLE)
             .build();
     // register and generate serializer code.
     fury.register(RecordExample.Record.class, true);
+    return fury;
   }
 
   public static void main(String[] args) {
+    RecordExample.test(fury);
+    fury = createFury();
     RecordExample.test(fury);
     System.out.println("CompatibleRecordExample succeed");
   }
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample.java
@@ -30,9 +30,18 @@ public record Record(int f1, String f2, List<String> f3, Map<String, Long> f4) {
   static Fury fury;
 
   static {
-    fury = Fury.builder().requireClassRegistration(true).build();
+    fury = createFury();
+  }
+
+  private static Fury createFury() {
+    Fury fury =
+        Fury.builder()
+            .withName(RecordExample.class.getName())
+            .requireClassRegistration(true)
+            .build();
     // register and generate serializer code.
     fury.register(Record.class, true);
+    return fury;
   }
 
   static void test(Fury fury) {
@@ -45,6 +54,10 @@ static void test(Fury fury) {
   }
 
   public static void main(String[] args) {
+    System.out.println("RecordExample started");
+    test(fury);
+    System.out.println("RecordExample succeed 1/2");
+    fury = createFury();
     test(fury);
     System.out.println("RecordExample succeed");
   }
diff --git a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample2.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample2.java
@@ -30,20 +30,37 @@ private record Record(int f1, String f2, List<String> f3, Map<String, Long> f4)
   static Fury fury;
 
   static {
-    fury = Fury.builder().requireClassRegistration(true).build();
+    fury = createFury();
+  }
+
+  private static Fury createFury() {
+    Fury fury =
+        Fury.builder()
+            .withName(RecordExample2.class.getName())
+            .requireClassRegistration(true)
+            .build();
     // register and generate serializer code.
     fury.register(Record.class, true);
     fury.register(Foo.class, true);
+    return fury;
   }
 
-  public static void main(String[] args) {
+  public static void test(Fury fury) {
     Record record = new Record(10, "abc", List.of("str1", "str2"), Map.of("k1", 10L, "k2", 20L));
     byte[] bytes = fury.serialize(record);
     Object o = fury.deserialize(bytes);
     Preconditions.checkArgument(record.equals(o));
     Foo foo = new Foo(10, "abc", List.of("str1", "str2"), Map.of("k1", 10L, "k2", 20L));
     Object o2 = fury.deserialize(fury.serialize(foo));
     Preconditions.checkArgument(foo.equals(o2));
+  }
+
+  public static void main(String[] args) {
+    System.out.println("RecordExample started");
+    test(fury);
+    System.out.println("RecordExample succeed 1/2");
+    fury = createFury();
+    test(fury);
     System.out.println("RecordExample2 succeed");
   }
 }
diff --git a/integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.apache.fury/graalvm_tests/native-image.properties b/integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.apache.fury/graalvm_tests/native-image.properties
@@ -17,13 +17,15 @@
 
 # https://www.graalvm.org/latest/reference-manual/native-image/dynamic-features/Reflection/#unsafe-accesses :
 # The unsafe offset get on build time may be different from runtime
-Args = -H:+ReportExceptionStackTraces \
+Args=-H:+ReportExceptionStackTraces \
   --initialize-at-build-time=org.apache.fury.graalvm.Example,\
   org.apache.fury.graalvm.CompatibleExample,\
+  org.apache.fury.graalvm.ScopedCompatibleExample,\
   org.apache.fury.graalvm.record.RecordExample,\
   org.apache.fury.graalvm.record.CompatibleRecordExample,\
   org.apache.fury.graalvm.record.RecordExample2,\
   org.apache.fury.graalvm.ThreadSafeExample,\
   org.apache.fury.graalvm.CompatibleThreadSafeExample,\
   org.apache.fury.graalvm.ProxyExample,\
+  org.apache.fury.graalvm.CollectionExample,\
   org.apache.fury.graalvm.Benchmark
diff --git a/java/fury-core/src/main/java/org/apache/fury/ThreadLocalFury.java b/java/fury-core/src/main/java/org/apache/fury/ThreadLocalFury.java
@@ -29,7 +29,6 @@
 import org.apache.fury.io.FuryReadableChannel;
 import org.apache.fury.memory.MemoryBuffer;
 import org.apache.fury.memory.MemoryUtils;
-import org.apache.fury.resolver.ClassResolver;
 import org.apache.fury.serializer.BufferCallback;
 import org.apache.fury.util.LoaderBinding;
 import org.apache.fury.util.LoaderBinding.StagingType;
@@ -65,8 +64,6 @@ public ThreadLocalFury(Function<ClassLoader, Fury> furyFactory) {
     // in a process load some classes which is not cheap.
     // 2. Make fury generate code at graalvm build time.
     Fury fury = bindingThreadLocal.get().get();
-    ClassResolver._addGraalvmClassRegistry(
-        fury.getConfig().getConfigHash(), fury.getClassResolver());
   }
 
   @Override
diff --git a/java/fury-core/src/main/java/org/apache/fury/config/Config.java b/java/fury-core/src/main/java/org/apache/fury/config/Config.java
@@ -33,6 +33,7 @@
 /** Config for fury, all {@link Fury} related config can be found here. */
 @SuppressWarnings({"rawtypes"})
 public class Config implements Serializable {
+  private final String name;
   private final Language language;
   private final boolean trackingRef;
   private final boolean basicTypesRefIgnored;
@@ -61,6 +62,7 @@ public class Config implements Serializable {
   private final boolean deserializeNonexistentEnumValueAsNull;
 
   public Config(FuryBuilder builder) {
+    name = builder.name;
     language = builder.language;
     trackingRef = builder.trackingRef;
     basicTypesRefIgnored = !trackingRef || builder.basicTypesRefIgnored;
@@ -93,6 +95,11 @@ public Config(FuryBuilder builder) {
     deserializeNonexistentEnumValueAsNull = builder.deserializeNonexistentEnumValueAsNull;
   }
 
+  /** Returns the name for Fury serialization. */
+  public String getName() {
+    return name;
+  }
+
   public Language getLanguage() {
     return language;
   }
@@ -257,7 +264,8 @@ public boolean equals(Object o) {
       return false;
     }
     Config config = (Config) o;
-    return trackingRef == config.trackingRef
+    return name == config.name
+        && trackingRef == config.trackingRef
         && basicTypesRefIgnored == config.basicTypesRefIgnored
         && stringRefIgnored == config.stringRefIgnored
         && timeRefIgnored == config.timeRefIgnored
@@ -286,6 +294,7 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     return Objects.hash(
+        name,
         language,
         trackingRef,
         basicTypesRefIgnored,
diff --git a/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java b/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java
@@ -56,6 +56,7 @@ public final class FuryBuilder {
     ENABLE_CLASS_REGISTRATION_FORCIBLY = "true".equals(flagValue) || "1".equals(flagValue);
   }
 
+  String name;
   boolean checkClassVersion = false;
   Language language = Language.JAVA;
   boolean trackingRef = false;
@@ -318,6 +319,12 @@ public FuryBuilder withScalaOptimizationEnabled(boolean enableScalaOptimization)
     return this;
   }
 
+  /** Set name for Fury serialization. */
+  public FuryBuilder withName(String name) {
+    this.name = name;
+    return this;
+  }
+
   private void finish() {
     if (classLoader == null) {
       classLoader = Thread.currentThread().getContextClassLoader();
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
diff --git a/java/fury-core/src/main/java/org/apache/fury/util/function/Functions.java b/java/fury-core/src/main/java/org/apache/fury/util/function/Functions.java
diff --git a/java/fury-core/src/main/resources/META-INF/native-image/org.apache.fury/fury-core/native-image.properties b/java/fury-core/src/main/resources/META-INF/native-image/org.apache.fury/fury-core/native-image.properties
diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenSerializerTest.java

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class Example {`
`28`	`28`	`static Fury fury;`
`29`	`29`
`30`	`30`	`static {`
`31`		`- fury = Fury.builder().requireClassRegistration(true).build();`
	`31`	`+ fury = Fury.builder().withName(Example.class.getName()).requireClassRegistration(true).build();`
`32`	`32`	`// register and generate serializer code.`
`33`	`33`	`fury.register(Foo.class, true);`
`34`	`34`	`}`