From daa8e51290e4abaa9a137596b64785920c7e8d42 Mon Sep 17 00:00:00 2001 From: Thomas K Cameron Date: Wed, 20 Dec 2023 01:56:56 +0900 Subject: [PATCH 1/3] add 49 --- Cargo.lock | 51 +++++++++++++++++++++++++++++++++++++++++- serde_arrow/Cargo.toml | 11 ++++----- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index add77fb5..abb582e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -241,6 +241,22 @@ dependencies = [ "num", ] +[[package]] +name = "arrow-array" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bda9acea48b25123c08340f3a8ac361aa0f74469bb36f5ee9acf923fce23e9d" +dependencies = [ + "ahash", + "arrow-buffer 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", + "chrono", + "half 2.2.1", + "hashbrown 0.14.0", + "num", +] + [[package]] name = "arrow-buffer" version = "37.0.0" @@ -364,6 +380,17 @@ dependencies = [ "num", ] +[[package]] +name = "arrow-buffer" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a0fc21915b00fc6c2667b069c1b64bdd920982f426079bc4a7cab86822886c" +dependencies = [ + "bytes", + "half 2.2.1", + "num", +] + [[package]] name = "arrow-cast" version = "48.0.0" @@ -525,6 +552,18 @@ dependencies = [ "num", ] +[[package]] +name = "arrow-data" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907fafe280a3874474678c1858b9ca4cb7fd83fb8034ff5b6d6376205a08c634" +dependencies = [ + "arrow-buffer 49.0.0", + "arrow-schema 49.0.0", + "half 2.2.1", + "num", +] + [[package]] name = "arrow-format" version = "0.8.1" @@ -627,6 +666,12 @@ version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d7a8c3f97f5ef6abd862155a6f39aaba36b029322462d72bbcfa69782a50614" +[[package]] +name = "arrow-schema" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09e28a5e781bf1b0f981333684ad13f5901f4cd2f20589eab7cf1797da8fc167" + [[package]] name = "arrow-select" version = "48.0.0" @@ -1634,7 +1679,7 @@ dependencies = [ [[package]] name = "serde_arrow" -version = "0.9.0-rc.1" +version = "0.9.0-rc.2" dependencies = [ "anyhow", "arrow-array 37.0.0", @@ -1649,6 +1694,7 @@ dependencies = [ "arrow-array 46.0.0", "arrow-array 47.0.0", "arrow-array 48.0.0", + "arrow-array 49.0.0", "arrow-buffer 37.0.0", "arrow-buffer 38.0.0", "arrow-buffer 39.0.0", @@ -1661,6 +1707,7 @@ dependencies = [ "arrow-buffer 46.0.0", "arrow-buffer 47.0.0", "arrow-buffer 48.0.0", + "arrow-buffer 49.0.0", "arrow-data 37.0.0", "arrow-data 38.0.0", "arrow-data 39.0.0", @@ -1673,6 +1720,7 @@ dependencies = [ "arrow-data 46.0.0", "arrow-data 47.0.0", "arrow-data 48.0.0", + "arrow-data 49.0.0", "arrow-json", "arrow-schema 37.0.0", "arrow-schema 38.0.0", @@ -1686,6 +1734,7 @@ dependencies = [ "arrow-schema 46.0.0", "arrow-schema 47.0.0", "arrow-schema 48.0.0", + "arrow-schema 49.0.0", "arrow2 0.16.0", "arrow2 0.17.0", "arrow2_convert", diff --git a/serde_arrow/Cargo.toml b/serde_arrow/Cargo.toml index 27b04594..e49ab45f 100644 --- a/serde_arrow/Cargo.toml +++ b/serde_arrow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_arrow" -version = "0.9.0-rc.1" +version = "0.9.0-rc.2" authors = ["Christopher Prohm "] edition = "2021" description = "convert sequences of structs / maps to arrow tables" @@ -22,6 +22,7 @@ features = ["arrow2-0-17", "arrow-48"] [features] default = [] +arrow-49 = ["dep:arrow-array-49", "dep:arrow-schema-49", "dep:arrow-data-49", "dep:arrow-buffer-49"] arrow-48 = ["dep:arrow-array-48", "dep:arrow-schema-48", "dep:arrow-data-48", "dep:arrow-buffer-48"] arrow-47 = ["dep:arrow-array-47", "dep:arrow-schema-47", "dep:arrow-data-47", "dep:arrow-buffer-47"] arrow-46 = ["dep:arrow-array-46", "dep:arrow-schema-46", "dep:arrow-data-46", "dep:arrow-buffer-46"] @@ -42,10 +43,10 @@ chrono = "0.4" half = { version = "2", features = ["bytemuck"] } serde = { version = "1.0", features = ["derive"] } -arrow-array-48 = { package = "arrow-array", version = "48", optional = true } -arrow-buffer-48 = { package = "arrow-buffer", version = "48", optional = true } -arrow-data-48 = { package = "arrow-data", version="48", optional = true } -arrow-schema-48 = { package = "arrow-schema", version = "48", optional = true } +arrow-array-49 = { package = "arrow-array", version = "49", optional = true } +arrow-buffer-49 = { package = "arrow-buffer", version = "49", optional = true } +arrow-data-49 = { package = "arrow-data", version="49", optional = true } +arrow-schema-49 = { package = "arrow-schema", version = "49", optional = true } arrow-array-47 = { package = "arrow-array", version = "47", optional = true } arrow-buffer-47 = { package = "arrow-buffer", version = "47", optional = true } From c2d9a9554adfec2b7e63195f262865fd21cd5b06 Mon Sep 17 00:00:00 2001 From: Thomas K Cameron Date: Wed, 20 Dec 2023 02:02:28 +0900 Subject: [PATCH 2/3] update --- serde_arrow/Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/serde_arrow/Cargo.toml b/serde_arrow/Cargo.toml index e49ab45f..0a91bc85 100644 --- a/serde_arrow/Cargo.toml +++ b/serde_arrow/Cargo.toml @@ -48,6 +48,11 @@ arrow-buffer-49 = { package = "arrow-buffer", version = "49", optional = true } arrow-data-49 = { package = "arrow-data", version="49", optional = true } arrow-schema-49 = { package = "arrow-schema", version = "49", optional = true } +arrow-array-48 = { package = "arrow-array", version = "48", optional = true } +arrow-buffer-48 = { package = "arrow-buffer", version = "48", optional = true } +arrow-data-48 = { package = "arrow-data", version="48", optional = true } +arrow-schema-48 = { package = "arrow-schema", version = "48", optional = true } + arrow-array-47 = { package = "arrow-array", version = "47", optional = true } arrow-buffer-47 = { package = "arrow-buffer", version = "47", optional = true } arrow-data-47 = { package = "arrow-data", version="47", optional = true } From 45a39d980847acfd1d9e23a98b9aeadfbed2f098 Mon Sep 17 00:00:00 2001 From: Thomas Cameron Date: Wed, 20 Dec 2023 02:15:08 +0900 Subject: [PATCH 3/3] Update lib.rs --- serde_arrow/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/serde_arrow/src/lib.rs b/serde_arrow/src/lib.rs index e1a9e197..e1a14caf 100644 --- a/serde_arrow/src/lib.rs +++ b/serde_arrow/src/lib.rs @@ -188,6 +188,7 @@ pub mod _impl { }; } + #[cfg(has_arrow_49)] build_arrow_crate!(arrow_array_49, arrow_buffer_49, arrow_data_49, arrow_schema_49); #[cfg(has_arrow_48)] build_arrow_crate!(arrow_array_48, arrow_buffer_48, arrow_data_48, arrow_schema_48); #[cfg(has_arrow_47)] build_arrow_crate!(arrow_array_47, arrow_buffer_47, arrow_data_47, arrow_schema_47); #[cfg(has_arrow_46)] build_arrow_crate!(arrow_array_46, arrow_buffer_46, arrow_data_46, arrow_schema_46);