diff --git a/Cargo.lock b/Cargo.lock index 7e3ef7302..41ec9165e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,9 +115,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "arrow" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d18d72cd290f3f9e2149a714c8ac404b6c3fd614c684f0015449940fca899" +checksum = "2feeebd77b34b0bc88f224e06d01c27da4733997cc4789a4e056196656cdc59a" dependencies = [ "ahash 0.8.3", "arrow-arith", @@ -137,9 +137,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93bc0da4b22ba63807fa2a74998e21209179c93c67856ae65d9218b81f3ef918" +checksum = "7173f5dc49c0ecb5135f52565af33afd3fdc9a12d13bd6f9973e8b96305e4b2e" dependencies = [ "arrow-array", "arrow-buffer", @@ -152,9 +152,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9a0fd21121304cad96f307c938d861cb1e7f0c151b93047462cd9817d760fb" +checksum = "63d7ea725f7d1f8bb2cffc53ef538557e95fc802e217d5be25122d402e22f3d0" dependencies = [ "ahash 0.8.3", "arrow-buffer", @@ -169,9 +169,9 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ce342ecf5971004e23cef8b5fb3bacd2bbc48a381464144925074e1472e9eb" +checksum = "bdbe439e077f484e5000b9e1d47b5e4c0d15f2b311a8f5bcc682553d5d67a722" dependencies = [ "half 2.3.1", "num", @@ -179,9 +179,9 @@ dependencies = [ [[package]] name = "arrow-cast" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b94a0ce7d27abbb02e2ee4db770f593127610f57b32625b0bc6a1a90d65f085" +checksum = "93913cc14875770aa1eef5e310765e855effa352c094cb1c7c00607d0f37b4e1" dependencies = [ "arrow-array", "arrow-buffer", @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "arrow-csv" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3be10a00a43c4bf0d243c070754ebdde17c5d576b4928d9c3efbe3005a3853" +checksum = "ef55b67c55ed877e6fe7b923121c19dae5e31ca70249ea2779a17b58fb0fbd9a" dependencies = [ "arrow-array", "arrow-buffer", @@ -216,9 +216,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9a83dad6a53d6907765106d3bc61d6d9d313cfe1751701b3ef0948e7283dc2" +checksum = "d4f4f4a3c54614126a71ab91f6631c9743eb4643d6e9318b74191da9dc6e028b" dependencies = [ "arrow-buffer", "arrow-schema", @@ -228,9 +228,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a46da5e438a854e0386b38774da88a98782c0973c6dbc5c949ca4e02faf9b016" +checksum = "d41a3659f984a524ef1c2981d43747b24d8eec78e2425267fcd0ef34ce71cd18" dependencies = [ "arrow-array", "arrow-buffer", @@ -242,9 +242,9 @@ dependencies = [ [[package]] name = "arrow-json" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f27a1fbc76553ad92dc1a9583e56b7058d8c418c4089b0b689f5b87e2da5e1" +checksum = "10b95faa95a378f56ef32d84cc0104ea998c39ef7cd1faaa6b4cebf8ea92846d" dependencies = [ "arrow-array", "arrow-buffer", @@ -253,7 +253,7 @@ dependencies = [ "arrow-schema", "chrono", "half 2.3.1", - "indexmap", + "indexmap 2.0.0", "lexical-core", "num", "serde", @@ -262,9 +262,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2373661f6c2233e18f6fa69c40999a9440231d1e8899be8bbbe73c7e24aa3b4" +checksum = "c68549a4284d9f8b39586afb8d5ff8158b8f0286353a4844deb1d11cf1ba1f26" dependencies = [ "arrow-array", "arrow-buffer", @@ -277,9 +277,9 @@ dependencies = [ [[package]] name = "arrow-row" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377cd5158b7de4034a175e296726c40c3236e65d71d90a5dab2fb4fab526a8f4" +checksum = "0a75a4a757afc301ce010adadff54d79d66140c4282ed3de565f6ccb716a5cf3" dependencies = [ "ahash 0.8.3", "arrow-array", @@ -292,18 +292,18 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba9ed245bd2d7d97ad1457cb281d4296e8b593588758b8fec6d67b2b2b0f2265" +checksum = "2bebcb57eef570b15afbcf2d07d813eb476fde9f6dd69c81004d6476c197e87e" dependencies = [ "bitflags 2.3.3", ] [[package]] name = "arrow-select" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc9bd6aebc565b1d04bae64a0f4dda3abc677190eb7d960471b1b20e1cebed0" +checksum = "f6e2943fa433a48921e914417173816af64eef61c0a3d448280e6c40a62df221" dependencies = [ "arrow-array", "arrow-buffer", @@ -314,15 +314,16 @@ dependencies = [ [[package]] name = "arrow-string" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cf2baea2ef53787332050decf7d71aca836a352e188c8ad062892405955d2b" +checksum = "bbc92ed638851774f6d7af1ad900b92bc1486746497511868b4298fcbcfa35af" dependencies = [ "arrow-array", "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", + "num", "regex", "regex-syntax", ] @@ -1309,9 +1310,8 @@ dependencies = [ [[package]] name = "datafusion" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96f6e4eb10bd3e6b709686858246466983e8c5354a928ff77ee34919aa60d00" +version = "28.0.0" +source = "git+https://github.com/apache/arrow-datafusion?rev=51b4392577554becf637a8adcefa0e7fdc79e41f#51b4392577554becf637a8adcefa0e7fdc79e41f" dependencies = [ "ahash 0.8.3", "arrow", @@ -1328,13 +1328,13 @@ dependencies = [ "datafusion-expr", "datafusion-optimizer", "datafusion-physical-expr", - "datafusion-row", "datafusion-sql", "flate2", "futures", "glob", + "half 2.3.1", "hashbrown 0.14.0", - "indexmap", + "indexmap 2.0.0", "itertools 0.11.0", "lazy_static", "log", @@ -1358,9 +1358,8 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e5fddcc0dd49bbe199e43aa406f39c46c790bb2a43c7b36a478e5f3f971235" +version = "28.0.0" +source = "git+https://github.com/apache/arrow-datafusion?rev=51b4392577554becf637a8adcefa0e7fdc79e41f#51b4392577554becf637a8adcefa0e7fdc79e41f" dependencies = [ "arrow", "arrow-array", @@ -1373,9 +1372,8 @@ dependencies = [ [[package]] name = "datafusion-execution" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd50b6cb17acc78d2473c0d28014b8fd4e2e0a2c067c07645d6547b33b0aeeb" +version = "28.0.0" +source = "git+https://github.com/apache/arrow-datafusion?rev=51b4392577554becf637a8adcefa0e7fdc79e41f#51b4392577554becf637a8adcefa0e7fdc79e41f" dependencies = [ "dashmap", "datafusion-common", @@ -1391,9 +1389,8 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1a35dc2cd9eac18063d636f7ddf4f090fe1f34284d80192ac7ade38cc3c6991" +version = "28.0.0" +source = "git+https://github.com/apache/arrow-datafusion?rev=51b4392577554becf637a8adcefa0e7fdc79e41f#51b4392577554becf637a8adcefa0e7fdc79e41f" dependencies = [ "ahash 0.8.3", "arrow", @@ -1406,9 +1403,8 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5043afeb45ec1c0f45519e1eed6a477f2d30732e8f975d9cf9a75fba0ca716" +version = "28.0.0" +source = "git+https://github.com/apache/arrow-datafusion?rev=51b4392577554becf637a8adcefa0e7fdc79e41f#51b4392577554becf637a8adcefa0e7fdc79e41f" dependencies = [ "arrow", "async-trait", @@ -1424,27 +1420,28 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cc892a24f4b829ee7718ad3950884c0346dbdf1517f3df153af4bcf54d8ca4d" +version = "28.0.0" +source = "git+https://github.com/apache/arrow-datafusion?rev=51b4392577554becf637a8adcefa0e7fdc79e41f#51b4392577554becf637a8adcefa0e7fdc79e41f" dependencies = [ "ahash 0.8.3", "arrow", "arrow-array", "arrow-buffer", "arrow-schema", + "base64 0.21.2", "blake2", "blake3", "chrono", "datafusion-common", "datafusion-expr", - "datafusion-row", "half 2.3.1", "hashbrown 0.14.0", - "indexmap", + "hex", + "indexmap 2.0.0", "itertools 0.11.0", "lazy_static", "libc", + "log", "md-5", "paste", "petgraph", @@ -1455,23 +1452,10 @@ dependencies = [ "uuid 1.4.1", ] -[[package]] -name = "datafusion-row" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce75c660bbddfdd254109e668e5b5bd69df31ea26e3768e15cef0c68015e650e" -dependencies = [ - "arrow", - "datafusion-common", - "paste", - "rand 0.8.5", -] - [[package]] name = "datafusion-sql" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49cab87e4933a452e0b7b3f0cbd0e760daf7d33fb54d09d70d3ffba229eaa652" +version = "28.0.0" +source = "git+https://github.com/apache/arrow-datafusion?rev=51b4392577554becf637a8adcefa0e7fdc79e41f#51b4392577554becf637a8adcefa0e7fdc79e41f" dependencies = [ "arrow", "arrow-schema", @@ -1668,6 +1652,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -2023,7 +2013,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util 0.7.8", @@ -2053,15 +2043,6 @@ version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.6", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -2093,11 +2074,11 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.7.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" dependencies = [ - "hashbrown 0.11.2", + "hashbrown 0.14.0", ] [[package]] @@ -2293,6 +2274,16 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "inferno" version = "0.10.12" @@ -2301,7 +2292,7 @@ checksum = "de3886428c6400486522cf44b8626e7b94ad794c14390290f2a274dcf728a58f" dependencies = [ "ahash 0.7.6", "atty", - "indexmap", + "indexmap 1.9.3", "itoa", "lazy_static", "log", @@ -2572,9 +2563,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libsqlite3-sys" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "cc", "pkg-config", @@ -3193,9 +3184,9 @@ dependencies = [ [[package]] name = "parquet" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baab9c36b1c8300b81b4d577d306a0a733f9d34021363098d3548e37757ed6c8" +checksum = "ec7267a9607c3f955d4d0ac41b88a67cecc0d8d009173ad3da390699a6cb3750" dependencies = [ "ahash 0.8.3", "arrow-array", @@ -3268,7 +3259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -3391,7 +3382,7 @@ dependencies = [ "chrono", "comfy-table 5.0.1", "hashbrown 0.12.3", - "indexmap", + "indexmap 1.9.3", "lazy_static", "num", "num_cpus", @@ -3671,12 +3662,13 @@ dependencies = [ [[package]] name = "r2d2_sqlite" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fdc8e4da70586127893be32b7adf21326a4c6b1aba907611edf467d13ffe895" +checksum = "99f31323d6161385f385046738df520e0e8694fa74852d35891fc0be08348ddc" dependencies = [ "r2d2", "rusqlite", + "uuid 1.4.1", ] [[package]] @@ -3944,17 +3936,16 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "chrono", "fallible-iterator", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", - "memchr", "smallvec", ] @@ -5043,6 +5034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.10", + "rand 0.8.5", ] [[package]] diff --git a/connectorx-cpp/Cargo.toml b/connectorx-cpp/Cargo.toml index a6b51ec07..e240ed67c 100644 --- a/connectorx-cpp/Cargo.toml +++ b/connectorx-cpp/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" [dependencies] libc = "0.2" connectorx = {path = "../connectorx", default-features = false} -arrow = {version = "42", features = ["prettyprint", "ffi"]} +arrow = {version = "43", features = ["prettyprint", "ffi"]} [lib] crate-type = ["cdylib"] diff --git a/connectorx-python/Cargo.toml b/connectorx-python/Cargo.toml index 615387e37..c17a63550 100644 --- a/connectorx-python/Cargo.toml +++ b/connectorx-python/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" [dependencies] anyhow = "1" -arrow = { version = "42", features = ["ffi"]} +arrow = { version = "43", features = ["ffi"]} arrow2 = {version = "0.10", default-features = false} bitfield = "0.13" bytes = "1" diff --git a/connectorx/Cargo.toml b/connectorx/Cargo.toml index 631893c6d..28f18dd91 100644 --- a/connectorx/Cargo.toml +++ b/connectorx/Cargo.toml @@ -22,7 +22,7 @@ owning_ref = "0.4" serde_json = "1" chrono = "0.4" -arrow = {version = "42", optional = true, features = ["prettyprint", "ffi"]} +arrow = {version = "43", optional = true, features = ["prettyprint", "ffi"]} arrow2 = {version = "0.10", default-features = false, optional = true} bb8 = {version = "0.7", optional = true} bb8-tiberius = {version = "0.5", optional = true} @@ -45,9 +45,9 @@ r2d2 = {version = "0.8", optional = true} r2d2-oracle = {version = "0.5.0", features = ["chrono"], optional = true} r2d2_mysql = {version = "23", optional = true} r2d2_postgres = {version = "0.18.1", optional = true} -r2d2_sqlite = {version = "0.20.0", optional = true} +r2d2_sqlite = {version = "0.22.0", optional = true} regex = {version = "1", optional = true} -rusqlite = {version = "0.27.0", features = ["column_decltype", "chrono", "bundled"], optional = true} +rusqlite = {version = "0.29.0", features = ["column_decltype", "chrono", "bundled"], optional = true} rust_decimal = {version = "1", features = ["db-postgres"], optional = true} rust_decimal_macros = {version = "1", optional = true} tiberius = {version = "0.5", features = ["rust_decimal", "chrono", "integrated-auth-gssapi"], optional = true} @@ -56,7 +56,7 @@ tokio-util = {version = "0.6", optional = true} urlencoding = {version = "2.1", optional = true} uuid = {version = "0.8", optional = true} j4rs = {version = "0.13", optional = true} -datafusion = {version = "27", optional = true} +datafusion = {git = "https://github.com/apache/arrow-datafusion", rev = "51b4392577554becf637a8adcefa0e7fdc79e41f", optional = true} [lib] crate-type = ["cdylib", "rlib"]