From 7abc3bb33cc1fb56c1c5a19a4d4655f15d1035d7 Mon Sep 17 00:00:00 2001 From: Benjamin Bannier Date: Sun, 12 May 2024 12:21:50 +0200 Subject: [PATCH] DO NOT MERGE: Use arrow-rs version with comment support This commit switches to used version of arrow-rs to the version of apache/arrow-rs#5759 which introduces support for comments in CSV input files. --- Cargo.toml | 28 ++++++++++++++-------------- datafusion-cli/Cargo.lock | 28 ++++++++++++++-------------- datafusion-cli/Cargo.toml | 28 ++++++++++++++-------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ecb43ce5d12cc..80d8eda7b6102 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -135,17 +135,17 @@ large_futures = "warn" unused_imports = "deny" [patch.crates-io] -arrow-arith = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-array = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-buffer = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-cast = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-csv = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-data = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-flight = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-ipc = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-json = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-ord = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-row = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-schema = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-select = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-string = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } +arrow-arith = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-array = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-buffer = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-cast = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-csv = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-data = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-flight = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-ipc = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-json = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-ord = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-row = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-schema = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-select = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-string = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock index 926ab670b708f..575712c4ad436 100644 --- a/datafusion-cli/Cargo.lock +++ b/datafusion-cli/Cargo.lock @@ -152,7 +152,7 @@ dependencies = [ [[package]] name = "arrow-arith" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "arrow-array", "arrow-buffer", @@ -166,7 +166,7 @@ dependencies = [ [[package]] name = "arrow-array" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "ahash", "arrow-buffer", @@ -182,7 +182,7 @@ dependencies = [ [[package]] name = "arrow-buffer" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "bytes", "half", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "arrow-cast" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "arrow-array", "arrow-buffer", @@ -212,7 +212,7 @@ dependencies = [ [[package]] name = "arrow-csv" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "arrow-array", "arrow-buffer", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "arrow-data" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "arrow-buffer", "arrow-schema", @@ -241,7 +241,7 @@ dependencies = [ [[package]] name = "arrow-ipc" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "arrow-array", "arrow-buffer", @@ -255,7 +255,7 @@ dependencies = [ [[package]] name = "arrow-json" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "arrow-array", "arrow-buffer", @@ -274,7 +274,7 @@ dependencies = [ [[package]] name = "arrow-ord" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "arrow-array", "arrow-buffer", @@ -288,7 +288,7 @@ dependencies = [ [[package]] name = "arrow-row" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "ahash", "arrow-array", @@ -302,12 +302,12 @@ dependencies = [ [[package]] name = "arrow-schema" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" [[package]] name = "arrow-select" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "ahash", "arrow-array", @@ -320,7 +320,7 @@ dependencies = [ [[package]] name = "arrow-string" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" dependencies = [ "arrow-array", "arrow-buffer", @@ -4166,4 +4166,4 @@ dependencies = [ [[patch.unused]] name = "arrow-flight" version = "51.0.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=1c869214e2cf25959750756a65a0c042444e5d5d#1c869214e2cf25959750756a65a0c042444e5d5d" +source = "git+https://github.com/bbannier/arrow-rs.git?branch=t/comment#1aaf81152c5dd3d761313465e9974ac7951c79b0" diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml index 65fe94c36371b..92a04a5a699f1 100644 --- a/datafusion-cli/Cargo.toml +++ b/datafusion-cli/Cargo.toml @@ -64,17 +64,17 @@ predicates = "3.0" rstest = "0.17" [patch.crates-io] -arrow-arith = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-array = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-buffer = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-cast = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-csv = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-data = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-flight = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-ipc = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-json = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-ord = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-row = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-schema = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-select = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } -arrow-string = { git = "https://github.com/apache/arrow-rs.git", rev = "1c869214e2cf25959750756a65a0c042444e5d5d" } +arrow-arith = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-array = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-buffer = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-cast = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-csv = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-data = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-flight = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-ipc = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-json = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-ord = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-row = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-schema = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-select = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" } +arrow-string = { git = "https://github.com/bbannier/arrow-rs.git", branch = "t/comment" }