From fa0fc7bcd1cc23c6824cbc81184d6b6457349aa3 Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Wed, 29 Nov 2023 20:40:54 +0000 Subject: [PATCH] bump arrow to 49 to match polars --- Cargo.lock | 390 +++++++++++++++++++++++++++++++++++++++++------------ Cargo.toml | 2 +- 2 files changed, 306 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45ea8c88c..6feacbf64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,19 +135,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04a8801ebb147ad240b2d978d3ab9f73c9ccd4557ba6a03e7800496770ed10e0" dependencies = [ "ahash 0.8.3", - "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 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", +] + +[[package]] +name = "arrow" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc25126d18a012146a888a0298f2c22e1150327bd2765fc76d710a556b2d614" +dependencies = [ + "ahash 0.8.3", + "arrow-arith 49.0.0", + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-cast 49.0.0", + "arrow-csv 49.0.0", + "arrow-data 49.0.0", + "arrow-ipc 49.0.0", + "arrow-json 49.0.0", + "arrow-ord 49.0.0", + "arrow-row 49.0.0", + "arrow-schema 49.0.0", + "arrow-select 49.0.0", + "arrow-string 49.0.0", ] [[package]] @@ -156,10 +178,25 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "895263144bd4a69751cbe6a34a53f26626e19770b313a9fa792c415cd0e78f11" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "chrono", + "half 2.3.1", + "num", +] + +[[package]] +name = "arrow-arith" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34ccd45e217ffa6e53bbb0080990e77113bdd4e91ddb84e97b77649810bcf1a7" +dependencies = [ + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", "chrono", "half 2.3.1", "num", @@ -172,9 +209,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "226fdc6c3a4ae154a74c24091d36a90b514f0ed7112f5b8322c1d8f354d8e20d" dependencies = [ "ahash 0.8.3", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", "chrono", "chrono-tz", "half 2.3.1", @@ -182,6 +219,22 @@ dependencies = [ "num", ] +[[package]] +name = "arrow-array" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bda9acea48b25123c08340f3a8ac361aa0f74469bb36f5ee9acf923fce23e9d" +dependencies = [ + "ahash 0.8.3", + "arrow-buffer 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", + "chrono", + "half 2.3.1", + "hashbrown 0.14.0", + "num", +] + [[package]] name = "arrow-buffer" version = "46.0.0" @@ -193,17 +246,47 @@ dependencies = [ "num", ] +[[package]] +name = "arrow-buffer" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a0fc21915b00fc6c2667b069c1b64bdd920982f426079bc4a7cab86822886c" +dependencies = [ + "bytes", + "half 2.3.1", + "num", +] + [[package]] name = "arrow-cast" version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35e8b9990733a9b635f656efda3c9b8308c7a19695c9ec2c7046dd154f9b144b" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "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 2.3.1", + "lexical-core", + "num", +] + +[[package]] +name = "arrow-cast" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dc0368ed618d509636c1e3cc20db1281148190a78f43519487b2daf07b63b4a" +dependencies = [ + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", + "arrow-select 49.0.0", + "base64 0.21.4", "chrono", "comfy-table", "half 2.3.1", @@ -217,11 +300,30 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "646fbb4e11dd0afb8083e883f53117713b8caadb4413b3c9e63e3f535da3683c" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "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", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-csv" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e09aa6246a1d6459b3f14baeaa49606cfdbca34435c46320e14054d244987ca" +dependencies = [ + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-cast 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", "chrono", "csv", "csv-core", @@ -236,8 +338,20 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da900f31ff01a0a84da0572209be72b2b6f980f3ea58803635de47913191c188" dependencies = [ - "arrow-buffer", - "arrow-schema", + "arrow-buffer 46.0.0", + "arrow-schema 46.0.0", + "half 2.3.1", + "num", +] + +[[package]] +name = "arrow-data" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907fafe280a3874474678c1858b9ca4cb7fd83fb8034ff5b6d6376205a08c634" +dependencies = [ + "arrow-buffer 49.0.0", + "arrow-schema 49.0.0", "half 2.3.1", "num", ] @@ -258,11 +372,25 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2707a8d7ee2d345d045283ece3ae43416175873483e5d96319c929da542a0b1f" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "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", +] + +[[package]] +name = "arrow-ipc" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79a43d6808411886b8c7d4f6f7dd477029c1e77ffffffb7923555cc6579639cd" +dependencies = [ + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-cast 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", "flatbuffers", ] @@ -272,11 +400,31 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d1b91a63c356d14eedc778b76d66a88f35ac8498426bb0799a769a49a74a8b4" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "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 2.3.1", + "indexmap 2.0.0", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-json" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82565c91fd627922ebfe2810ee4e8346841b6f9361b87505a9acea38b614fee" +dependencies = [ + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-cast 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", "chrono", "half 2.3.1", "indexmap 2.0.0", @@ -292,11 +440,26 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "584325c91293abbca7aaaabf8da9fe303245d641f5f4a18a6058dc68009c7ebf" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "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 2.3.1", + "num", +] + +[[package]] +name = "arrow-ord" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b23b0e53c0db57c6749997fd343d4c0354c994be7eca67152dd2bdb9a3e1bb4" +dependencies = [ + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", + "arrow-select 49.0.0", "half 2.3.1", "num", ] @@ -308,10 +471,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e32afc1329f7b372463b21c6ca502b07cf237e1ed420d87706c1770bb0ebd38" dependencies = [ "ahash 0.8.3", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "half 2.3.1", + "hashbrown 0.14.0", +] + +[[package]] +name = "arrow-row" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "361249898d2d6d4a6eeb7484be6ac74977e48da12a4dd81a708d620cc558117a" +dependencies = [ + "ahash 0.8.3", + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", "half 2.3.1", "hashbrown 0.14.0", ] @@ -321,6 +499,12 @@ name = "arrow-schema" version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b104f5daa730f00fde22adc03a12aa5a2ae9ccbbf99cbd53d284119ddc90e03d" + +[[package]] +name = "arrow-schema" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09e28a5e781bf1b0f981333684ad13f5901f4cd2f20589eab7cf1797da8fc167" dependencies = [ "bitflags 2.4.0", ] @@ -331,10 +515,24 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b3ca55356d1eae07cf48808d8c462cea674393ae6ad1e0b120f40b422eb2b4" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "num", +] + +[[package]] +name = "arrow-select" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6208466590960efc1d2a7172bc4ff18a67d6e25c529381d7f96ddaf0dc4036" +dependencies = [ + "ahash 0.8.3", + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", "num", ] @@ -344,16 +542,32 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1433ce02590cae68da0a18ed3a3ed868ffac2c6f24c533ddd2067f7ee04b4a" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "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 0.7.5", ] +[[package]] +name = "arrow-string" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a48149c63c11c9ff571e50ab8f017d2a7cb71037a882b42f6354ed2da9acc7" +dependencies = [ + "arrow-array 49.0.0", + "arrow-buffer 49.0.0", + "arrow-data 49.0.0", + "arrow-schema 49.0.0", + "arrow-select 49.0.0", + "num", + "regex", + "regex-syntax 0.8.2", +] + [[package]] name = "arrow2" version = "0.17.4" @@ -883,9 +1097,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -989,7 +1203,7 @@ name = "connectorx" version = "0.3.3-alpha.1" dependencies = [ "anyhow", - "arrow", + "arrow 49.0.0", "arrow2", "bb8", "bb8-tiberius", @@ -1044,7 +1258,7 @@ dependencies = [ name = "connectorx-cpp" version = "0.3.3-alpha.1" dependencies = [ - "arrow", + "arrow 49.0.0", "connectorx", "libc", "openssl", @@ -1341,9 +1555,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a4e4fc25698a14c90b34dda647ba10a5a966dc04b036d22e77fb1048663375d" dependencies = [ "ahash 0.8.3", - "arrow", - "arrow-array", - "arrow-schema", + "arrow 46.0.0", + "arrow-array 46.0.0", + "arrow-schema 46.0.0", "async-compression", "async-trait", "bytes", @@ -1387,8 +1601,8 @@ version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c23ad0229ea4a85bf76b236d8e75edf539881fdb02ce4e2394f9a76de6055206" dependencies = [ - "arrow", - "arrow-array", + "arrow 46.0.0", + "arrow-array 46.0.0", "async-compression", "bytes", "bzip2", @@ -1411,7 +1625,7 @@ version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b37d2fc1a213baf34e0a57c85b8e6648f1a95152798fd6738163ee96c19203f" dependencies = [ - "arrow", + "arrow 46.0.0", "dashmap", "datafusion-common", "datafusion-expr", @@ -1432,7 +1646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6ea9844395f537730a145e5d87f61fecd37c2bc9d54e1dc89b35590d867345d" dependencies = [ "ahash 0.8.3", - "arrow", + "arrow 46.0.0", "datafusion-common", "sqlparser 0.37.0", "strum 0.25.0", @@ -1445,7 +1659,7 @@ version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8a30e0f79c5d59ba14d3d70f2500e87e0ff70236ad5e47f9444428f054fd2be" dependencies = [ - "arrow", + "arrow 46.0.0", "async-trait", "chrono", "datafusion-common", @@ -1464,10 +1678,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "766c567082c9bbdcb784feec8fe40c7049cedaeb3a18d54f563f75fe0dc1932c" dependencies = [ "ahash 0.8.3", - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-schema", + "arrow 46.0.0", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-schema 46.0.0", "base64 0.21.4", "blake2", "blake3", @@ -1497,8 +1711,8 @@ version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "811fd084cf2d78aa0c76b74320977c7084ad0383690612528b580795764b4dd0" dependencies = [ - "arrow", - "arrow-schema", + "arrow 46.0.0", + "arrow-schema 46.0.0", "datafusion-common", "datafusion-expr", "log", @@ -3281,13 +3495,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad2cba786ae07da4d73371a88b9e0f9d3ffac1a9badc83922e0e15814f5c5fa" dependencies = [ "ahash 0.8.3", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-ipc", - "arrow-schema", - "arrow-select", + "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 0.21.4", "brotli", "bytes", @@ -4092,6 +4306,12 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + [[package]] name = "rend" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index 0bbd4998c..a25cd44f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,5 +8,5 @@ debug = true lto = true [workspace.dependencies] -arrow = {version = "46", features = ["prettyprint", "ffi"]} +arrow = {version = "49", features = ["prettyprint", "ffi"]} arrow2 = {version = "0.17", default-features = false}