From aa36d64dce01f097451a7e968e886bf3d7484390 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 19 Sep 2021 18:37:56 -0700 Subject: [PATCH] bump datafusion, arrow and deltalake version --- Cargo.lock | 285 ++++++++++++++++------------------------- Cargo.toml | 8 +- columnq-cli/Cargo.toml | 2 +- columnq/Cargo.toml | 7 +- roapi-http/Cargo.toml | 2 +- 5 files changed, 119 insertions(+), 185 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a75d98..027d27e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -229,7 +229,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f200cbb1e856866d9eade941cf3aa0c5d7dd36f74311c4273b494f4ef036957" dependencies = [ - "getrandom 0.2.2", + "getrandom", "once_cell", "version_check", ] @@ -273,26 +273,14 @@ version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrow" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf189dff0c7e0f40588fc25adbe5bb6837b82fc61bb7cadf5d76de030f710bb" +version = "6.0.0-SNAPSHOT" +source = "git+https://github.com/apache/arrow-rs?rev=615d7830fdaf994ebd32ca1e349daf68b18c99b0#615d7830fdaf994ebd32ca1e349daf68b18c99b0" dependencies = [ "bitflags", "chrono", + "comfy-table", "csv", "flatbuffers", "hex", @@ -302,7 +290,6 @@ dependencies = [ "multiversion", "num", "packed_simd_2", - "prettytable-rs", "rand 0.8.3", "regex", "serde", @@ -388,17 +375,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.9.0" @@ -567,7 +543,7 @@ dependencies = [ [[package]] name = "columnq" -version = "0.4.0" +version = "0.4.1" dependencies = [ "anyhow", "bytes", @@ -588,7 +564,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "sqlparser 0.10.0", + "sqlparser", "tempdir", "thiserror", "tokio", @@ -598,12 +574,12 @@ dependencies = [ [[package]] name = "columnq-cli" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "clap", "columnq", - "dirs 3.0.2", + "dirs", "env_logger", "log", "pretty_assertions", @@ -625,18 +601,23 @@ dependencies = [ "unreachable", ] +[[package]] +name = "comfy-table" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11e95a3e867422fd8d04049041f5671f94d53c32a9dcd82e2be268714942f3f3" +dependencies = [ + "strum", + "strum_macros", + "unicode-width", +] + [[package]] name = "const_fn" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "cookie" version = "0.14.4" @@ -679,17 +660,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "crossbeam-utils" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "lazy_static", -] - [[package]] name = "crypto-mac" version = "0.10.0" @@ -753,9 +723,8 @@ dependencies = [ [[package]] name = "datafusion" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab48ee19b13cfe7523ae84ec203a1ca05ce1fda52f1ac0e45d87df90c548732" +version = "5.1.0" +source = "git+https://github.com/houqp/arrow-datafusion.git?rev=af34cec956c8d67b2520a266e74683d7bdcb3099#af34cec956c8d67b2520a266e74683d7bdcb3099" dependencies = [ "ahash", "arrow", @@ -775,7 +744,7 @@ dependencies = [ "regex", "sha2", "smallvec", - "sqlparser 0.9.0", + "sqlparser", "tokio", "tokio-stream", "unicode-segmentation", @@ -784,7 +753,7 @@ dependencies = [ [[package]] name = "deltalake" version = "0.4.1" -source = "git+https://github.com/delta-io/delta-rs.git?rev=2a0d3632f44a5ffa8cf6bf953615699547856719#2a0d3632f44a5ffa8cf6bf953615699547856719" +source = "git+https://github.com/houqp/delta-rs.git?rev=cbf1126e70f8578f192dced7286ea9d63d9f629e#cbf1126e70f8578f192dced7286ea9d63d9f629e" dependencies = [ "anyhow", "arrow", @@ -844,17 +813,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi", -] - [[package]] name = "dirs" version = "3.0.2" @@ -881,7 +839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" dependencies = [ "libc", - "redox_users 0.4.0", + "redox_users", "winapi", ] @@ -892,7 +850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.0", + "redox_users", "winapi", ] @@ -914,12 +872,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "encoding_rs" version = "0.8.28" @@ -1158,17 +1110,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.2" @@ -1177,7 +1118,7 @@ checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1444,14 +1385,65 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lexical-core" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" +checksum = "d32c80337884d5044fe54e9c1b8d64b92de67e10d9312e472a8ff6d6ea849daf" dependencies = [ - "arrayvec", - "bitflags", - "cfg-if 1.0.0", - "ryu", + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673a01c82cb851a33bb46cacc44c3ad5e7b39ea3b8d22ade21646221df58e45f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2c92badda8cc0fc4f3d3cc1c30aaefafb830510c8781ce4e8669881f3ed53ac" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff669ccaae16ee33af90dc51125755efed17f1309626ba5c12052512b11e291" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93601479eae2b41ad465e1f813ea98780069ef1d69063145e76c1bd108ab769" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece956492e0e40fd95ef8658a34d53a3b8c2015762fdcaaff2167b28de1f56ef" +dependencies = [ + "lexical-util", "static_assertions", ] @@ -1857,16 +1849,15 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.5", + "redox_syscall", "smallvec", "winapi", ] [[package]] name = "parquet" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db54d10313f64ea22e1fe0332864abefb19aa1c322bfbc67999ff743aebf868d" +version = "6.0.0-SNAPSHOT" +source = "git+https://github.com/apache/arrow-rs?rev=615d7830fdaf994ebd32ca1e349daf68b18c99b0#615d7830fdaf994ebd32ca1e349daf68b18c99b0" dependencies = [ "arrow", "base64", @@ -1960,20 +1951,6 @@ dependencies = [ "output_vt100", ] -[[package]] -name = "prettytable-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" -dependencies = [ - "atty", - "csv", - "encode_unicode", - "lazy_static", - "term", - "unicode-width", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2094,7 +2071,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" dependencies = [ - "getrandom 0.2.2", + "getrandom", ] [[package]] @@ -2115,12 +2092,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.5" @@ -2130,25 +2101,14 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom 0.2.2", - "redox_syscall 0.2.5", + "getrandom", + "redox_syscall", ] [[package]] @@ -2238,7 +2198,7 @@ dependencies = [ [[package]] name = "roapi-http" -version = "0.4.0" +version = "0.4.1" dependencies = [ "actix-cors", "actix-http", @@ -2464,18 +2424,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - [[package]] name = "rustc_version" version = "0.2.3" @@ -2781,15 +2729,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "sqlparser" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa863a2dfc4879a35647c51dadf495a2ad53745eaf3723fda27006e745fb0ba" -dependencies = [ - "log", -] - [[package]] name = "sqlparser" version = "0.10.0" @@ -2875,6 +2814,24 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strum" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" + +[[package]] +name = "strum_macros" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "subtle" version = "2.4.0" @@ -2911,22 +2868,11 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.3", - "redox_syscall 0.2.5", + "redox_syscall", "remove_dir_all", "winapi", ] -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs 1.0.5", - "winapi", -] - [[package]] name = "termcolor" version = "1.1.2" @@ -3250,7 +3196,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.2", + "getrandom", "serde", ] @@ -3288,12 +3234,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" @@ -3499,8 +3439,3 @@ dependencies = [ "cc", "libc", ] - -[[patch.unused]] -name = "deltalake" -version = "0.4.1" -source = "git+https://github.com/delta-io/delta-rs.git?rev=61e2941cc5787ac2028efea271a54926f9c45cec#61e2941cc5787ac2028efea271a54926f9c45cec" diff --git a/Cargo.toml b/Cargo.toml index f3867b8..d8d7433 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,14 +7,14 @@ members = [ ] [patch.crates-io] -# arrow = { git = "https://github.com/houqp/arrow-rs.git", rev = "8927982af7bef19f18a2cb6d3433a4cc69a40074" } -# parquet = { git = "https://github.com/houqp/arrow-rs.git", rev = "8927982af7bef19f18a2cb6d3433a4cc69a40074" } -# datafusion = { git = "https://github.com/houqp/arrow-datafusion.git", rev = "e97b86a8bc410983a73b5802ae44eb7a55faecd3" } +datafusion = { git = "https://github.com/houqp/arrow-datafusion.git", rev = "af34cec956c8d67b2520a266e74683d7bdcb3099" } actix-cors = { git = "https://github.com/houqp/actix-extras.git", rev = "ab3bdb6a5924b6d881d204856199e7539e273d2f" } -deltalake = { git = "https://github.com/delta-io/delta-rs.git", rev = "61e2941cc5787ac2028efea271a54926f9c45cec" } +deltalake = { git = "https://github.com/houqp/delta-rs.git", rev = "cbf1126e70f8578f192dced7286ea9d63d9f629e" } +[patch."https://github.com/apache/arrow-datafusion"] +datafusion = { git = "https://github.com/houqp/arrow-datafusion.git", rev = "af34cec956c8d67b2520a266e74683d7bdcb3099" } [profile.dev] split-debuginfo = "unpacked" diff --git a/columnq-cli/Cargo.toml b/columnq-cli/Cargo.toml index fe85607..b9e9036 100644 --- a/columnq-cli/Cargo.toml +++ b/columnq-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "columnq-cli" -version = "0.1.1" +version = "0.1.2" homepage = "https://github.com/roapi/roapi" license = "MIT" readme = "README.md" diff --git a/columnq/Cargo.toml b/columnq/Cargo.toml index 582839b..da7c2d4 100644 --- a/columnq/Cargo.toml +++ b/columnq/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "columnq" -version = "0.4.0" +version = "0.4.1" homepage = "https://github.com/roapi/roapi" license = "MIT" authors = ["QP Hou "] @@ -12,7 +12,7 @@ path = "src/lib.rs" [dependencies] datafusion = "5" -# datafusion = { git = "https://github.com/houqp/arrow-datafusion.git", rev = "4ddd2f5e7582ffe662aea27bbb74c58cd0715152" } +# datafusion = { git = "https://github.com/houqp/arrow-datafusion.git", rev = "af34cec956c8d67b2520a266e74683d7bdcb3099" } log = "0" regex = "1" @@ -38,8 +38,7 @@ rusoto_credential = { version = "0.47" } rusoto_sts = { version = "0.47" } -deltalake = { git = "https://github.com/delta-io/delta-rs.git", rev = "2a0d3632f44a5ffa8cf6bf953615699547856719", features = ["s3", "datafusion-ext"] } -# deltalake = { version = "0", features = ["s3", "datafusion-ext"] } +deltalake = { version = "0", features = ["s3", "datafusion-ext"] } [dev-dependencies] anyhow = "1" diff --git a/roapi-http/Cargo.toml b/roapi-http/Cargo.toml index 8512582..77e0028 100644 --- a/roapi-http/Cargo.toml +++ b/roapi-http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "roapi-http" -version = "0.4.0" +version = "0.4.1" authors = ["QP Hou "] homepage = "https://github.com/roapi/roapi" license = "MIT"