Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update arrow2 to 0.15 #89

Merged
merged 1 commit into from
Jan 5, 2023
+6 −6
Merged

Update arrow2 to 0.15 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arrow2_convert/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repository = "https://github.com/DataEngineeringLabs/arrow2-convert"
description = "Convert between nested rust types and Arrow with arrow2"

[dependencies]
arrow2 = "0.14.1"
arrow2 = "0.15"
arrow2_convert_derive = { version = "0.3.2", path = "../arrow2_convert_derive", optional = true }
chrono = { version = "0.4", default_features = false, features = ["std"] }
err-derive = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions arrow2_convert_derive/src/derive_enum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ pub fn expand_serialize(input: DeriveEnum) -> TokenStream {
<#mutable_variant_array_types as arrow2::array::MutableArray>::as_box(&mut self.#variant_names),
)*];

Box::new(arrow2::array::UnionArray::from_data(
Box::new(arrow2::array::UnionArray::new(
<#original_name as arrow2_convert::field::ArrowField>::data_type().clone(),
std::mem::take(&mut self.types).into(),
values,
Expand All @@ -340,7 +340,7 @@ pub fn expand_serialize(input: DeriveEnum) -> TokenStream {
<#mutable_variant_array_types as arrow2::array::MutableArray>::as_box(&mut self.#variant_names),
)*];

std::sync::Arc::new(arrow2::array::UnionArray::from_data(
std::sync::Arc::new(arrow2::array::UnionArray::new(
<#original_name as arrow2_convert::field::ArrowField>::data_type().clone(),
std::mem::take(&mut self.types).into(),
values,
Expand Down
4 changes: 2 additions & 2 deletions arrow2_convert_derive/src/derive_struct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ pub fn expand_serialize(input: DeriveStruct) -> TokenStream {
<#mutable_field_array_types as arrow2::array::MutableArray>::as_box(&mut self.#field_names),
)*];

Box::new(arrow2::array::StructArray::from_data(
Box::new(arrow2::array::StructArray::new(
<#original_name as arrow2_convert::field::ArrowField>::data_type().clone(),
values,
std::mem::take(&mut self.validity).map(|x| x.into()),
Expand All @@ -229,7 +229,7 @@ pub fn expand_serialize(input: DeriveStruct) -> TokenStream {
<#mutable_field_array_types as arrow2::array::MutableArray>::as_box(&mut self.#field_names),
)*];

std::sync::Arc::new(arrow2::array::StructArray::from_data(
std::sync::Arc::new(arrow2::array::StructArray::new(
<#original_name as arrow2_convert::field::ArrowField>::data_type().clone(),
values,
std::mem::take(&mut self.validity).map(|x| x.into())
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
arrow2 = "0.14"
arrow2 = "0.15"
arrow2_convert = { version = "0.3", path = "../../arrow2_convert" }