Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(object store): bump OpenDAL to v0.43 #13901

Merged
merged 4 commits into from
Dec 11, 2023
Merged

chore(object store): bump OpenDAL to v0.43 #13901

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e38b5c3
bump opendal
wcy-fdu Dec 11, 2023
b5e7002
Merge branch 'main' into wcy/bump_opendal
wcy-fdu Dec 11, 2023
108c46a
use list_for_test
wcy-fdu Dec 11, 2023
05c401b
Merge branch 'wcy/bump_opendal' of https://github.com/risingwavelabs/…
wcy-fdu Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 53 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/object_store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ hyper = { version = "0.14", features = ["tcp", "client"] }
hyper-rustls = { version = "0.24.2", features = ["webpki-roots"] }
hyper-tls = "0.5.0"
itertools = "0.12"
opendal = "0.41"
opendal = "0.43"
prometheus = { version = "0.13", features = ["process"] }
risingwave_common = { workspace = true }
rustls = "0.21.8"
Expand Down
2 changes: 1 addition & 1 deletion src/object_store/src/object/opendal_engine/opendal_object_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ impl ObjectStore for OpendalObjectStore {
let object_lister = self
.op
.lister_with(prefix)
.delimiter("")
.recursive(true)
.metakey(Metakey::ContentLength | Metakey::ContentType)
.await?;

Expand Down
8 changes: 0 additions & 8 deletions src/object_store/src/object/opendal_engine/oss.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ use opendal::Operator;
use super::{EngineType, OpendalObjectStore};
use crate::object::ObjectResult;

/// The minimum number of bytes that is buffered before they are uploaded as a part, , will be used
/// in streaing upload.
///
/// Reference: <https://www.alibabacloud.com/help/en/oss/user-guide/multipart-upload-12>
const OSS_PART_SIZE: usize = 16 * 1024 * 1024;

impl OpendalObjectStore {
/// create opendal oss engine.
pub fn new_oss_engine(bucket: String, root: String) -> ObjectResult<Self> {
Expand All @@ -33,8 +27,6 @@ impl OpendalObjectStore {

builder.bucket(&bucket);

builder.write_min_size(OSS_PART_SIZE);
wcy-fdu marked this conversation as resolved.
Show resolved Hide resolved

builder.root(&root);

let endpoint = std::env::var("OSS_ENDPOINT")
Expand Down
Loading