You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by ti...@apache.org on 2024/10/07 13:48:24 UTC
(opendal) branch ConcurrentLimitLayer-for-java updated (e5045ef96b -> ded2ad6d44)
This is an automated email from the ASF dual-hosted git repository.
tison pushed a change to branch ConcurrentLimitLayer-for-java
in repository https://gitbox.apache.org/repos/asf/opendal.git
discard e5045ef96b feat(bindings/java): support ConcurrentLimitLayer
new ded2ad6d44 feat(bindings/java): support ConcurrentLimitLayer
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e5045ef96b)
\
N -- N -- N refs/heads/ConcurrentLimitLayer-for-java (ded2ad6d44)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/opendal/layer/ConcurrentLimitLayer.java | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
(opendal) 01/01: feat(bindings/java): support ConcurrentLimitLayer
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch ConcurrentLimitLayer-for-java
in repository https://gitbox.apache.org/repos/asf/opendal.git
commit ded2ad6d44117817d5c509b8bed10e88c7020ce3
Author: tison <wa...@gmail.com>
AuthorDate: Mon Oct 7 07:48:17 2024 -0600
feat(bindings/java): support ConcurrentLimitLayer
Signed-off-by: tison <wa...@gmail.com>
---
bindings/java/src/layer.rs | 13 +++++++
.../{RetryLayer.java => ConcurrentLimitLayer.java} | 44 +++++++++++-----------
.../java/org/apache/opendal/layer/RetryLayer.java | 6 +++
.../java/org/apache/opendal/test/LayerTest.java | 11 ++++++
4 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/bindings/java/src/layer.rs b/bindings/java/src/layer.rs
index 7e3ba35fd1..acad24f02c 100644
--- a/bindings/java/src/layer.rs
+++ b/bindings/java/src/layer.rs
@@ -22,6 +22,7 @@ use jni::sys::jboolean;
use jni::sys::jfloat;
use jni::sys::jlong;
use jni::JNIEnv;
+use opendal::layers::ConcurrentLimitLayer;
use opendal::layers::RetryLayer;
use opendal::Operator;
@@ -49,3 +50,15 @@ pub extern "system" fn Java_org_apache_opendal_layer_RetryLayer_doLayer(
}
Box::into_raw(Box::new(op.clone().layer(retry))) as jlong
}
+
+#[no_mangle]
+pub extern "system" fn Java_org_apache_opendal_layer_ConcurrentLimitLayer_doLayer(
+ _: JNIEnv,
+ _: JClass,
+ op: *mut Operator,
+ permits: jlong,
+) -> jlong {
+ let op = unsafe { &*op };
+ let concurrent_limit = ConcurrentLimitLayer::new(permits as usize);
+ Box::into_raw(Box::new(op.clone().layer(concurrent_limit))) as jlong
+}
diff --git a/bindings/java/src/main/java/org/apache/opendal/layer/RetryLayer.java b/bindings/java/src/main/java/org/apache/opendal/layer/ConcurrentLimitLayer.java
similarity index 53%
copy from bindings/java/src/main/java/org/apache/opendal/layer/RetryLayer.java
copy to bindings/java/src/main/java/org/apache/opendal/layer/ConcurrentLimitLayer.java
index 86c3bc66ee..8ec4988feb 100644
--- a/bindings/java/src/main/java/org/apache/opendal/layer/RetryLayer.java
+++ b/bindings/java/src/main/java/org/apache/opendal/layer/ConcurrentLimitLayer.java
@@ -19,32 +19,34 @@
package org.apache.opendal.layer;
-import java.time.Duration;
-import lombok.Builder;
import org.apache.opendal.Layer;
-@Builder
-public class RetryLayer extends Layer {
-
- private final boolean jitter;
-
- @Builder.Default
- private final float factor = 2;
-
- @Builder.Default
- private final Duration minDelay = Duration.ofSeconds(1);
-
- @Builder.Default
- private final Duration maxDelay = Duration.ofSeconds(60);
-
- @Builder.Default
- private final long maxTimes = 3;
+/**
+ * Users can control how many concurrent connections could be established between
+ * OpenDAL and underlying storage services.
+ *
+ * @see <a href="https://docs.rs/opendal/latest/opendal/layers/struct.ConcurrentLimitLayer.html">ConcurrentLimitLayer's rustdoc</a>
+ */
+public class ConcurrentLimitLayer extends Layer {
+ private final long permits;
+
+ /**
+ * Create a new ConcurrentLimitLayer will specify permits.
+ *
+ * @param permits concurrent connections could be established
+ */
+ public ConcurrentLimitLayer(long permits) {
+ if (permits <= 0) {
+ throw new IllegalArgumentException("permits must be positive");
+ }
+
+ this.permits = permits;
+ }
@Override
protected long layer(long nativeOp) {
- return doLayer(nativeOp, jitter, factor, minDelay.toNanos(), maxDelay.toNanos(), maxTimes);
+ return doLayer(nativeOp, permits);
}
- private static native long doLayer(
- long nativeHandle, boolean jitter, float factor, long minDelay, long maxDelay, long maxTimes);
+ private static native long doLayer(long nativeHandle, long permits);
}
diff --git a/bindings/java/src/main/java/org/apache/opendal/layer/RetryLayer.java b/bindings/java/src/main/java/org/apache/opendal/layer/RetryLayer.java
index 86c3bc66ee..100a84fb6d 100644
--- a/bindings/java/src/main/java/org/apache/opendal/layer/RetryLayer.java
+++ b/bindings/java/src/main/java/org/apache/opendal/layer/RetryLayer.java
@@ -23,6 +23,12 @@ import java.time.Duration;
import lombok.Builder;
import org.apache.opendal.Layer;
+/**
+ * This layer will retry failed operations when {@code Error::is_temporary} returns {@code true}.
+ * If operation still failed, this layer will set error to Persistent which means error has been retried.
+ *
+ * @see <a href="https://docs.rs/opendal/latest/opendal/layers/struct.RetryLayer.html">RetryLayer's rustdoc</a>
+ */
@Builder
public class RetryLayer extends Layer {
diff --git a/bindings/java/src/test/java/org/apache/opendal/test/LayerTest.java b/bindings/java/src/test/java/org/apache/opendal/test/LayerTest.java
index 0300bb1419..ed2ab4a1d2 100644
--- a/bindings/java/src/test/java/org/apache/opendal/test/LayerTest.java
+++ b/bindings/java/src/test/java/org/apache/opendal/test/LayerTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import lombok.Cleanup;
import org.apache.opendal.AsyncOperator;
import org.apache.opendal.Layer;
+import org.apache.opendal.layer.ConcurrentLimitLayer;
import org.apache.opendal.layer.RetryLayer;
import org.junit.jupiter.api.Test;
@@ -38,4 +39,14 @@ public class LayerTest {
@Cleanup final AsyncOperator layeredOp = op.layer(retryLayer);
assertThat(layeredOp.info).isNotNull();
}
+
+ @Test
+ void testOperatorWithConcurrentLimitLayer() {
+ final Map<String, String> conf = new HashMap<>();
+ conf.put("root", "/opendal/");
+ final Layer concurrentLimitLayer = new ConcurrentLimitLayer(1024);
+ @Cleanup final AsyncOperator op = AsyncOperator.of("memory", conf);
+ @Cleanup final AsyncOperator layeredOp = op.layer(concurrentLimitLayer);
+ assertThat(layeredOp.info).isNotNull();
+ }
}