Skip to content

Commit 40dd990

Browse files
authored
Merge branch 'main' into bindings-trademark
2 parents 2364269 + 223e810 commit 40dd990

File tree

9 files changed

+310
-187
lines changed

9 files changed

+310
-187
lines changed

DISCLAIMER

Lines changed: 0 additions & 10 deletions
This file was deleted.

bindings/python/Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,10 @@ opendal.workspace = true
155155
pyo3 = "0.20.1"
156156
pyo3-asyncio = { version = "0.20", features = ["tokio-runtime"] }
157157
tokio = "1"
158+
159+
[target.'cfg(unix)'.dependencies.opendal]
160+
features = [
161+
# Depend on "openssh" which depends on "tokio-pipe" that is unavailable on Windows.
162+
"services-sftp",
163+
]
164+
workspace = true

core/src/raw/http_util/client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ impl HttpClient {
156156
err.is_status()
157157
);
158158

159-
let mut oerr = Error::new(ErrorKind::Unexpected, "send async request")
160-
.with_operation("http_util::Client::send_async")
159+
let mut oerr = Error::new(ErrorKind::Unexpected, "send http request")
160+
.with_operation("http_util::Client::send")
161161
.with_context("url", uri.to_string())
162162
.set_source(err);
163163
if is_temporary {

core/src/raw/oio/write/multipart_write.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,9 @@ where
272272
}
273273
State::Init(fut) => {
274274
let upload_id = ready!(fut.as_mut().poll(cx));
275-
self.upload_id = Some(Arc::new(upload_id?));
275+
// Make sure the future is dropped after it returned ready.
276276
self.state = State::Idle;
277+
self.upload_id = Some(Arc::new(upload_id?));
277278
}
278279
State::Close(_) => {
279280
unreachable!("MultipartWriter must not go into State::Close during poll_write")

core/src/types/operator/operator_futures.rs

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,22 +95,23 @@ where
9595
///
9696
/// In general, `Empty` state should not be polled.
9797
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
98-
*self = match mem::replace(self.as_mut().get_mut(), OperatorFuture::Empty) {
99-
OperatorFuture::Idle(inner, path, args, f) => {
100-
// Wake up to make sure the future is ready after the
101-
// future has been built.
102-
cx.waker().wake_by_ref();
103-
OperatorFuture::Poll(f(inner, path, args))
98+
loop {
99+
match mem::replace(self.as_mut().get_mut(), OperatorFuture::Empty) {
100+
OperatorFuture::Idle(inner, path, args, f) => {
101+
*self = OperatorFuture::Poll(f(inner, path, args))
102+
}
103+
OperatorFuture::Poll(mut fut) => match fut.as_mut().poll(cx) {
104+
Poll::Ready(v) => return Poll::Ready(v),
105+
Poll::Pending => {
106+
*self = OperatorFuture::Poll(fut);
107+
return Poll::Pending;
108+
}
109+
},
110+
OperatorFuture::Empty => {
111+
panic!("future polled after completion");
112+
}
104113
}
105-
OperatorFuture::Poll(mut fut) => match fut.as_mut().poll(cx) {
106-
Poll::Pending => OperatorFuture::Poll(fut),
107-
Poll::Ready(v) => return Poll::Ready(v),
108-
},
109-
OperatorFuture::Empty => {
110-
panic!("future polled after completion");
111-
}
112-
};
113-
Poll::Pending
114+
}
114115
}
115116
}
116117

scripts/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ for package in "${PACKAGES[@]}"; do
6262
done
6363

6464
echo "> Start package"
65-
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"
65+
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"
6666

6767
cd dist
6868
echo "> Generate signature"

website/docusaurus.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ const config = {
209209
style: 'light',
210210
logo: {
211211
alt: 'Apache Software Foundation',
212-
src: './img/incubator.svg',
212+
src: './img/asf_logo_wide.svg',
213213
href: 'https://www.apache.org/',
214-
width: 200,
214+
width: 300,
215215
},
216-
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.`,
216+
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.`,
217217
},
218218
prism: {
219219
theme: lightCodeTheme,

0 commit comments

Comments
 (0)