Merge branch 'main' into bindings-trademark

apache · Jan 18, 2024 · 40dd990 · 40dd990
2 parents 2364269 + 223e810
commit 40dd990
Show file tree

Hide file tree

Showing 9 changed files with 310 additions and 187 deletions.
diff --git a/DISCLAIMER b/DISCLAIMER
diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml
@@ -155,3 +155,10 @@ opendal.workspace = true
 pyo3 = "0.20.1"
 pyo3-asyncio = { version = "0.20", features = ["tokio-runtime"] }
 tokio = "1"
+
+[target.'cfg(unix)'.dependencies.opendal]
+features = [
+  # Depend on "openssh" which depends on "tokio-pipe" that is unavailable on Windows.
+  "services-sftp",
+]
+workspace = true
diff --git a/core/src/raw/http_util/client.rs b/core/src/raw/http_util/client.rs
@@ -156,8 +156,8 @@ impl HttpClient {
                 err.is_status()
             );
 
-            let mut oerr = Error::new(ErrorKind::Unexpected, "send async request")
-                .with_operation("http_util::Client::send_async")
+            let mut oerr = Error::new(ErrorKind::Unexpected, "send http request")
+                .with_operation("http_util::Client::send")
                 .with_context("url", uri.to_string())
                 .set_source(err);
             if is_temporary {

diff --git a/core/src/raw/oio/write/multipart_write.rs b/core/src/raw/oio/write/multipart_write.rs
@@ -272,8 +272,9 @@ where
                 }
                 State::Init(fut) => {
                     let upload_id = ready!(fut.as_mut().poll(cx));
-                    self.upload_id = Some(Arc::new(upload_id?));
+                    // Make sure the future is dropped after it returned ready.
                     self.state = State::Idle;
+                    self.upload_id = Some(Arc::new(upload_id?));
                 }
                 State::Close(_) => {
                     unreachable!("MultipartWriter must not go into State::Close during poll_write")

diff --git a/core/src/types/operator/operator_futures.rs b/core/src/types/operator/operator_futures.rs
@@ -95,22 +95,23 @@ where
     ///
     /// In general, `Empty` state should not be polled.
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        *self = match mem::replace(self.as_mut().get_mut(), OperatorFuture::Empty) {
-            OperatorFuture::Idle(inner, path, args, f) => {
-                // Wake up to make sure the future is ready after the
-                // future has been built.
-                cx.waker().wake_by_ref();
-                OperatorFuture::Poll(f(inner, path, args))
+        loop {
+            match mem::replace(self.as_mut().get_mut(), OperatorFuture::Empty) {
+                OperatorFuture::Idle(inner, path, args, f) => {
+                    *self = OperatorFuture::Poll(f(inner, path, args))
+                }
+                OperatorFuture::Poll(mut fut) => match fut.as_mut().poll(cx) {
+                    Poll::Ready(v) => return Poll::Ready(v),
+                    Poll::Pending => {
+                        *self = OperatorFuture::Poll(fut);
+                        return Poll::Pending;
+                    }
+                },
+                OperatorFuture::Empty => {
+                    panic!("future polled after completion");
+                }
             }
-            OperatorFuture::Poll(mut fut) => match fut.as_mut().poll(cx) {
-                Poll::Pending => OperatorFuture::Poll(fut),
-                Poll::Ready(v) => return Poll::Ready(v),
-            },
-            OperatorFuture::Empty => {
-                panic!("future polled after completion");
-            }
-        };
-        Poll::Pending
+        }
     }
 }
 

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -62,7 +62,7 @@ for package in "${PACKAGES[@]}"; do
 done
 
 echo "> Start package"
-git archive --format=tar.gz --output="dist/apache-opendal-incubating-$release_version-src.tar.gz" --prefix="apache-opendal-incubating-$release_version-src/" --add-file=Cargo.toml "$git_branch"
+git archive --format=tar.gz --output="dist/apache-opendal-$release_version-src.tar.gz" --prefix="apache-opendal-$release_version-src/" --add-file=Cargo.toml "$git_branch"
 
 cd dist
 echo "> Generate signature"

diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
@@ -209,11 +209,11 @@ const config = {
         style: 'light',
         logo: {
           alt: 'Apache Software Foundation',
-          src: './img/incubator.svg',
+          src: './img/asf_logo_wide.svg',
           href: 'https://www.apache.org/',
-          width: 200,
+          width: 300,
         },
-        copyright: `Apache OpenDAL (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. <br/><br/> Copyright © 2022-${new Date().getFullYear()}, The Apache Software Foundation. Apache OpenDAL, OpenDAL, Apache, Apache Incubator, the Apache feather, the Apache Incubator logo and the Apache OpenDAL project logo are either registered trademarks or trademarks of the Apache Software Foundation.`,
+        copyright: `Copyright © 2022-${new Date().getFullYear()}, The Apache Software Foundation<br/>Apache OpenDAL, OpenDAL, Apache, the Apache feather and the Apache OpenDAL project logo are either registered trademarks or trademarks of the Apache Software Foundation.`,
       },
       prism: {
         theme: lightCodeTheme,