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

Support identifier warehouses #308

Merged
merged 3 commits into from
Apr 5, 2024
Merged

Support identifier warehouses #308

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb5c2cd
Support identifier warehouses
Fokko Mar 27, 2024
3178747
Use `if Url::parse().is_ok()`
Fokko Apr 3, 2024
a0120f7
Merge branch 'main' of github.com:apache/iceberg-rust into fd-warehou…
Fokko Apr 3, 2024
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
12 changes: 10 additions & 2 deletions crates/catalog/rest/src/catalog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use std::str::FromStr;
use async_trait::async_trait;
use itertools::Itertools;
use reqwest::header::{self, HeaderMap, HeaderName, HeaderValue};
use reqwest::{Client, Request, Response, StatusCode};
use reqwest::{Client, Request, Response, StatusCode, Url};
use serde::de::DeserializeOwned;
use typed_builder::TypedBuilder;
use urlencoding::encode;
Expand Down Expand Up @@ -650,7 +650,15 @@ impl RestCatalog {
props.extend(config);
}

let file_io = match self.config.warehouse.as_deref().or(metadata_location) {
// If the warehouse is a logical identifier instead of a URL we don't want
// to raise an exception
let warehouse_path = match self.config.warehouse.as_deref() {
Some(url) if Url::parse(url).is_ok() => Some(url),
Some(_) => None,
None => None,
};

let file_io = match warehouse_path.or(metadata_location) {
Some(url) => FileIO::from_path(url)?.with_props(props).build()?,
None => {
return Err(Error::new(
Expand Down
Loading