diff --git a/Cargo.lock b/Cargo.lock index 9736d3a474..761bb79b6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,11 +118,16 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "arrow" -version = "22.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5936b4185aa57cb9790d8742aab22859045ce5cc6a3023796240cd101c19335" +checksum = "e24e2bcd431a4aa0ff003fdd2dc21c78cfb42f31459c89d2312c2746fe17a5ac" dependencies = [ "ahash 0.8.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "bitflags", "chrono", "comfy-table 6.1.0", @@ -137,10 +142,66 @@ dependencies = [ "num", "regex", "regex-syntax", - "serde", "serde_json", ] +[[package]] +name = "arrow-array" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9044300874385f19e77cbf90911e239bd23630d8f23bb0f948f9067998a13b7" +dependencies = [ + "ahash 0.8.0", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half 2.1.0", + "hashbrown 0.12.3", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78476cbe9e3f808dcecab86afe42d573863c63e149c62e6e379ed2522743e626" +dependencies = [ + "half 2.1.0", + "num", +] + +[[package]] +name = "arrow-data" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d916feee158c485dad4f701cba31bc9a90a8db87d9df8e2aa8adc0c20a2bbb9" +dependencies = [ + "arrow-buffer", + "arrow-schema", + "half 2.1.0", + "num", +] + +[[package]] +name = "arrow-schema" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9406eb7834ca6bd8350d1baa515d18b9fcec487eddacfb62f5e19511f7bd37" + +[[package]] +name = "arrow-select" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6593a01586751c74498495d2f5a01fcd438102b52965c11dd98abf4ebcacef37" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "num", +] + [[package]] name = "arrow2" version = "0.10.1" @@ -171,6 +232,21 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-compression" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "bzip2", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-lock" version = "2.5.0" @@ -521,6 +597,27 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +[[package]] +name = "bzip2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cache-padded" version = "1.2.0" @@ -975,14 +1072,16 @@ dependencies = [ [[package]] name = "datafusion" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aca80caa2b0f7fdf267799b8895ac8b6341ea879db6b1e2d361ec49b47bc676" +checksum = "e7a8411475928479fe57af18698626f0a44f3c29153e051dce45f7455c08a6d5" dependencies = [ "ahash 0.8.0", "arrow", + "async-compression", "async-trait", "bytes", + "bzip2", "chrono", "datafusion-common", "datafusion-expr", @@ -990,6 +1089,7 @@ dependencies = [ "datafusion-physical-expr", "datafusion-row", "datafusion-sql", + "flate2", "futures", "glob 0.3.0", "hashbrown 0.12.3", @@ -1002,48 +1102,51 @@ dependencies = [ "parking_lot 0.12.1", "parquet", "paste", + "percent-encoding", "pin-project-lite", "rand 0.8.5", "smallvec", - "sqlparser 0.23.0", + "sqlparser 0.26.0", "tempfile", "tokio", "tokio-stream", + "tokio-util 0.7.4", "url", - "uuid 1.1.2", + "uuid 1.2.1", ] [[package]] name = "datafusion-common" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7721fd550f6a28ad7235b62462aa51e9a43b08f8346d5cbe4d61f1e83f5df511" +checksum = "15f1ffcbc1f040c9ab99f41db1c743d95aff267bb2e7286aaa010738b7402251" dependencies = [ "arrow", + "chrono", "object_store", "ordered-float 3.1.0", "parquet", - "serde_json", - "sqlparser 0.23.0", + "sqlparser 0.26.0", ] [[package]] name = "datafusion-expr" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d81255d043dc594c0ded6240e8a9be6ce8d7c22777a5093357cdb97af3d29ce" +checksum = "1883d9590d303ef38fa295567e7fdb9f8f5f511fcc167412d232844678cd295c" dependencies = [ "ahash 0.8.0", "arrow", "datafusion-common", - "sqlparser 0.23.0", + "log", + "sqlparser 0.26.0", ] [[package]] name = "datafusion-optimizer" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b39f8c75163691fff72b4a71816ad5a912e7c6963ee55f29ed1910b5a6993f" +checksum = "2127d46d566ab3463d70da9675fc07b9d634be8d17e80d0e1ce79600709fe651" dependencies = [ "arrow", "async-trait", @@ -1057,34 +1160,40 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c4138220a109feafb63bf05418b86b17a42ece4bf047c38e4fd417572a9f7" +checksum = "0d108b6fe8eeb317ecad1d74619e8758de49cccc8c771b56c97962fd52eaae23" dependencies = [ "ahash 0.8.0", "arrow", + "arrow-buffer", + "arrow-schema", "blake2", "blake3", "chrono", "datafusion-common", "datafusion-expr", "datafusion-row", + "half 2.1.0", "hashbrown 0.12.3", + "itertools", "lazy_static", "md-5", + "num-traits", "ordered-float 3.1.0", "paste", "rand 0.8.5", "regex", "sha2 0.10.6", "unicode-segmentation", + "uuid 1.2.1", ] [[package]] name = "datafusion-row" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a178fc0fd7693d9c9f608f7b605823eb982c6731ede0cccd99e2319cacabbc" +checksum = "43537b6377d506e4788bf21e9ed943340e076b48ca4d077e6ea4405ca5e54a1c" dependencies = [ "arrow", "datafusion-common", @@ -1094,17 +1203,14 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148cb56e7635faff3b16019393c49b988188c3fdadd1ca90eadb322a80aa1128" +checksum = "244d08d4710e1088d9c0949c9b5b8d68d9cf2cde7203134a4cc389e870fe2354" dependencies = [ - "ahash 0.8.0", "arrow", "datafusion-common", "datafusion-expr", - "hashbrown 0.12.3", - "sqlparser 0.23.0", - "tokio", + "sqlparser 0.26.0", ] [[package]] @@ -1362,12 +1468,11 @@ dependencies = [ [[package]] name = "flatbuffers" -version = "2.1.2" +version = "22.9.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b428b715fdbdd1c364b84573b5fdc0f84f8e423661b9f398735278bc7f2b6a" +checksum = "8ce016b9901aef3579617931fbb2df8fc9a9f7cb95a16eb8acc8148209bb9e70" dependencies = [ "bitflags", - "smallvec", "thiserror", ] @@ -1680,6 +1785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554" dependencies = [ "crunchy", + "num-traits", ] [[package]] @@ -1908,9 +2014,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "1.1.7" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "io-enum" @@ -2139,6 +2245,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" + [[package]] name = "libsqlite3-sys" version = "0.22.2" @@ -2549,6 +2661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2778,9 +2891,9 @@ dependencies = [ [[package]] name = "parquet" -version = "22.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474c423be6f10921adab3b94b42ec7fe87c1b87e1360dee150976caee444224f" +checksum = "3bf8fa7ab6572791325a8595f55dc532dde88b996ae10a5ca8a2db746784ecc4" dependencies = [ "ahash 0.8.0", "arrow", @@ -2794,8 +2907,6 @@ dependencies = [ "lz4", "num", "num-bigint 0.4.3", - "parquet-format", - "rand 0.8.5", "seq-macro", "snap", "thrift", @@ -2803,15 +2914,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "parquet-format" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f0c06cdcd5460967c485f9c40a821746f5955ad81990533c7fae95dbd9bc0b5" -dependencies = [ - "thrift", -] - [[package]] name = "paste" version = "1.0.9" @@ -3837,9 +3939,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.23.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0beb13adabbdda01b63d595f38c8bfd19a361e697fd94ce0098a634077bc5b25" +checksum = "86be66ea0b2b22749cfa157d16e2e84bf793e626a3375f4d378dc289fa03affb" dependencies = [ "log", ] @@ -4100,26 +4202,15 @@ dependencies = [ "syn", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "thrift" -version = "0.13.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b" +checksum = "09678c4cdbb4eed72e18b7c2af1329c69825ed16fcbac62d083fc3e2b0590ff0" dependencies = [ "byteorder", "integer-encoding", - "log", "ordered-float 1.1.1", - "threadpool", ] [[package]] @@ -4506,9 +4597,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" dependencies = [ "getrandom 0.2.7", ] diff --git a/connectorx-cpp/Cargo.toml b/connectorx-cpp/Cargo.toml index 421d80cc35..221ed2bf84 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 = "22", features = ["prettyprint", "ffi"]} +arrow = {version = "26", features = ["prettyprint", "ffi"]} [lib] crate-type = ["cdylib"] diff --git a/connectorx-python/Cargo.lock b/connectorx-python/Cargo.lock index 8449e18674..fb3f01b995 100644 --- a/connectorx-python/Cargo.lock +++ b/connectorx-python/Cargo.lock @@ -118,11 +118,16 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "arrow" -version = "22.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5936b4185aa57cb9790d8742aab22859045ce5cc6a3023796240cd101c19335" +checksum = "e24e2bcd431a4aa0ff003fdd2dc21c78cfb42f31459c89d2312c2746fe17a5ac" dependencies = [ "ahash 0.8.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "bitflags", "chrono", "comfy-table 6.1.0", @@ -137,10 +142,66 @@ dependencies = [ "num", "regex", "regex-syntax", - "serde", "serde_json", ] +[[package]] +name = "arrow-array" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9044300874385f19e77cbf90911e239bd23630d8f23bb0f948f9067998a13b7" +dependencies = [ + "ahash 0.8.0", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half 2.1.0", + "hashbrown 0.12.3", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78476cbe9e3f808dcecab86afe42d573863c63e149c62e6e379ed2522743e626" +dependencies = [ + "half 2.1.0", + "num", +] + +[[package]] +name = "arrow-data" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d916feee158c485dad4f701cba31bc9a90a8db87d9df8e2aa8adc0c20a2bbb9" +dependencies = [ + "arrow-buffer", + "arrow-schema", + "half 2.1.0", + "num", +] + +[[package]] +name = "arrow-schema" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9406eb7834ca6bd8350d1baa515d18b9fcec487eddacfb62f5e19511f7bd37" + +[[package]] +name = "arrow-select" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6593a01586751c74498495d2f5a01fcd438102b52965c11dd98abf4ebcacef37" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "num", +] + [[package]] name = "arrow2" version = "0.10.1" @@ -171,6 +232,21 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-compression" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "bzip2", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-lock" version = "2.5.0" @@ -537,6 +613,27 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +[[package]] +name = "bzip2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cache-padded" version = "1.2.0" @@ -1053,14 +1150,16 @@ dependencies = [ [[package]] name = "datafusion" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aca80caa2b0f7fdf267799b8895ac8b6341ea879db6b1e2d361ec49b47bc676" +checksum = "e7a8411475928479fe57af18698626f0a44f3c29153e051dce45f7455c08a6d5" dependencies = [ "ahash 0.8.0", "arrow", + "async-compression", "async-trait", "bytes", + "bzip2", "chrono", "datafusion-common", "datafusion-expr", @@ -1068,6 +1167,7 @@ dependencies = [ "datafusion-physical-expr", "datafusion-row", "datafusion-sql", + "flate2", "futures", "glob 0.3.0", "hashbrown 0.12.3", @@ -1080,48 +1180,51 @@ dependencies = [ "parking_lot 0.12.1", "parquet", "paste 1.0.9", + "percent-encoding", "pin-project-lite", "rand 0.8.5", "smallvec", - "sqlparser 0.23.0", + "sqlparser 0.26.0", "tempfile", "tokio", "tokio-stream", + "tokio-util 0.7.4", "url", - "uuid 1.1.2", + "uuid 1.2.1", ] [[package]] name = "datafusion-common" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7721fd550f6a28ad7235b62462aa51e9a43b08f8346d5cbe4d61f1e83f5df511" +checksum = "15f1ffcbc1f040c9ab99f41db1c743d95aff267bb2e7286aaa010738b7402251" dependencies = [ "arrow", + "chrono", "object_store", "ordered-float 3.1.0", "parquet", - "serde_json", - "sqlparser 0.23.0", + "sqlparser 0.26.0", ] [[package]] name = "datafusion-expr" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d81255d043dc594c0ded6240e8a9be6ce8d7c22777a5093357cdb97af3d29ce" +checksum = "1883d9590d303ef38fa295567e7fdb9f8f5f511fcc167412d232844678cd295c" dependencies = [ "ahash 0.8.0", "arrow", "datafusion-common", - "sqlparser 0.23.0", + "log", + "sqlparser 0.26.0", ] [[package]] name = "datafusion-optimizer" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b39f8c75163691fff72b4a71816ad5a912e7c6963ee55f29ed1910b5a6993f" +checksum = "2127d46d566ab3463d70da9675fc07b9d634be8d17e80d0e1ce79600709fe651" dependencies = [ "arrow", "async-trait", @@ -1135,34 +1238,40 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c4138220a109feafb63bf05418b86b17a42ece4bf047c38e4fd417572a9f7" +checksum = "0d108b6fe8eeb317ecad1d74619e8758de49cccc8c771b56c97962fd52eaae23" dependencies = [ "ahash 0.8.0", "arrow", + "arrow-buffer", + "arrow-schema", "blake2", "blake3", "chrono", "datafusion-common", "datafusion-expr", "datafusion-row", + "half 2.1.0", "hashbrown 0.12.3", + "itertools", "lazy_static", "md-5", + "num-traits", "ordered-float 3.1.0", "paste 1.0.9", "rand 0.8.5", "regex", "sha2 0.10.6", "unicode-segmentation", + "uuid 1.2.1", ] [[package]] name = "datafusion-row" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a178fc0fd7693d9c9f608f7b605823eb982c6731ede0cccd99e2319cacabbc" +checksum = "43537b6377d506e4788bf21e9ed943340e076b48ca4d077e6ea4405ca5e54a1c" dependencies = [ "arrow", "datafusion-common", @@ -1172,17 +1281,14 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148cb56e7635faff3b16019393c49b988188c3fdadd1ca90eadb322a80aa1128" +checksum = "244d08d4710e1088d9c0949c9b5b8d68d9cf2cde7203134a4cc389e870fe2354" dependencies = [ - "ahash 0.8.0", "arrow", "datafusion-common", "datafusion-expr", - "hashbrown 0.12.3", - "sqlparser 0.23.0", - "tokio", + "sqlparser 0.26.0", ] [[package]] @@ -1457,12 +1563,11 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flatbuffers" -version = "2.1.2" +version = "22.9.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b428b715fdbdd1c364b84573b5fdc0f84f8e423661b9f398735278bc7f2b6a" +checksum = "8ce016b9901aef3579617931fbb2df8fc9a9f7cb95a16eb8acc8148209bb9e70" dependencies = [ "bitflags", - "smallvec", "thiserror", ] @@ -1775,6 +1880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554" dependencies = [ "crunchy", + "num-traits", ] [[package]] @@ -2026,9 +2132,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "1.1.7" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "io-enum" @@ -2257,6 +2363,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" + [[package]] name = "libsqlite3-sys" version = "0.22.2" @@ -2673,6 +2785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2926,9 +3039,9 @@ dependencies = [ [[package]] name = "parquet" -version = "22.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474c423be6f10921adab3b94b42ec7fe87c1b87e1360dee150976caee444224f" +checksum = "3bf8fa7ab6572791325a8595f55dc532dde88b996ae10a5ca8a2db746784ecc4" dependencies = [ "ahash 0.8.0", "arrow", @@ -2942,8 +3055,6 @@ dependencies = [ "lz4", "num", "num-bigint 0.4.3", - "parquet-format", - "rand 0.8.5", "seq-macro", "snap", "thrift", @@ -2951,15 +3062,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "parquet-format" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f0c06cdcd5460967c485f9c40a821746f5955ad81990533c7fae95dbd9bc0b5" -dependencies = [ - "thrift", -] - [[package]] name = "paste" version = "0.1.18" @@ -4142,9 +4244,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.23.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0beb13adabbdda01b63d595f38c8bfd19a361e697fd94ce0098a634077bc5b25" +checksum = "86be66ea0b2b22749cfa157d16e2e84bf793e626a3375f4d378dc289fa03affb" dependencies = [ "log", ] @@ -4405,26 +4507,15 @@ dependencies = [ "syn", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "thrift" -version = "0.13.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b" +checksum = "09678c4cdbb4eed72e18b7c2af1329c69825ed16fcbac62d083fc3e2b0590ff0" dependencies = [ "byteorder", "integer-encoding", - "log", "ordered-float 1.1.1", - "threadpool", ] [[package]] @@ -4826,9 +4917,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" dependencies = [ "getrandom 0.2.7", ] diff --git a/connectorx-python/Cargo.toml b/connectorx-python/Cargo.toml index 5a3ffee4c4..7f296ee9df 100644 --- a/connectorx-python/Cargo.toml +++ b/connectorx-python/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" [dependencies] anyhow = "1" -arrow = { version = "22", features = ["ffi"]} +arrow = { version = "26", 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 d46de7ef57..9a5ed398fe 100644 --- a/connectorx/Cargo.toml +++ b/connectorx/Cargo.toml @@ -20,7 +20,7 @@ thiserror = "1" url = "2" owning_ref = "0.4" -arrow = {version = "22", optional = true, features = ["prettyprint", "ffi"]} +arrow = {version = "26", 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} @@ -53,7 +53,7 @@ tokio = {version = "1", features = ["rt", "rt-multi-thread", "net"], optional = urlencoding = {version = "2.1", optional = true} uuid = {version = "0.8", optional = true} j4rs = {version = "0.13", optional = true} -datafusion = {version = "12", optional = true} +datafusion = {version = "14", optional = true} [lib] crate-type = ["cdylib", "rlib"] diff --git a/connectorx/src/source_router.rs b/connectorx/src/source_router.rs index 4f7f8f7e31..2d6b0e71a0 100644 --- a/connectorx/src/source_router.rs +++ b/connectorx/src/source_router.rs @@ -4,7 +4,7 @@ use anyhow::anyhow; use std::convert::TryFrom; use url::Url; -#[derive(Debug)] +#[derive(Debug, Clone)] pub enum SourceType { Postgres, SQLite, @@ -15,6 +15,7 @@ pub enum SourceType { DuckDB, } +#[derive(Debug, Clone)] pub struct SourceConn { pub ty: SourceType, pub conn: Url,