Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
201 changes: 120 additions & 81 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ mockito = "1"
motore-macros = "0.4.3"
murmur3 = "0.5.2"
once_cell = "1.20"
opendal = "0.57"
opendal = "0.58"
ordered-float = "4"
parquet = "58.4"
pilota = "0.11.10"
Expand Down
2 changes: 1 addition & 1 deletion crates/storage/opendal/public-api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl<'de> serde_core::de::Deserialize<'de> for iceberg_storage_opendal::OpenDalS
pub fn iceberg_storage_opendal::OpenDalStorageFactory::deserialize<__D>(__deserializer: __D) -> core::result::Result<Self, <__D as serde_core::de::Deserializer>::Error> where __D: serde_core::de::Deserializer<'de>
pub struct iceberg_storage_opendal::CustomAwsCredentialLoader(_)
impl iceberg_storage_opendal::CustomAwsCredentialLoader
pub fn iceberg_storage_opendal::CustomAwsCredentialLoader::new(provider: impl reqsign_core::api::ProvideCredential<Credential = reqsign_aws_v4::credential::Credential> + 'static) -> Self
pub fn iceberg_storage_opendal::CustomAwsCredentialLoader::new(provider: impl reqsign_core::api::ProvideCredential<Credential = reqsign_aws_core::credential::Credential> + 'static) -> Self
impl core::clone::Clone for iceberg_storage_opendal::CustomAwsCredentialLoader
pub fn iceberg_storage_opendal::CustomAwsCredentialLoader::clone(&self) -> Self
impl core::fmt::Debug for iceberg_storage_opendal::CustomAwsCredentialLoader
Expand Down
4 changes: 1 addition & 3 deletions crates/storage/opendal/src/azdls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,7 @@ fn azdls_config_build(config: &AzdlsConfig, path: &AzureStoragePath) -> Result<o
}
builder = builder.filesystem(&path.filesystem);

Ok(opendal::Operator::new(builder)
.map_err(from_opendal_error)?
.finish())
opendal::Operator::new(builder).map_err(from_opendal_error)
}

/// Represents a fully qualified path to blob/ file in Azure Storage.
Expand Down
4 changes: 1 addition & 3 deletions crates/storage/opendal/src/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,5 @@ pub(crate) fn fs_config_build() -> Result<Operator> {
let mut cfg = FsConfig::default();
cfg.root = Some("/".to_string());

Ok(Operator::from_config(cfg)
.map_err(from_opendal_error)?
.finish())
Operator::from_config(cfg).map_err(from_opendal_error)
}
4 changes: 1 addition & 3 deletions crates/storage/opendal/src/gcs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,5 @@ pub(crate) fn gcs_config_build(cfg: &GcsConfig, path: &str) -> Result<Operator>

let mut cfg = cfg.clone();
cfg.bucket = bucket.to_string();
Ok(Operator::from_config(cfg)
.map_err(from_opendal_error)?
.finish())
Operator::from_config(cfg).map_err(from_opendal_error)
}
4 changes: 1 addition & 3 deletions crates/storage/opendal/src/hf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,7 @@ pub(crate) fn hf_config_build<'a>(
.ok_or_else(|| Error::new(ErrorKind::DataInvalid, format!("Invalid hf url: {path}")))?;
let relative_path = &path[path.len() - parsed.path.len()..];

let op = Operator::from_config(hf_cfg)
.map_err(from_opendal_error)?
.finish();
let op = Operator::from_config(hf_cfg).map_err(from_opendal_error)?;
Ok((op, relative_path))
}

Expand Down
4 changes: 1 addition & 3 deletions crates/storage/opendal/src/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@ use opendal::services::MemoryConfig;
use crate::utils::from_opendal_error;

pub(crate) fn memory_config_build() -> Result<Operator> {
Ok(Operator::from_config(MemoryConfig::default())
.map_err(from_opendal_error)?
.finish())
Operator::from_config(MemoryConfig::default()).map_err(from_opendal_error)
}
2 changes: 1 addition & 1 deletion crates/storage/opendal/src/oss.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ pub(crate) fn oss_config_build(cfg: &OssConfig, path: &str) -> Result<Operator>

let builder = cfg.clone().into_builder().bucket(bucket);

Ok(Operator::new(builder).map_err(from_opendal_error)?.finish())
Operator::new(builder).map_err(from_opendal_error)
}
2 changes: 1 addition & 1 deletion crates/storage/opendal/src/s3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ pub(crate) fn s3_config_build(
builder = builder.credential_provider_chain(chain);
}

Ok(Operator::new(builder).map_err(from_opendal_error)?.finish())
Operator::new(builder).map_err(from_opendal_error)
}

/// Custom AWS credential loader.
Expand Down
Loading