diff --git a/Cargo.lock b/Cargo.lock index 585e64cb..fd4bf25c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,19 +133,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7104b9e9761613ae92fe770c741d6bbf1dbc791a0fe204400aebdd429875741" dependencies = [ "ahash", - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-csv", - "arrow-data", - "arrow-ipc", - "arrow-json", - "arrow-ord", - "arrow-row", - "arrow-schema", - "arrow-select", - "arrow-string", + "arrow-arith 45.0.0", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-cast 45.0.0", + "arrow-csv 45.0.0", + "arrow-data 45.0.0", + "arrow-ipc 45.0.0", + "arrow-json 45.0.0", + "arrow-ord 45.0.0", + "arrow-row 45.0.0", + "arrow-schema 45.0.0", + "arrow-select 45.0.0", + "arrow-string 45.0.0", + "pyo3", +] + +[[package]] +name = "arrow" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04a8801ebb147ad240b2d978d3ab9f73c9ccd4557ba6a03e7800496770ed10e0" +dependencies = [ + "ahash", + "arrow-arith 46.0.0", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-cast 46.0.0", + "arrow-csv 46.0.0", + "arrow-data 46.0.0", + "arrow-ipc 46.0.0", + "arrow-json 46.0.0", + "arrow-ord 46.0.0", + "arrow-row 46.0.0", + "arrow-schema 46.0.0", + "arrow-select 46.0.0", + "arrow-string 46.0.0", "pyo3", ] @@ -155,10 +178,25 @@ version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e597a8e8efb8ff52c50eaf8f4d85124ce3c1bf20fab82f476d73739d9ab1c2" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-arith" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "895263144bd4a69751cbe6a34a53f26626e19770b313a9fa792c415cd0e78f11" +dependencies = [ + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", "chrono", "half", "num", @@ -171,9 +209,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a86d9c1473db72896bd2345ebb6b8ad75b8553ba390875c76708e8dc5c5492d" dependencies = [ "ahash", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-buffer 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "chrono", + "chrono-tz", + "half", + "hashbrown 0.14.0", + "num", +] + +[[package]] +name = "arrow-array" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "226fdc6c3a4ae154a74c24091d36a90b514f0ed7112f5b8322c1d8f354d8e20d" +dependencies = [ + "ahash", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", "chrono", "chrono-tz", "half", @@ -191,17 +246,46 @@ dependencies = [ "num", ] +[[package]] +name = "arrow-buffer" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4843af4dd679c2f35b69c572874da8fde33be53eb549a5fb128e7a4b763510" +dependencies = [ + "bytes", + "half", + "num", +] + [[package]] name = "arrow-cast" version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22f61168b853c7faea8cea23a2169fdff9c82fb10ae5e2c07ad1cab8f6884931" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "arrow-select 45.0.0", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", +] + +[[package]] +name = "arrow-cast" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35e8b9990733a9b635f656efda3c9b8308c7a19695c9ec2c7046dd154f9b144b" +dependencies = [ + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "arrow-select 46.0.0", "chrono", "comfy-table", "half", @@ -215,11 +299,30 @@ version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10b545c114d9bf8569c84d2fbe2020ac4eea8db462c0a37d0b65f41a90d066fe" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-cast 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-csv" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "646fbb4e11dd0afb8083e883f53117713b8caadb4413b3c9e63e3f535da3683c" +dependencies = [ + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-cast 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", "chrono", "csv", "csv-core", @@ -234,8 +337,20 @@ version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6b6852635e7c43e5b242841c7470606ff0ee70eef323004cacc3ecedd33dd8f" dependencies = [ - "arrow-buffer", - "arrow-schema", + "arrow-buffer 45.0.0", + "arrow-schema 45.0.0", + "half", + "num", +] + +[[package]] +name = "arrow-data" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da900f31ff01a0a84da0572209be72b2b6f980f3ea58803635de47913191c188" +dependencies = [ + "arrow-buffer 46.0.0", + "arrow-schema 46.0.0", "half", "num", ] @@ -246,11 +361,25 @@ version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a66da9e16aecd9250af0ae9717ae8dd7ea0d8ca5a3e788fe3de9f4ee508da751" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-cast 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "flatbuffers", +] + +[[package]] +name = "arrow-ipc" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2707a8d7ee2d345d045283ece3ae43416175873483e5d96319c929da542a0b1f" +dependencies = [ + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-cast 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", "flatbuffers", ] @@ -260,11 +389,31 @@ version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60ee0f9d8997f4be44a60ee5807443e396e025c23cf14d2b74ce56135cb04474" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-cast 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "chrono", + "half", + "indexmap 2.0.0", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-json" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1b91a63c356d14eedc778b76d66a88f35ac8498426bb0799a769a49a74a8b4" +dependencies = [ + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-cast 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", "chrono", "half", "indexmap 2.0.0", @@ -280,11 +429,26 @@ version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcab05410e6b241442abdab6e1035177dc082bdb6f17049a4db49faed986d63" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "arrow-select 45.0.0", + "half", + "num", +] + +[[package]] +name = "arrow-ord" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "584325c91293abbca7aaaabf8da9fe303245d641f5f4a18a6058dc68009c7ebf" +dependencies = [ + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "arrow-select 46.0.0", "half", "num", ] @@ -296,10 +460,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91a847dd9eb0bacd7836ac63b3475c68b2210c2c96d0ec1b808237b973bd5d73" dependencies = [ "ahash", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "half", + "hashbrown 0.14.0", +] + +[[package]] +name = "arrow-row" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e32afc1329f7b372463b21c6ca502b07cf237e1ed420d87706c1770bb0ebd38" +dependencies = [ + "ahash", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", "half", "hashbrown 0.14.0", ] @@ -313,16 +492,38 @@ dependencies = [ "bitflags 2.4.0", ] +[[package]] +name = "arrow-schema" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b104f5daa730f00fde22adc03a12aa5a2ae9ccbbf99cbd53d284119ddc90e03d" +dependencies = [ + "bitflags 2.4.0", +] + [[package]] name = "arrow-select" version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "941dbe481da043c4bd40c805a19ec2fc008846080c4953171b62bcad5ee5f7fb" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "num", +] + +[[package]] +name = "arrow-select" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b3ca55356d1eae07cf48808d8c462cea674393ae6ad1e0b120f40b422eb2b4" +dependencies = [ + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", "num", ] @@ -332,11 +533,27 @@ version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "359b2cd9e071d5a3bcf44679f9d85830afebc5b9c98a08019a570a65ae933e0f" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-data 45.0.0", + "arrow-schema 45.0.0", + "arrow-select 45.0.0", + "num", + "regex", + "regex-syntax", +] + +[[package]] +name = "arrow-string" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1433ce02590cae68da0a18ed3a3ed868ffac2c6f24c533ddd2067f7ee04b4a" +dependencies = [ + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "arrow-select 46.0.0", "num", "regex", "regex-syntax", @@ -540,15 +757,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets", ] [[package]] @@ -693,16 +910,16 @@ source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265 dependencies = [ "ahash", "apache-avro", - "arrow", - "arrow-array", - "arrow-schema", + "arrow 45.0.0", + "arrow-array 45.0.0", + "arrow-schema 45.0.0", "async-compression", "async-trait", "bytes", "bzip2", "chrono", "dashmap", - "datafusion-common", + "datafusion-common 29.0.0", "datafusion-execution", "datafusion-expr", "datafusion-optimizer", @@ -719,14 +936,14 @@ dependencies = [ "log", "num-traits", "num_cpus", - "object_store", + "object_store 0.6.1", "parking_lot", - "parquet", + "parquet 45.0.0", "percent-encoding", "pin-project-lite", "rand", "smallvec", - "sqlparser", + "sqlparser 0.36.1", "tempfile", "tokio", "tokio-util", @@ -742,14 +959,37 @@ version = "29.0.0" source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" dependencies = [ "apache-avro", - "arrow", - "arrow-array", + "arrow 45.0.0", + "arrow-array 45.0.0", "chrono", "num_cpus", - "object_store", - "parquet", + "object_store 0.6.1", + "parquet 45.0.0", "pyo3", - "sqlparser", + "sqlparser 0.36.1", +] + +[[package]] +name = "datafusion-common" +version = "31.0.0" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=31.0.0-rc1#44cf6f127ddfba7cda0c243b22f7e0fce70f16ec" +dependencies = [ + "arrow 46.0.0", + "arrow-array 46.0.0", + "async-compression", + "bytes", + "bzip2", + "chrono", + "flate2", + "futures", + "num_cpus", + "parquet 46.0.0", + "pyo3", + "sqlparser 0.37.0", + "tokio", + "tokio-util", + "xz2", + "zstd", ] [[package]] @@ -757,14 +997,14 @@ name = "datafusion-execution" version = "29.0.0" source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" dependencies = [ - "arrow", + "arrow 45.0.0", "dashmap", - "datafusion-common", + "datafusion-common 29.0.0", "datafusion-expr", "futures", "hashbrown 0.14.0", "log", - "object_store", + "object_store 0.6.1", "parking_lot", "rand", "tempfile", @@ -777,10 +1017,10 @@ version = "29.0.0" source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" dependencies = [ "ahash", - "arrow", - "datafusion-common", + "arrow 45.0.0", + "datafusion-common 29.0.0", "lazy_static", - "sqlparser", + "sqlparser 0.36.1", "strum 0.25.0", "strum_macros 0.25.2", ] @@ -790,10 +1030,10 @@ name = "datafusion-optimizer" version = "29.0.0" source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" dependencies = [ - "arrow", + "arrow 45.0.0", "async-trait", "chrono", - "datafusion-common", + "datafusion-common 29.0.0", "datafusion-expr", "datafusion-physical-expr", "hashbrown 0.14.0", @@ -808,15 +1048,15 @@ version = "29.0.0" source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" dependencies = [ "ahash", - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-schema", + "arrow 45.0.0", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-schema 45.0.0", "base64", "blake2", "blake3", "chrono", - "datafusion-common", + "datafusion-common 29.0.0", "datafusion-expr", "half", "hashbrown 0.14.0", @@ -842,14 +1082,14 @@ version = "29.0.0" dependencies = [ "async-trait", "datafusion", - "datafusion-common", + "datafusion-common 31.0.0", "datafusion-expr", "datafusion-optimizer", "datafusion-sql", "datafusion-substrait", "futures", "mimalloc", - "object_store", + "object_store 0.6.1", "parking_lot", "prost", "prost-types", @@ -868,12 +1108,12 @@ name = "datafusion-sql" version = "29.0.0" source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" dependencies = [ - "arrow", - "arrow-schema", - "datafusion-common", + "arrow 45.0.0", + "arrow-schema 45.0.0", + "datafusion-common 29.0.0", "datafusion-expr", "log", - "sqlparser", + "sqlparser 0.36.1", ] [[package]] @@ -885,7 +1125,7 @@ dependencies = [ "chrono", "datafusion", "itertools 0.11.0", - "object_store", + "object_store 0.6.1", "prost", "prost-types", "substrait", @@ -1783,6 +2023,27 @@ dependencies = [ "walkdir", ] +[[package]] +name = "object_store" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d359e231e5451f4f9fa889d56e3ce34f8724f1a61db2107739359717cf2bbf08" +dependencies = [ + "async-trait", + "bytes", + "chrono", + "futures", + "humantime", + "itertools 0.10.5", + "parking_lot", + "percent-encoding", + "snafu", + "tokio", + "tracing", + "url", + "walkdir", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -1828,13 +2089,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f9739b984380582bdb7749ae5b5d28839bce899212cf16465c1ac1f8b65d79" dependencies = [ "ahash", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-ipc", - "arrow-schema", - "arrow-select", + "arrow-array 45.0.0", + "arrow-buffer 45.0.0", + "arrow-cast 45.0.0", + "arrow-data 45.0.0", + "arrow-ipc 45.0.0", + "arrow-schema 45.0.0", + "arrow-select 45.0.0", + "base64", + "brotli", + "bytes", + "chrono", + "flate2", + "futures", + "hashbrown 0.14.0", + "lz4", + "num", + "num-bigint", + "object_store 0.6.1", + "paste", + "seq-macro", + "snap", + "thrift", + "tokio", + "twox-hash", + "zstd", +] + +[[package]] +name = "parquet" +version = "46.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad2cba786ae07da4d73371a88b9e0f9d3ffac1a9badc83922e0e15814f5c5fa" +dependencies = [ + "ahash", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-cast 46.0.0", + "arrow-data 46.0.0", + "arrow-ipc 46.0.0", + "arrow-schema 46.0.0", + "arrow-select 46.0.0", "base64", "brotli", "bytes", @@ -1845,7 +2140,7 @@ dependencies = [ "lz4", "num", "num-bigint", - "object_store", + "object_store 0.7.0", "paste", "seq-macro", "snap", @@ -2566,6 +2861,16 @@ dependencies = [ "sqlparser_derive", ] +[[package]] +name = "sqlparser" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ae05a8250b968a3f7db93155a84d68b2e6cea1583949af5ca5b5170c76c075" +dependencies = [ + "log", + "sqlparser_derive", +] + [[package]] name = "sqlparser_derive" version = "0.1.1" diff --git a/Cargo.toml b/Cargo.toml index 169d3f5d..6a5fbd9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync rand = "0.8" pyo3 = { version = "0.19", features = ["extension-module", "abi3", "abi3-py38"] } datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1", features = ["pyarrow", "avro"] } -datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1", features = ["pyarrow"] } +datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", rev = "31.0.0-rc1", features = ["pyarrow"] } datafusion-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1" } datafusion-optimizer = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1" } datafusion-sql = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1" }