Skip to content
Open
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
21 changes: 21 additions & 0 deletions crates/storage/opendal/src/azdls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,12 @@ fn validate_storage_and_scheme(
#[cfg(test)]
mod tests {
use std::collections::HashMap;
use std::sync::Arc;

use opendal::services::AzdlsConfig;

use super::{AzureStoragePath, AzureStorageScheme, azdls_config_parse, azdls_create_operator};
use crate::{OpenDalClientConfig, OpenDalStorage};

#[test]
fn test_azdls_config_parse() {
Expand Down Expand Up @@ -586,4 +588,23 @@ mod tests {
assert_eq!(endpoint, expected, "Test case: {name}");
}
}

#[test]
fn test_relativize_path_azdls() {
let storage = OpenDalStorage::Azdls {
config: Arc::new(AzdlsConfig {
account_name: Some("myaccount".to_string()),
endpoint: Some("https://myaccount.dfs.core.windows.net".to_string()),
..Default::default()
}),
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage
.relativize_path("abfss://myfs@myaccount.dfs.core.windows.net/path/to/file.parquet")
.unwrap(),
"path/to/file.parquet"
);
}
}
23 changes: 23 additions & 0 deletions crates/storage/opendal/src/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,26 @@ pub(crate) fn fs_config_build() -> Result<Operator> {

Operator::from_config(cfg).map_err(from_opendal_error)
}

#[cfg(test)]
mod tests {
use crate::{OpenDalClientConfig, OpenDalStorage};

#[test]
fn test_relativize_path_fs() {
let storage = OpenDalStorage::LocalFs {
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage
.relativize_path("file:/tmp/data/file.parquet")
.unwrap(),
"tmp/data/file.parquet"
);
assert_eq!(
storage.relativize_path("/tmp/data/file.parquet").unwrap(),
"tmp/data/file.parquet"
);
}
}
38 changes: 38 additions & 0 deletions crates/storage/opendal/src/gcs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,41 @@ pub(crate) fn gcs_config_build(cfg: &GcsConfig, path: &str) -> Result<Operator>
cfg.bucket = bucket.to_string();
Operator::from_config(cfg).map_err(from_opendal_error)
}

#[cfg(test)]
mod tests {
use std::sync::Arc;

use opendal::services::GcsConfig;

use crate::{OpenDalClientConfig, OpenDalStorage};

#[test]
fn test_relativize_path_gcs() {
let storage = OpenDalStorage::Gcs {
config: Arc::new(GcsConfig::default()),
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage
.relativize_path("gs://my-bucket/path/to/file.parquet")
.unwrap(),
"path/to/file.parquet"
);
}

#[test]
fn test_relativize_path_gcs_invalid_scheme() {
let storage = OpenDalStorage::Gcs {
config: Arc::new(GcsConfig::default()),
client_config: OpenDalClientConfig::default(),
};

assert!(
storage
.relativize_path("s3://my-bucket/path/to/file.parquet")
.is_err()
);
}
}
180 changes: 0 additions & 180 deletions crates/storage/opendal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1006,44 +1006,6 @@ mod tests {
assert!(err.contains("{ timeout: 45 }"), "{err}");
}

#[cfg(feature = "opendal-s3")]
#[derive(Debug)]
struct EmptyCredentialLoader;

#[cfg(feature = "opendal-s3")]
impl ProvideCredential for EmptyCredentialLoader {
type Credential = AwsCredential;

async fn provide_credential(
&self,
_ctx: &reqsign_core::Context,
) -> reqsign_core::Result<Option<AwsCredential>> {
Ok(None)
}
}

#[cfg(feature = "opendal-s3")]
#[test]
fn test_s3_factory_custom_credential_loader_serialization_fails() {
let file_io = iceberg::io::FileIOBuilder::new(Arc::new(OpenDalStorageFactory::S3 {
customized_credential_load: Some(CustomAwsCredentialLoader::new(EmptyCredentialLoader)),
}))
.build();

let err = file_io.serialize_all().unwrap_err();
assert!(
err.to_string()
.contains("custom AWS credential loaders cannot be serialized")
);
}

#[cfg(feature = "opendal-memory")]
#[test]
fn test_default_memory_operator() {
let op = default_memory_operator();
assert_eq!(op.info().scheme().to_string(), "memory");
}

#[cfg(feature = "opendal-memory")]
#[tokio::test]
async fn test_writer_close_returns_stored_size() {
Expand Down Expand Up @@ -1078,146 +1040,4 @@ mod tests {
assert_eq!(metadata.size, storage.metadata(path).await.unwrap().size);
}
}

#[cfg(feature = "opendal-memory")]
#[test]
fn test_relativize_path_memory() {
let storage = OpenDalStorage::Memory {
operator: default_memory_operator(),
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage.relativize_path("memory:/path/to/file").unwrap(),
"path/to/file"
);
// Without the scheme prefix, falls back to stripping the leading slash
assert_eq!(
storage.relativize_path("/path/to/file").unwrap(),
"path/to/file"
);
}

