diff --git a/Cargo.lock b/Cargo.lock index c377711..3374335 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -451,7 +451,6 @@ dependencies = [ "arrow-data 47.0.0", "arrow-schema 47.0.0", "chrono", - "chrono-tz", "half", "hashbrown 0.14.2", "num", @@ -508,7 +507,6 @@ dependencies = [ "arrow-schema 47.0.0", "arrow-select 47.0.0", "chrono", - "comfy-table", "half", "lexical-core", "num", @@ -1457,7 +1455,7 @@ dependencies = [ "async-trait", "bytes", "chrono", - "datafusion 32.0.0", + "datafusion", "futures", "serde", "serde_json", @@ -1468,54 +1466,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "datafusion" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7014432223f4d721cb9786cd88bb89e7464e0ba984d4a7f49db7787f5f268674" -dependencies = [ - "ahash", - "arrow 47.0.0", - "arrow-array 47.0.0", - "arrow-schema 47.0.0", - "async-compression", - "async-trait", - "bytes", - "bzip2", - "chrono", - "dashmap", - "datafusion-common 32.0.0", - "datafusion-execution 32.0.0", - "datafusion-expr 32.0.0", - "datafusion-optimizer 32.0.0", - "datafusion-physical-expr 32.0.0", - "datafusion-physical-plan 32.0.0", - "datafusion-sql 32.0.0", - "flate2", - "futures", - "glob", - "half", - "hashbrown 0.14.2", - "indexmap 2.2.3", - "itertools 0.11.0", - "log", - "num_cpus", - "object_store 0.7.1", - "parking_lot", - "parquet 47.0.0", - "percent-encoding", - "pin-project-lite", - "rand", - "sqlparser 0.38.0", - "tempfile", - "tokio", - "tokio-util", - "url", - "uuid", - "xz2", - "zstd 0.12.4", -] - [[package]] name = "datafusion" version = "37.0.0" @@ -1533,16 +1483,16 @@ dependencies = [ "bzip2", "chrono", "dashmap", - "datafusion-common 37.0.0", + "datafusion-common", "datafusion-common-runtime", - "datafusion-execution 37.0.0", - "datafusion-expr 37.0.0", + "datafusion-execution", + "datafusion-expr", "datafusion-functions", "datafusion-functions-array", - "datafusion-optimizer 37.0.0", - "datafusion-physical-expr 37.0.0", - "datafusion-physical-plan 37.0.0", - "datafusion-sql 37.0.0", + "datafusion-optimizer", + "datafusion-physical-expr", + "datafusion-physical-plan", + "datafusion-sql", "flate2", "futures", "glob", @@ -1554,10 +1504,10 @@ dependencies = [ "num_cpus", "object_store 0.9.1", "parking_lot", - "parquet 51.0.0", + "parquet", "pin-project-lite", "rand", - "sqlparser 0.44.0", + "sqlparser", "tempfile", "tokio", "tokio-util", @@ -1567,25 +1517,6 @@ dependencies = [ "zstd 0.13.0", ] -[[package]] -name = "datafusion-common" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3903ed8f102892f17b48efa437f3542159241d41c564f0d1e78efdc5e663aa" -dependencies = [ - "ahash", - "arrow 47.0.0", - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-schema 47.0.0", - "chrono", - "half", - "num_cpus", - "object_store 0.7.1", - "parquet 47.0.0", - "sqlparser 0.38.0", -] - [[package]] name = "datafusion-common" version = "37.0.0" @@ -1603,8 +1534,8 @@ dependencies = [ "libc", "num_cpus", "object_store 0.9.1", - "parquet 51.0.0", - "sqlparser 0.44.0", + "parquet", + "sqlparser", ] [[package]] @@ -1616,27 +1547,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "datafusion-execution" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780b73b2407050e53f51a9781868593f694102c59e622de9a8aafc0343c4f237" -dependencies = [ - "arrow 47.0.0", - "chrono", - "dashmap", - "datafusion-common 32.0.0", - "datafusion-expr 32.0.0", - "futures", - "hashbrown 0.14.2", - "log", - "object_store 0.7.1", - "parking_lot", - "rand", - "tempfile", - "url", -] - [[package]] name = "datafusion-execution" version = "37.0.0" @@ -1646,8 +1556,8 @@ dependencies = [ "arrow 51.0.0", "chrono", "dashmap", - "datafusion-common 37.0.0", - "datafusion-expr 37.0.0", + "datafusion-common", + "datafusion-expr", "futures", "hashbrown 0.14.2", "log", @@ -1658,21 +1568,6 @@ dependencies = [ "url", ] -[[package]] -name = "datafusion-expr" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c382676338d8caba6c027ba0da47260f65ffedab38fda78f6d8043f607557c" -dependencies = [ - "ahash", - "arrow 47.0.0", - "arrow-array 47.0.0", - "datafusion-common 32.0.0", - "sqlparser 0.38.0", - "strum 0.25.0", - "strum_macros 0.25.3", -] - [[package]] name = "datafusion-expr" version = "37.0.0" @@ -1683,9 +1578,9 @@ dependencies = [ "arrow 51.0.0", "arrow-array 51.0.0", "chrono", - "datafusion-common 37.0.0", + "datafusion-common", "paste", - "sqlparser 0.44.0", + "sqlparser", "strum 0.26.2", "strum_macros 0.26.2", ] @@ -1701,10 +1596,10 @@ dependencies = [ "blake2", "blake3", "chrono", - "datafusion-common 37.0.0", - "datafusion-execution 37.0.0", - "datafusion-expr 37.0.0", - "datafusion-physical-expr 37.0.0", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "hex", "itertools 0.12.1", "log", @@ -1726,33 +1621,15 @@ dependencies = [ "arrow-buffer 51.0.0", "arrow-ord 51.0.0", "arrow-schema 51.0.0", - "datafusion-common 37.0.0", - "datafusion-execution 37.0.0", - "datafusion-expr 37.0.0", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", "datafusion-functions", "itertools 0.12.1", "log", "paste", ] -[[package]] -name = "datafusion-optimizer" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2904a432f795484fd45e29ded4537152adb60f636c05691db34fcd94c92c96" -dependencies = [ - "arrow 47.0.0", - "async-trait", - "chrono", - "datafusion-common 32.0.0", - "datafusion-expr 32.0.0", - "datafusion-physical-expr 32.0.0", - "hashbrown 0.14.2", - "itertools 0.11.0", - "log", - "regex-syntax 0.7.5", -] - [[package]] name = "datafusion-optimizer" version = "37.0.0" @@ -1762,49 +1639,15 @@ dependencies = [ "arrow 51.0.0", "async-trait", "chrono", - "datafusion-common 37.0.0", - "datafusion-expr 37.0.0", - "datafusion-physical-expr 37.0.0", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", "hashbrown 0.14.2", "itertools 0.12.1", "log", "regex-syntax 0.8.2", ] -[[package]] -name = "datafusion-physical-expr" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b4968e9a998dc0476c4db7a82f280e2026b25f464e4aa0c3bb9807ee63ddfd" -dependencies = [ - "ahash", - "arrow 47.0.0", - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-schema 47.0.0", - "base64 0.21.5", - "blake2", - "blake3", - "chrono", - "datafusion-common 32.0.0", - "datafusion-expr 32.0.0", - "half", - "hashbrown 0.14.2", - "hex", - "indexmap 2.2.3", - "itertools 0.11.0", - "libc", - "log", - "md-5", - "paste", - "petgraph", - "rand", - "regex", - "sha2", - "unicode-segmentation", - "uuid", -] - [[package]] name = "datafusion-physical-expr" version = "37.0.0" @@ -1822,9 +1665,9 @@ dependencies = [ "blake2", "blake3", "chrono", - "datafusion-common 37.0.0", - "datafusion-execution 37.0.0", - "datafusion-expr 37.0.0", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", "half", "hashbrown 0.14.2", "hex", @@ -1840,37 +1683,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "datafusion-physical-plan" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd0d1fe54e37a47a2d58a1232c22786f2c28ad35805fdcd08f0253a8b0aaa90" -dependencies = [ - "ahash", - "arrow 47.0.0", - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-schema 47.0.0", - "async-trait", - "chrono", - "datafusion-common 32.0.0", - "datafusion-execution 32.0.0", - "datafusion-expr 32.0.0", - "datafusion-physical-expr 32.0.0", - "futures", - "half", - "hashbrown 0.14.2", - "indexmap 2.2.3", - "itertools 0.11.0", - "log", - "once_cell", - "parking_lot", - "pin-project-lite", - "rand", - "tokio", - "uuid", -] - [[package]] name = "datafusion-physical-plan" version = "37.0.0" @@ -1884,11 +1696,11 @@ dependencies = [ "arrow-schema 51.0.0", "async-trait", "chrono", - "datafusion-common 37.0.0", + "datafusion-common", "datafusion-common-runtime", - "datafusion-execution 37.0.0", - "datafusion-expr 37.0.0", - "datafusion-physical-expr 37.0.0", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "futures", "half", "hashbrown 0.14.2", @@ -1902,20 +1714,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "datafusion-sql" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b568d44c87ead99604d704f942e257c8a236ee1bbf890ee3e034ad659dcb2c21" -dependencies = [ - "arrow 47.0.0", - "arrow-schema 47.0.0", - "datafusion-common 32.0.0", - "datafusion-expr 32.0.0", - "log", - "sqlparser 0.38.0", -] - [[package]] name = "datafusion-sql" version = "37.0.0" @@ -1925,10 +1723,10 @@ dependencies = [ "arrow 51.0.0", "arrow-array 51.0.0", "arrow-schema 51.0.0", - "datafusion-common 37.0.0", - "datafusion-expr 37.0.0", + "datafusion-common", + "datafusion-expr", "log", - "sqlparser 0.44.0", + "sqlparser", "strum 0.26.2", ] @@ -2187,7 +1985,7 @@ dependencies = [ "arrow-flight 51.0.0", "arrow-schema 51.0.0", "async-trait", - "datafusion 37.0.0", + "datafusion", "diesel-async", "futures", "mesh", @@ -2778,26 +2576,6 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "lz4" -version = "1.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "lz4_flex" version = "0.11.2" @@ -2853,7 +2631,7 @@ dependencies = [ "async-channel", "async-trait", "bytes", - "datafusion 37.0.0", + "datafusion", "diesel", "diesel-async", "diesel-derive-enum", @@ -3168,40 +2946,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "parquet" -version = "47.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0463cc3b256d5f50408c49a4be3a16674f4c8ceef60941709620a062b1f6bf4d" -dependencies = [ - "ahash", - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-cast 47.0.0", - "arrow-data 47.0.0", - "arrow-ipc 47.0.0", - "arrow-schema 47.0.0", - "arrow-select 47.0.0", - "base64 0.21.5", - "brotli", - "bytes", - "chrono", - "flate2", - "futures", - "hashbrown 0.14.2", - "lz4", - "num", - "num-bigint", - "object_store 0.7.1", - "paste", - "seq-macro", - "snap", - "thrift", - "tokio", - "twox-hash", - "zstd 0.12.4", -] - [[package]] name = "parquet" version = "51.0.0" @@ -3476,7 +3220,7 @@ dependencies = [ name = "query_runner" version = "0.0.1" dependencies = [ - "datafusion 37.0.0", + "datafusion", "diesel-async", "mesh", "reqwest", @@ -3651,7 +3395,7 @@ dependencies = [ "actix-web", "arrow 51.0.0", "bytes", - "datafusion 37.0.0", + "datafusion", "diesel-async", "futures", "mesh", @@ -4085,16 +3829,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "sqlparser" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75" -dependencies = [ - "log", - "sqlparser_derive 0.1.1", -] - [[package]] name = "sqlparser" version = "0.44.0" @@ -4102,18 +3836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaf9c7ff146298ffda83a200f8d5084f08dcee1edfc135fcc1d646a45d50ffd6" dependencies = [ "log", - "sqlparser_derive 0.2.2", -] - -[[package]] -name = "sqlparser_derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55fe75cb4a364c7f7ae06c7dbbc8d84bddd85d6cdf9975963c3935bc1991761e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "sqlparser_derive", ] [[package]] @@ -4155,9 +3878,6 @@ name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.3", -] [[package]] name = "strum" diff --git a/webengine/Cargo.toml b/webengine/Cargo.toml index 8108c0f..dab1bd4 100644 --- a/webengine/Cargo.toml +++ b/webengine/Cargo.toml @@ -14,7 +14,7 @@ arrow = "47.0.0" arrow-schema = { version="47.0.0", features=["serde"]} arrow-flight = { version="47.0.0", features = ["flight-sql-experimental"]} async-trait = "0.1.74" -datafusion = { version = "32.0.0" } +datafusion = { version = "37.0.0" } tonic = { version="0.10.2", features=["tls"] } futures = "0.3" bytes = "1.6.0"