feat(bindings/java): save one jni call in the hot path (#2353)

Signed-off-by: tison <wander4096@gmail.com>
apache · May 28, 2023 · 2d4c144 · 2d4c144
1 parent 72a518a
commit 2d4c144
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 34 deletions.
diff --git a/bindings/java/src/main/java/org/apache/opendal/Operator.java b/bindings/java/src/main/java/org/apache/opendal/Operator.java
@@ -30,9 +30,6 @@
  * accesses data asynchronously.
  */
 public class Operator extends NativeObject {
-    private static AsyncRegistry registry() {
-        return AsyncRegistry.INSTANCE;
-    }
 
     /**
      * Singleton to hold all outstanding futures.
@@ -61,11 +58,11 @@ private enum AsyncRegistry {
          * @return the request ID associated to the obtained future
          */
         @SuppressWarnings("unused")
-        private long requestId() {
+        private static long requestId() {
             final CompletableFuture<?> f = new CompletableFuture<>();
             while (true) {
                 final long requestId = Math.abs(UUID.randomUUID().getLeastSignificantBits());
-                final CompletableFuture<?> prev = registry.putIfAbsent(requestId, f);
+                final CompletableFuture<?> prev = INSTANCE.registry.putIfAbsent(requestId, f);
                 if (prev == null) {
                     return requestId;
                 }
@@ -81,8 +78,8 @@ private long requestId() {
          * @param requestId to identify the future
          * @return the future associated with the request ID
          */
-        private CompletableFuture<?> get(long requestId) {
-            return registry.get(requestId);
+        private static CompletableFuture<?> get(long requestId) {
+            return INSTANCE.registry.get(requestId);
         }
 
         /**
@@ -92,10 +89,10 @@ private CompletableFuture<?> get(long requestId) {
          * @return the future associated with the request ID
          */
         @SuppressWarnings("unchecked")
-        private <T> CompletableFuture<T> take(long requestId) {
+        private static <T> CompletableFuture<T> take(long requestId) {
             final CompletableFuture<?> f = get(requestId);
             if (f != null) {
-                f.whenComplete((r, e) -> registry.remove(requestId));
+                f.whenComplete((r, e) -> INSTANCE.registry.remove(requestId));
             }
             return (CompletableFuture<T>) f;
         }
@@ -121,7 +118,7 @@ public CompletableFuture<Void> write(String path, String content) {
 
     public CompletableFuture<Void> write(String path, byte[] content) {
         final long requestId = write(nativeHandle, path, content);
-        return registry().take(requestId);
+        return AsyncRegistry.take(requestId);
     }
 
     public CompletableFuture<Void> append(String path, String content) {
@@ -130,23 +127,23 @@ public CompletableFuture<Void> append(String path, String content) {
 
     public CompletableFuture<Void> append(String path, byte[] content) {
         final long requestId = append(nativeHandle, path, content);
-        return registry().take(requestId);
+        return AsyncRegistry.take(requestId);
     }
 
     public CompletableFuture<Metadata> stat(String path) {
         final long requestId = stat(nativeHandle, path);
-        final CompletableFuture<Long> f = registry().take(requestId);
+        final CompletableFuture<Long> f = AsyncRegistry.take(requestId);
         return f.thenApply(Metadata::new);
     }
 
     public CompletableFuture<String> read(String path) {
         final long requestId = read(nativeHandle, path);
-        return registry().take(requestId);
+        return AsyncRegistry.take(requestId);
     }
 
     public CompletableFuture<Void> delete(String path) {
         final long requestId = delete(nativeHandle, path);
-        return registry().take(requestId);
+        return AsyncRegistry.take(requestId);
     }
 
     @Override

diff --git a/bindings/java/src/operator.rs b/bindings/java/src/operator.rs
@@ -254,18 +254,6 @@ async fn do_delete(op: &mut Operator, path: String) -> Result<()> {
     Ok(op.delete(&path).await?)
 }
 
-fn request_id(env: &mut JNIEnv) -> Result<jlong> {
-    let registry = env
-        .call_static_method(
-            "org/apache/opendal/Operator",
-            "registry",
-            "()Lorg/apache/opendal/Operator$AsyncRegistry;",
-            &[],
-        )?
-        .l()?;
-    Ok(env.call_method(registry, "requestId", "()J", &[])?.j()?)
-}
-
 fn make_object<'local>(
     env: &mut JNIEnv<'local>,
     value: JValueOwned<'local>,
@@ -312,18 +300,21 @@ fn complete_future(id: jlong, result: Result<JValueOwned>) {
     };
 }
 
-fn get_future<'local>(env: &mut JNIEnv<'local>, id: jlong) -> Result<JObject<'local>> {
-    let registry = env
+fn request_id(env: &mut JNIEnv) -> Result<jlong> {
+    Ok(env
         .call_static_method(
-            "org/apache/opendal/Operator",
-            "registry",
-            "()Lorg/apache/opendal/Operator$AsyncRegistry;",
+            "org/apache/opendal/Operator$AsyncRegistry",
+            "requestId",
+            "()J",
             &[],
         )?
-        .l()?;
+        .j()?)
+}
+
+fn get_future<'local>(env: &mut JNIEnv<'local>, id: jlong) -> Result<JObject<'local>> {
     Ok(env
-        .call_method(
-            registry,
+        .call_static_method(
+            "org/apache/opendal/Operator$AsyncRegistry",
             "get",
             "(J)Ljava/util/concurrent/CompletableFuture;",
             &[JValue::Long(id)],