Gate RetryConfig on 'cloud' feature

Signed-off-by: Ze'ev Maor <[email protected]>

Author: zeevm

crates/core/src/logstore/config.rs

@@ -6,10 +6,10 @@
 //!
 //! Specific pieces of configuration must implement the `TryUpdateKey` trait which
 //! defines how to update internal fields based on key-value pairs.
-use std::collections::HashMap;
-
+#[cfg(feature = "cloud")]
 use ::object_store::RetryConfig;
 use object_store::{path::Path, prefix::PrefixStore, ObjectStore};
+use std::collections::HashMap;
 
 use super::storage::LimitConfig;
 use super::{storage::runtime::RuntimeConfig, IORuntime};
@@ -95,6 +95,7 @@ pub struct StorageConfig {
     /// dedicated handle.
     pub runtime: Option<IORuntime>,
 
+    #[cfg(feature = "cloud")]
     pub retry: ::object_store::RetryConfig,
 
     /// Limit configuration.
@@ -166,6 +167,7 @@ where
 
         let remainder = result.unparsed;
 
+        #[cfg(feature = "cloud")]
         let remainder = {
             let result = ParseResult::<RetryConfig>::from_iter(remainder);
             config.retry = result.config;
@@ -216,6 +218,7 @@ impl StorageConfig {
         props.limit = (!result.is_default).then_some(result.config);
         let remainder = result.unparsed;
 
+        #[cfg(feature = "cloud")]
         let remainder = {
             let (retry, remainder): (RetryConfig, _) = try_parse_impl(remainder)?;
             props.retry = retry;

crates/core/src/logstore/factories.rs

@@ -4,6 +4,7 @@ use std::{
 };
 
 use dashmap::DashMap;
+#[cfg(feature = "cloud")]
 use object_store::RetryConfig;
 use object_store::{path::Path, DynObjectStore};
 use tokio::runtime::Handle;
@@ -25,13 +26,22 @@ pub trait ObjectStoreFactory: Send + Sync {
     /// corresponding to the path segment of the URL.
     ///
     /// The store should __NOT__ apply the decorations via the passed `options`
+    #[cfg(feature = "cloud")]
     fn parse_url_opts(
         &self,
         url: &Url,
         options: &HashMap<String, String>,
         retry: &RetryConfig,
         handle: Option<Handle>,
     ) -> DeltaResult<(ObjectStoreRef, Path)>;
+
+    #[cfg(not(feature = "cloud"))]
+    fn parse_url_opts(
+        &self,
+        url: &Url,
+        options: &HashMap<String, String>,
+        handle: Option<Handle>,
+    ) -> DeltaResult<(ObjectStoreRef, Path)>;
 }
 
 #[derive(Clone, Debug, Default)]
@@ -42,7 +52,7 @@ impl ObjectStoreFactory for DefaultObjectStoreFactory {
         &self,
         url: &Url,
         options: &HashMap<String, String>,
-        _retry: &RetryConfig,
+        #[cfg(feature = "cloud")] _retry: &RetryConfig,
         handle: Option<Handle>,
     ) -> DeltaResult<(ObjectStoreRef, Path)> {
         let (mut store, path) = default_parse_url_opts(url, options)?;
@@ -92,8 +102,11 @@ where
     let scheme = Url::parse(&format!("{}://", url.scheme())).unwrap();
     let storage_config = StorageConfig::parse_options(options)?;
     if let Some(factory) = object_store_factories().get(&scheme) {
+        #[cfg(feature = "cloud")]
         let (store, _prefix) =
             factory.parse_url_opts(url, &storage_config.raw, &storage_config.retry, None)?;
+        #[cfg(not(feature = "cloud"))]
+        let (store, _prefix) = factory.parse_url_opts(url, &storage_config.raw, None)?;
         let store = storage_config.decorate_store(store, url)?;
         Ok(Arc::new(store))
     } else {

crates/core/src/logstore/mod.rs

@@ -183,6 +183,7 @@ pub fn logstore_for(location: Url, storage_config: StorageConfig) -> DeltaResult
         let (root_store, _prefix) = entry.value().parse_url_opts(
             &location,
             &storage_config.raw,
+            #[cfg(feature = "cloud")]
             &storage_config.retry,
             storage_config.runtime.clone().map(|rt| rt.get_handle()),
         )?;

crates/core/src/logstore/storage/retry_ext.rs

@@ -77,6 +77,7 @@ pub trait ObjectStoreRetryExt: ObjectStore {
     }
 }
 
+#[cfg(feature = "cloud")]
 impl config::TryUpdateKey for object_store::RetryConfig {
     fn try_update_key(&mut self, key: &str, v: &str) -> crate::DeltaResult<Option<()>> {
         match key {