Standardize conversion of object_store::Error -> PolarsError

pola-rs · Jul 28, 2023 · 0a24501 · 0a24501
1 parent 46c1cd3
commit 0a24501
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/crates/polars-error/Cargo.toml b/crates/polars-error/Cargo.toml
@@ -11,4 +11,5 @@ description = "Error definitions for the Polars DataFrame library"
 [dependencies]
 arrow.workspace = true
 regex = { version = "1.6", optional = true }
+object_store = { version = "0.6.0", default-features = false, optional = true }
 thiserror.workspace = true
diff --git a/crates/polars-error/src/lib.rs b/crates/polars-error/src/lib.rs
@@ -79,6 +79,18 @@ impl From<regex::Error> for PolarsError {
     }
 }
 
+#[cfg(feature = "object_store")]
+impl From<object_store::Error> for PolarsError {
+    fn from(err: object_store::Error) -> Self {
+        PolarsError::Io(
+            std::io::Error::new(
+                std::io::ErrorKind::Other,
+                format!("object store error {err:?}"),
+            )
+        )
+    }
+}
+
 pub type PolarsResult<T> = Result<T, PolarsError>;
 
 pub use arrow::error::Error as ArrowError;

diff --git a/crates/polars-io/Cargo.toml b/crates/polars-io/Cargo.toml
@@ -50,7 +50,7 @@ fmt = ["polars-core/fmt"]
 lazy = []
 parquet = ["polars-core/parquet", "arrow/io_parquet", "arrow/io_parquet_compression", "memmap"]
 async = ["async-trait", "futures", "tokio", "tokio-util", "arrow/io_ipc_write_async", "polars-error/regex"]
-cloud = ["object_store", "async", "polars-core/async", "url"]
+cloud = ["object_store", "async", "polars-core/async", "polars-error/object_store", "url"]
 aws = ["object_store/aws", "cloud", "polars-core/aws"]
 azure = ["object_store/azure", "cloud", "polars-core/azure"]
 gcp = ["object_store/gcp", "cloud", "polars-core/gcp"]

diff --git a/crates/polars-io/src/cloud/adaptors.rs b/crates/polars-io/src/cloud/adaptors.rs
@@ -169,10 +169,7 @@ impl CloudWriter {
         let build_result =
             runtime.block_on(async { Self::build_writer(&object_store, &path).await });
         match build_result {
-            Err(error) => Err(PolarsError::Io(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                format!("object store error {error:?}"),
-            ))),
+            Err(error) => Err(PolarsError::from(error)),
             Ok((multipart_id, writer)) => Ok(CloudWriter {
                 object_store,
                 path,