#[cfg(feature = "opendal-fs")]
#[test]
fn test_relativize_path_fs() {
let storage = OpenDalStorage::LocalFs {
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage
.relativize_path("file:/tmp/data/file.parquet")
.unwrap(),
"tmp/data/file.parquet"
);
assert_eq!(
storage.relativize_path("/tmp/data/file.parquet").unwrap(),
"tmp/data/file.parquet"
);
}

#[cfg(feature = "opendal-s3")]
#[test]
fn test_relativize_path_s3() {
let storage = OpenDalStorage::S3 {
config: Arc::new(S3Config::default()),
customized_credential_load: None,
client_config: OpenDalClientConfig::default(),
};

// All S3-family schemes are accepted by the same storage instance.
// Custom schemes for S3-compatible stores (e.g., `minio://`) are also
// accepted because the path's scheme is used as-is for prefix matching.
for scheme in ["s3", "s3a", "s3n", "minio"] {
assert_eq!(
storage
.relativize_path(&format!("{scheme}://my-bucket/path/to/file.parquet"))
.unwrap(),
"path/to/file.parquet"
);
}
}

#[cfg(feature = "opendal-gcs")]
#[test]
fn test_relativize_path_gcs() {
let storage = OpenDalStorage::Gcs {
config: Arc::new(GcsConfig::default()),
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage
.relativize_path("gs://my-bucket/path/to/file.parquet")
.unwrap(),
"path/to/file.parquet"
);
}

#[cfg(feature = "opendal-gcs")]
#[test]
fn test_relativize_path_gcs_invalid_scheme() {
let storage = OpenDalStorage::Gcs {
config: Arc::new(GcsConfig::default()),
client_config: OpenDalClientConfig::default(),
};

assert!(
storage
.relativize_path("s3://my-bucket/path/to/file.parquet")
.is_err()
);
}

#[cfg(feature = "opendal-oss")]
#[test]
fn test_relativize_path_oss() {
let storage = OpenDalStorage::Oss {
config: Arc::new(OssConfig::default()),
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage
.relativize_path("oss://my-bucket/path/to/file.parquet")
.unwrap(),
"path/to/file.parquet"
);
}

#[cfg(feature = "opendal-oss")]
#[test]
fn test_relativize_path_oss_invalid_scheme() {
let storage = OpenDalStorage::Oss {
config: Arc::new(OssConfig::default()),
client_config: OpenDalClientConfig::default(),
};

assert!(
storage
.relativize_path("s3://my-bucket/path/to/file.parquet")
.is_err()
);
}

#[cfg(feature = "opendal-azdls")]
#[test]
fn test_relativize_path_azdls() {
let storage = OpenDalStorage::Azdls {
config: Arc::new(AzdlsConfig {
account_name: Some("myaccount".to_string()),
endpoint: Some("https://myaccount.dfs.core.windows.net".to_string()),
..Default::default()
}),
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage
.relativize_path("abfss://myfs@myaccount.dfs.core.windows.net/path/to/file.parquet")
.unwrap(),
"path/to/file.parquet"
);
}
}
29 changes: 29 additions & 0 deletions crates/storage/opendal/src/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,32 @@ use crate::utils::from_opendal_error;
pub(crate) fn memory_config_build() -> Result<Operator> {
Operator::from_config(MemoryConfig::default()).map_err(from_opendal_error)
}

#[cfg(test)]
mod tests {
use crate::{OpenDalClientConfig, OpenDalStorage, default_memory_operator};

#[test]
fn test_default_memory_operator() {
let op = default_memory_operator();
assert_eq!(op.info().scheme().to_string(), "memory");
}

#[test]
fn test_relativize_path_memory() {
let storage = OpenDalStorage::Memory {
operator: default_memory_operator(),
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage.relativize_path("memory:/path/to/file").unwrap(),
"path/to/file"
);
// Without the scheme prefix, falls back to stripping the leading slash
assert_eq!(
storage.relativize_path("/path/to/file").unwrap(),
"path/to/file"
);
}
}
38 changes: 38 additions & 0 deletions crates/storage/opendal/src/oss.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,41 @@ pub(crate) fn oss_config_build(cfg: &OssConfig, path: &str) -> Result<Operator>

Operator::new(builder).map_err(from_opendal_error)
}

#[cfg(test)]
mod tests {
use std::sync::Arc;

use opendal::services::OssConfig;

use crate::{OpenDalClientConfig, OpenDalStorage};

#[test]
fn test_relativize_path_oss() {
let storage = OpenDalStorage::Oss {
config: Arc::new(OssConfig::default()),
client_config: OpenDalClientConfig::default(),
};

assert_eq!(
storage
.relativize_path("oss://my-bucket/path/to/file.parquet")
.unwrap(),
"path/to/file.parquet"
);
}

#[test]
fn test_relativize_path_oss_invalid_scheme() {
let storage = OpenDalStorage::Oss {
config: Arc::new(OssConfig::default()),
client_config: OpenDalClientConfig::default(),
};

assert!(
storage
.relativize_path("s3://my-bucket/path/to/file.parquet")
.is_err()
);
}
}
Loading
Loading