refactor(storage/opendal): remove OSS native backend, route through S3 only

Author: plusplusjiajia

crates/storage/opendal/src/lib.rs

@@ -73,13 +73,8 @@ cfg_if! {
     }
 }
 
-cfg_if! {
-    if #[cfg(feature = "opendal-oss")] {
-        mod oss;
-        use opendal::services::OssConfig;
-        use oss::*;
-    }
-}
+// When `opendal-oss` is enabled, `oss://` URLs are routed through the S3
+// backend (OSS is S3-API-compatible). No native OSS module is needed.
 
 cfg_if! {
     if #[cfg(feature = "opendal-s3")] {
@@ -151,10 +146,6 @@ impl StorageFactory for OpenDalStorageFactory {
                 config: s3_config_parse(config.props().clone())?.into(),
                 customized_credential_load: None,
             })),
-            #[cfg(all(feature = "opendal-oss", not(feature = "opendal-s3")))]
-            OpenDalStorageFactory::Oss => Ok(Arc::new(OpenDalStorage::Oss {
-                config: oss_config_parse(config.props().clone())?.into(),
-            })),
             #[cfg(feature = "opendal-azdls")]
             OpenDalStorageFactory::Azdls => Ok(Arc::new(OpenDalStorage::Azdls {
                 config: azdls_config_parse(config.props().clone())?.into(),
@@ -208,12 +199,6 @@ pub enum OpenDalStorage {
         /// GCS configuration.
         config: Arc<GcsConfig>,
     },
-    /// OSS storage variant.
-    #[cfg(feature = "opendal-oss")]
-    Oss {
-        /// OSS configuration.
-        config: Arc<OssConfig>,
-    },
     /// Azure Data Lake Storage variant.
     ///
     /// Accepts paths of the form
@@ -303,19 +288,6 @@ impl OpenDalStorage {
                     ));
                 }
             }
-            #[cfg(feature = "opendal-oss")]
-            OpenDalStorage::Oss { config } => {
-                let op = oss_config_build(config, path)?;
-                let prefix = format!("oss://{}/", op.info().name());
-                if path.starts_with(&prefix) {
-                    (op, &path[prefix.len()..])
-                } else {
-                    return Err(Error::new(
-                        ErrorKind::DataInvalid,
-                        format!("Invalid oss url: {path}, should start with {prefix}"),
-                    ));
-                }
-            }
             #[cfg(feature = "opendal-azdls")]
             OpenDalStorage::Azdls { config } => azdls_create_operator(path, config)?,
             #[cfg(all(
@@ -389,25 +361,6 @@ impl OpenDalStorage {
                     ))
                 }
             }
-            #[cfg(feature = "opendal-oss")]
-            OpenDalStorage::Oss { .. } => {
-                let url = url::Url::parse(path)?;
-                let bucket = url.host_str().ok_or_else(|| {
-                    Error::new(
-                        ErrorKind::DataInvalid,
-                        format!("Invalid oss url: {path}, missing bucket"),
-                    )
-                })?;
-                let prefix = format!("oss://{}/", bucket);
-                if path.starts_with(&prefix) {
-                    Ok(&path[prefix.len()..])
-                } else {
-                    Err(Error::new(
-                        ErrorKind::DataInvalid,
-                        format!("Invalid oss url: {path}, should start with {prefix}"),
-                    ))
-                }
-            }
             #[cfg(feature = "opendal-azdls")]
             OpenDalStorage::Azdls { config } => {
                 let azure_path = path.parse::<AzureStoragePath>()?;
@@ -671,35 +624,6 @@ mod tests {
         );
     }
 
-    #[cfg(feature = "opendal-oss")]
-    #[test]
-    fn test_relativize_path_oss() {
-        let storage = OpenDalStorage::Oss {
-            config: Arc::new(OssConfig::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()),
-        };
-
-        assert!(
-            storage
-                .relativize_path("s3://my-bucket/path/to/file.parquet")
-                .is_err()
-        );
-    }
-
     #[cfg(feature = "opendal-azdls")]
     #[test]
     fn test_relativize_path_azdls() {

crates/storage/opendal/src/oss.rs

@@ -110,15 +110,6 @@ fn build_storage_for_scheme(
                 customized_credential_load: customized_credential_load.clone(),
             })
         }
-        // Fallback: builds without `opendal-s3` but with `opendal-oss`
-        // still use the native OSS service (which consumes `oss.*` keys).
-        #[cfg(all(feature = "opendal-oss", not(feature = "opendal-s3")))]
-        "oss" => {
-            let config = crate::oss::oss_config_parse(props.clone())?;
-            Ok(OpenDalStorage::Oss {
-                config: Arc::new(config),
-            })
-        }
         #[cfg(feature = "opendal-azdls")]
         "azdls" => {
             let config = crate::azdls::azdls_config_parse(props.clone())?;
@@ -420,15 +411,4 @@ mod tests {
         let cached = resolving.resolve("oss://my-bucket/other").unwrap();
         assert!(Arc::ptr_eq(&storage, &cached));
     }
-
-    #[cfg(all(feature = "opendal-oss", not(feature = "opendal-s3")))]
-    #[test]
-    fn oss_scheme_falls_back_to_native_oss_backend() {
-        let props = HashMap::new();
-        let storage = build_storage_for_scheme("oss", &props).unwrap();
-        assert!(
-            matches!(storage, OpenDalStorage::Oss { .. }),
-            "Without opendal-s3, OSS should use the native OSS backend"
-        );
-    }
 }