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.

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

Add memory and local FS store to the object_store_factory builder function #578

Merged
merged 2 commits into from
Jul 26, 2024
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
14 changes: 14 additions & 0 deletions object_store_factory/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ mod local;
mod memory;

use object_store::parse_url_opts;
use object_store::prefix::PrefixStore;
use object_store::ObjectStore;
use object_store::ObjectStoreScheme;
use object_store::{local::LocalFileSystem, memory::InMemory};
use std::collections::HashMap;
use std::sync::Arc;
use tracing::warn;
Expand Down Expand Up @@ -79,6 +81,18 @@ pub async fn build_object_store_from_opts(
let (scheme, _) = ObjectStoreScheme::parse(url).unwrap();

match scheme {
// `parse_url_opts` will swallow the URL path for memory/local FS stores
ObjectStoreScheme::Memory => {
let mut store: Box<dyn ObjectStore> = Box::new(InMemory::new());
if !url.path().is_empty() {
store = Box::new(PrefixStore::new(store, url.path()));
}

Ok(store)
}
ObjectStoreScheme::Local => {
Ok(Box::new(LocalFileSystem::new_with_prefix(url.path())?))
}
ObjectStoreScheme::AmazonS3 => {
let mut s3_options = aws::map_options_into_amazon_s3_config_keys(options)?;
aws::add_amazon_s3_specific_options(url, &mut s3_options).await;
Expand Down
25 changes: 20 additions & 5 deletions tests/fixtures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,18 @@ pub fn schemas() -> ListSchemaResponse {
schemas: vec![
SchemaObject {
name: "local".to_string(),
tables: vec![TableObject {
name: "file".to_string(),
path: "delta-0.8.0-partitioned".to_string(),
store: None,
}],
tables: vec![
TableObject {
name: "file".to_string(),
path: "delta-0.8.0-partitioned".to_string(),
store: None,
},
TableObject {
name: "file_with_store".to_string(),
path: "delta-0.8.0-partitioned".to_string(),
store: Some("local_fs".to_string()),
},
],
},
SchemaObject {
name: "s3".to_string(),
Expand Down Expand Up @@ -82,6 +89,14 @@ pub fn schemas() -> ListSchemaResponse {
fake_gcs_creds(),
)]),
},
StorageLocation {
name: "local_fs".to_string(),
location: format!(
"file://{}/tests/data/",
std::env::var("CARGO_MANIFEST_DIR").unwrap()
),
options: HashMap::new(),
},
],
}
}
1 change: 1 addition & 0 deletions tests/flight/inline_metastore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use crate::flight::*;
#[rstest]
#[should_panic(expected = "External error: Not a Delta table: no log files")]
#[case("local.file", false)]
#[case("local.file_with_store", false)]
#[case("local.file", true)]
#[case("s3.minio", true)]
#[case("gcs.fake", true)]
Expand Down