From cb23e63d68764bf948001ca01fb634733511f3bc Mon Sep 17 00:00:00 2001 From: Andrew Duffy Date: Tue, 23 Jul 2024 07:55:12 -0400 Subject: [PATCH 1/2] Fix remaining copies --- Cargo.lock | 27 ++++++++---------------- Cargo.toml | 11 ++++++++++ vortex-array/src/array/varbinview/mod.rs | 8 +++---- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 941818840d..41502397b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,8 +152,7 @@ dependencies = [ [[package]] name = "arrow-array" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c16ec702d3898c2f5cfdc148443c6cd7dbe5bac28399859eb0a3d38f072827" +source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" dependencies = [ "ahash", "arrow-buffer", @@ -169,8 +168,7 @@ dependencies = [ [[package]] name = "arrow-buffer" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae6970bab043c4fbc10aee1660ceb5b306d0c42c8cc5f6ae564efcd9759b663" +source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" dependencies = [ "bytes", "half", @@ -180,8 +178,7 @@ dependencies = [ [[package]] name = "arrow-cast" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7ef44f26ef4f8edc392a048324ed5d757ad09135eff6d5509e6450d39e0398" +source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" dependencies = [ "arrow-array", "arrow-buffer", @@ -201,8 +198,7 @@ dependencies = [ [[package]] name = "arrow-csv" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f843490bd258c5182b66e888161bb6f198f49f3792f7c7f98198b924ae0f564" +source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" dependencies = [ "arrow-array", "arrow-buffer", @@ -220,8 +216,7 @@ dependencies = [ [[package]] name = "arrow-data" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a769666ffac256dd301006faca1ca553d0ae7cffcf4cd07095f73f95eb226514" +source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" dependencies = [ "arrow-buffer", "arrow-schema", @@ -232,8 +227,7 @@ dependencies = [ [[package]] name = "arrow-ipc" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf9c3fb57390a1af0b7bb3b5558c1ee1f63905f3eccf49ae7676a8d1e6e5a72" +source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" dependencies = [ "arrow-array", "arrow-buffer", @@ -267,8 +261,7 @@ dependencies = [ [[package]] name = "arrow-ord" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8008370e624e8e3c68174faaf793540287106cfda8ad1da862fdc53d8e096b4" +source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" dependencies = [ "arrow-array", "arrow-buffer", @@ -297,8 +290,7 @@ dependencies = [ [[package]] name = "arrow-schema" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dab1c12b40e29d9f3b699e0203c2a73ba558444c05e388a4377208f8f9c97eee" +source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" dependencies = [ "bitflags 2.5.0", ] @@ -306,8 +298,7 @@ dependencies = [ [[package]] name = "arrow-select" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e80159088ffe8c48965cb9b1a7c968b2729f29f37363df7eca177fc3281fe7c3" +source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" dependencies = [ "ahash", "arrow-array", diff --git a/Cargo.toml b/Cargo.toml index b8af53e704..31a46cddb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,3 +116,14 @@ warnings = "deny" [workspace.lints.clippy] all = { level = "deny", priority = -1 } or_fun_call = "deny" + +[patch.crates-io] +arrow-array = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } +arrow-buffer = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } +arrow-cast = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } +arrow-csv = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } +arrow-data = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } +arrow-ipc = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } +arrow-ord = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } +arrow-schema = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } +arrow-select = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } diff --git a/vortex-array/src/array/varbinview/mod.rs b/vortex-array/src/array/varbinview/mod.rs index 95b4dc642b..0379f9ca9c 100644 --- a/vortex-array/src/array/varbinview/mod.rs +++ b/vortex-array/src/array/varbinview/mod.rs @@ -5,7 +5,7 @@ use std::{mem, slice}; use ::serde::{Deserialize, Serialize}; use arrow_array::{ArrayRef, BinaryViewArray, StringViewArray}; -use arrow_buffer::{Buffer, ScalarBuffer}; +use arrow_buffer::ScalarBuffer; use arrow_schema::DataType; use itertools::Itertools; use vortex_dtype::{DType, Nullability, PType}; @@ -271,18 +271,18 @@ fn as_arrow(var_bin_view: VarBinViewArray) -> ArrayRef { let data = data .iter() - .map(|p| Buffer::from(p.buffer())) + .map(|p| p.buffer().clone().into_arrow()) .collect::>(); // Switch on Arrow DType. match var_bin_view.dtype() { DType::Binary(_) => Arc::new(BinaryViewArray::new( - ScalarBuffer::::from(Buffer::from(views.buffer())), + ScalarBuffer::::from(views.buffer().clone().into_arrow()), data, nulls, )), DType::Utf8(_) => Arc::new(StringViewArray::new( - ScalarBuffer::::from(Buffer::from(views.buffer())), + ScalarBuffer::::from(views.buffer().clone().into_arrow()), data, nulls, )), From d41a7b350a7e014d34a1dbeeb2b0c2ef1d20e7d2 Mon Sep 17 00:00:00 2001 From: Andrew Duffy Date: Tue, 23 Jul 2024 07:57:40 -0400 Subject: [PATCH 2/2] revert cargo patches --- Cargo.lock | 27 ++++++++++++++++++--------- Cargo.toml | 11 ----------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 41502397b5..941818840d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,7 +152,8 @@ dependencies = [ [[package]] name = "arrow-array" version = "52.1.0" -source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81c16ec702d3898c2f5cfdc148443c6cd7dbe5bac28399859eb0a3d38f072827" dependencies = [ "ahash", "arrow-buffer", @@ -168,7 +169,8 @@ dependencies = [ [[package]] name = "arrow-buffer" version = "52.1.0" -source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cae6970bab043c4fbc10aee1660ceb5b306d0c42c8cc5f6ae564efcd9759b663" dependencies = [ "bytes", "half", @@ -178,7 +180,8 @@ dependencies = [ [[package]] name = "arrow-cast" version = "52.1.0" -source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c7ef44f26ef4f8edc392a048324ed5d757ad09135eff6d5509e6450d39e0398" dependencies = [ "arrow-array", "arrow-buffer", @@ -198,7 +201,8 @@ dependencies = [ [[package]] name = "arrow-csv" version = "52.1.0" -source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f843490bd258c5182b66e888161bb6f198f49f3792f7c7f98198b924ae0f564" dependencies = [ "arrow-array", "arrow-buffer", @@ -216,7 +220,8 @@ dependencies = [ [[package]] name = "arrow-data" version = "52.1.0" -source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a769666ffac256dd301006faca1ca553d0ae7cffcf4cd07095f73f95eb226514" dependencies = [ "arrow-buffer", "arrow-schema", @@ -227,7 +232,8 @@ dependencies = [ [[package]] name = "arrow-ipc" version = "52.1.0" -source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf9c3fb57390a1af0b7bb3b5558c1ee1f63905f3eccf49ae7676a8d1e6e5a72" dependencies = [ "arrow-array", "arrow-buffer", @@ -261,7 +267,8 @@ dependencies = [ [[package]] name = "arrow-ord" version = "52.1.0" -source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8008370e624e8e3c68174faaf793540287106cfda8ad1da862fdc53d8e096b4" dependencies = [ "arrow-array", "arrow-buffer", @@ -290,7 +297,8 @@ dependencies = [ [[package]] name = "arrow-schema" version = "52.1.0" -source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dab1c12b40e29d9f3b699e0203c2a73ba558444c05e388a4377208f8f9c97eee" dependencies = [ "bitflags 2.5.0", ] @@ -298,7 +306,8 @@ dependencies = [ [[package]] name = "arrow-select" version = "52.1.0" -source = "git+https://github.com/apache/arrow-rs.git?branch=53.0.0-dev#e40b3115183c4e31132377839cc03a76244e10a7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e80159088ffe8c48965cb9b1a7c968b2729f29f37363df7eca177fc3281fe7c3" dependencies = [ "ahash", "arrow-array", diff --git a/Cargo.toml b/Cargo.toml index 31a46cddb3..b8af53e704 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,14 +116,3 @@ warnings = "deny" [workspace.lints.clippy] all = { level = "deny", priority = -1 } or_fun_call = "deny" - -[patch.crates-io] -arrow-array = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } -arrow-buffer = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } -arrow-cast = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } -arrow-csv = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } -arrow-data = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } -arrow-ipc = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } -arrow-ord = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } -arrow-schema = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" } -arrow-select = { git = "https://github.com/apache/arrow-rs.git", branch = "53.0.0-dev" }