update arrow (#4685)

pola-rs · Sep 2, 2022 · 0f60051 · 0f60051
1 parent 4dc03f9
commit 0f60051
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 25 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,4 @@ members = [
 ]
 
 [patch.crates-io]
-parquet-format-safe = { git = "https://github.com/ritchie46/parquet-format-safe", branch = "patch-1" }
-parquet2 = { git = "https://github.com/ritchie46/parquet2", branch = "tmp" }
 # packed_simd_2 = { git = "https://github.com/rust-lang/packed_simd", rev = "e57c7ba11386147e6d2cbad7c88f376aab4bdc86" }
diff --git a/polars/polars-arrow/Cargo.toml b/polars/polars-arrow/Cargo.toml
@@ -9,7 +9,7 @@ description = "Arrow interfaces for Polars DataFrame library"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "0b345ae310e99729b2b48c56a2cb0a99027d1ac2", features = ["compute_concatenate"], default-features = false }
+arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "f34eb9b09fab3d90c9053ab906ce1809ffa62f47", features = ["compute_concatenate"], default-features = false }
 # arrow = { package = "arrow2", path = "../../../arrow2", features = ["compute_concatenate"], default-features = false }
 # arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "ipc_meta", features = ["compute_concatenate"], default-features = false }
 # arrow = { package = "arrow2", version = "0.12", default-features = false, features = ["compute_concatenate"] }

diff --git a/polars/polars-core/Cargo.toml b/polars/polars-core/Cargo.toml
@@ -175,7 +175,7 @@ thiserror = "^1.0"
 package = "arrow2"
 git = "https://github.com/jorgecarleitao/arrow2"
 # git = "https://github.com/ritchie46/arrow2"
-rev = "0b345ae310e99729b2b48c56a2cb0a99027d1ac2"
+rev = "f34eb9b09fab3d90c9053ab906ce1809ffa62f47"
 # path = "../../../arrow2"
 # branch = "ipc_meta"
 # version = "0.12"

diff --git a/polars/polars-io/Cargo.toml b/polars/polars-io/Cargo.toml
@@ -38,7 +38,7 @@ private = ["polars-time/private"]
 [dependencies]
 ahash = "0.7"
 anyhow = "1.0"
-arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "0b345ae310e99729b2b48c56a2cb0a99027d1ac2", default-features = false }
+arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "f34eb9b09fab3d90c9053ab906ce1809ffa62f47", default-features = false }
 # arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "ipc_meta", default-features = false }
 # arrow = { package = "arrow2", version = "0.12", default-features = false }
 # arrow = { package = "arrow2", path = "../../../arrow2", default-features = false }

diff --git a/polars/polars-io/src/parquet/write.rs b/polars/polars-io/src/parquet/write.rs
@@ -138,7 +138,12 @@ fn create_serializer(
                     let pages = DynStreamingIterator::new(
                         Compressor::new_from_vec(
                             encoded_pages.map(|result| {
-                                result.map_err(|e| ParquetError::General(format!("{}", e)))
+                                result.map_err(|e| {
+                                    ParquetError::FeatureNotSupported(format!(
+                                        "reraised in polars: {}",
+                                        e
+                                    ))
+                                })
                             }),
                             options.compression,
                             vec![],

diff --git a/py-polars/Cargo.lock b/py-polars/Cargo.lock