From ae3bfc99a88fd7a4726a9f54f6a57abd08e6933e Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Fri, 13 Sep 2024 18:19:41 +0100 Subject: [PATCH] fix CLI for recently used version --- datafusion-cli/Cargo.lock | 91 +++++++++++++++++++++++++++++++-------- datafusion-cli/Cargo.toml | 4 +- 2 files changed, 74 insertions(+), 21 deletions(-) diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock index 02848488a64f7..9055d26b69926 100644 --- a/datafusion-cli/Cargo.lock +++ b/datafusion-cli/Cargo.lock @@ -180,7 +180,7 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arrow" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "arrow-arith", "arrow-array", @@ -200,7 +200,7 @@ dependencies = [ [[package]] name = "arrow-arith" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "arrow-array", "arrow-buffer", @@ -214,7 +214,7 @@ dependencies = [ [[package]] name = "arrow-array" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "ahash", "arrow-buffer", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "arrow-buffer" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "bytes", "half", @@ -240,7 +240,7 @@ dependencies = [ [[package]] name = "arrow-cast" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "arrow-array", "arrow-buffer", @@ -260,7 +260,7 @@ dependencies = [ [[package]] name = "arrow-csv" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "arrow-array", "arrow-buffer", @@ -278,7 +278,7 @@ dependencies = [ [[package]] name = "arrow-data" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "arrow-buffer", "arrow-schema", @@ -289,7 +289,7 @@ dependencies = [ [[package]] name = "arrow-ipc" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "arrow-array", "arrow-buffer", @@ -303,7 +303,7 @@ dependencies = [ [[package]] name = "arrow-json" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "arrow-array", "arrow-buffer", @@ -322,7 +322,7 @@ dependencies = [ [[package]] name = "arrow-ord" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "arrow-array", "arrow-buffer", @@ -336,7 +336,7 @@ dependencies = [ [[package]] name = "arrow-row" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "ahash", "arrow-array", @@ -349,12 +349,12 @@ dependencies = [ [[package]] name = "arrow-schema" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" [[package]] name = "arrow-select" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "ahash", "arrow-array", @@ -367,7 +367,7 @@ dependencies = [ [[package]] name = "arrow-string" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "arrow-array", "arrow-buffer", @@ -2695,7 +2695,7 @@ dependencies = [ [[package]] name = "parquet" version = "52.2.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" +source = "git+https://github.com/apache/arrow-rs.git?rev=ee2f75a#ee2f75a66278dbd3e7aa6b85b5322951c792a58d" dependencies = [ "ahash", "arrow-array", @@ -3531,8 +3531,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "sqlparser" version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e5b515a2bd5168426033e9efbfd05500114833916f1d5c268f938b4ee130ac" +source = "git+https://github.com/sqlparser-rs/sqlparser-rs.git?rev=222b7d1#222b7d127acb265472cc9bf2e81ef2453a53a9ce" dependencies = [ "log", "sqlparser_derive", @@ -3541,8 +3540,7 @@ dependencies = [ [[package]] name = "sqlparser_derive" version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" +source = "git+https://github.com/sqlparser-rs/sqlparser-rs.git?rev=222b7d1#222b7d127acb265472cc9bf2e81ef2453a53a9ce" dependencies = [ "proc-macro2", "quote", @@ -4466,7 +4464,62 @@ dependencies = [ "pkg-config", ] +[[patch.unused]] +name = "arrow" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "arrow-array" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "arrow-buffer" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "arrow-cast" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "arrow-data" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + [[patch.unused]] name = "arrow-flight" version = "52.2.0" source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "arrow-ipc" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "arrow-ord" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "arrow-schema" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "arrow-select" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "arrow-string" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" + +[[patch.unused]] +name = "parquet" +version = "52.2.0" +source = "git+https://github.com/apache/arrow-rs.git?rev=344ba1dd870cb8c7327a08a7020a0350d4afd687#344ba1dd870cb8c7327a08a7020a0350d4afd687" diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml index 33ceecc740b88..41df4e8633950 100644 --- a/datafusion-cli/Cargo.toml +++ b/datafusion-cli/Cargo.toml @@ -30,7 +30,7 @@ rust-version = "1.76" readme = "README.md" [dependencies] -arrow = { version = "52.2.0" } +arrow = { git = "https://github.com/apache/arrow-rs.git", rev = "ee2f75a" } async-trait = "0.1.73" aws-config = "0.55" aws-credential-types = "0.55" @@ -51,7 +51,7 @@ futures = "0.3" mimalloc = { version = "0.1", default-features = false } object_store = { version = "0.11.0", features = ["aws", "gcp", "http"] } parking_lot = { version = "0.12" } -parquet = { version = "52.2.0", default-features = false } +parquet = { git = "https://github.com/apache/arrow-rs.git", rev = "ee2f75a", default-features = false } regex = "1.8" rustyline = "11.0" tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot", "signal"] }