From f3f766d063066b330465dd7189851de64ef443c9 Mon Sep 17 00:00:00 2001 From: chubei <914745487@qq.com> Date: Wed, 27 Sep 2023 01:06:36 +0800 Subject: [PATCH] chore: Update `deltalake` --- Cargo.lock | 162 +++++++++++++++++++------------------ dozer-ingestion/Cargo.toml | 6 +- dozer-types/Cargo.toml | 4 +- 3 files changed, 87 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ea1161826..b25527c3ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -482,9 +482,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "arrow" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d18d72cd290f3f9e2149a714c8ac404b6c3fd614c684f0015449940fca899" +checksum = "b7104b9e9761613ae92fe770c741d6bbf1dbc791a0fe204400aebdd429875741" dependencies = [ "ahash 0.8.3", "arrow-arith", @@ -504,9 +504,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93bc0da4b22ba63807fa2a74998e21209179c93c67856ae65d9218b81f3ef918" +checksum = "38e597a8e8efb8ff52c50eaf8f4d85124ce3c1bf20fab82f476d73739d9ab1c2" dependencies = [ "arrow-array", "arrow-buffer", @@ -519,9 +519,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9a0fd21121304cad96f307c938d861cb1e7f0c151b93047462cd9817d760fb" +checksum = "2a86d9c1473db72896bd2345ebb6b8ad75b8553ba390875c76708e8dc5c5492d" dependencies = [ "ahash 0.8.3", "arrow-buffer", @@ -536,9 +536,9 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ce342ecf5971004e23cef8b5fb3bacd2bbc48a381464144925074e1472e9eb" +checksum = "234b3b1c8ed00c874bf95972030ac4def6f58e02ea5a7884314388307fb3669b" dependencies = [ "half 2.3.1", "num", @@ -546,9 +546,9 @@ dependencies = [ [[package]] name = "arrow-cast" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b94a0ce7d27abbb02e2ee4db770f593127610f57b32625b0bc6a1a90d65f085" +checksum = "22f61168b853c7faea8cea23a2169fdff9c82fb10ae5e2c07ad1cab8f6884931" dependencies = [ "arrow-array", "arrow-buffer", @@ -564,9 +564,9 @@ dependencies = [ [[package]] name = "arrow-csv" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3be10a00a43c4bf0d243c070754ebdde17c5d576b4928d9c3efbe3005a3853" +checksum = "10b545c114d9bf8569c84d2fbe2020ac4eea8db462c0a37d0b65f41a90d066fe" dependencies = [ "arrow-array", "arrow-buffer", @@ -583,9 +583,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9a83dad6a53d6907765106d3bc61d6d9d313cfe1751701b3ef0948e7283dc2" +checksum = "c6b6852635e7c43e5b242841c7470606ff0ee70eef323004cacc3ecedd33dd8f" dependencies = [ "arrow-buffer", "arrow-schema", @@ -595,9 +595,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a46da5e438a854e0386b38774da88a98782c0973c6dbc5c949ca4e02faf9b016" +checksum = "a66da9e16aecd9250af0ae9717ae8dd7ea0d8ca5a3e788fe3de9f4ee508da751" dependencies = [ "arrow-array", "arrow-buffer", @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "arrow-json" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f27a1fbc76553ad92dc1a9583e56b7058d8c418c4089b0b689f5b87e2da5e1" +checksum = "60ee0f9d8997f4be44a60ee5807443e396e025c23cf14d2b74ce56135cb04474" dependencies = [ "arrow-array", "arrow-buffer", @@ -620,7 +620,7 @@ dependencies = [ "arrow-schema", "chrono", "half 2.3.1", - "indexmap 1.9.2", + "indexmap 2.0.0", "lexical-core", "num", "serde", @@ -629,9 +629,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2373661f6c2233e18f6fa69c40999a9440231d1e8899be8bbbe73c7e24aa3b4" +checksum = "7fcab05410e6b241442abdab6e1035177dc082bdb6f17049a4db49faed986d63" dependencies = [ "arrow-array", "arrow-buffer", @@ -644,9 +644,9 @@ dependencies = [ [[package]] name = "arrow-row" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377cd5158b7de4034a175e296726c40c3236e65d71d90a5dab2fb4fab526a8f4" +checksum = "91a847dd9eb0bacd7836ac63b3475c68b2210c2c96d0ec1b808237b973bd5d73" dependencies = [ "ahash 0.8.3", "arrow-array", @@ -659,18 +659,18 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba9ed245bd2d7d97ad1457cb281d4296e8b593588758b8fec6d67b2b2b0f2265" +checksum = "54df8c47918eb634c20e29286e69494fdc20cafa5173eb6dad49c7f6acece733" dependencies = [ "serde", ] [[package]] name = "arrow-select" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc9bd6aebc565b1d04bae64a0f4dda3abc677190eb7d960471b1b20e1cebed0" +checksum = "941dbe481da043c4bd40c805a19ec2fc008846080c4953171b62bcad5ee5f7fb" dependencies = [ "arrow-array", "arrow-buffer", @@ -681,15 +681,16 @@ dependencies = [ [[package]] name = "arrow-string" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cf2baea2ef53787332050decf7d71aca836a352e188c8ad062892405955d2b" +checksum = "359b2cd9e071d5a3bcf44679f9d85830afebc5b9c98a08019a570a65ae933e0f" dependencies = [ "arrow-array", "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", + "num", "regex", "regex-syntax 0.7.4", ] @@ -2286,9 +2287,9 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "datafusion" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96f6e4eb10bd3e6b709686858246466983e8c5354a928ff77ee34919aa60d00" +checksum = "45e3bb3a788d9fa793268e9cec2601d79831ed1be437ba74d1deb32b226ae734" dependencies = [ "ahash 0.8.3", "arrow", @@ -2305,13 +2306,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 1.9.2", + "indexmap 2.0.0", "itertools 0.11.0", "lazy_static", "log", @@ -2323,7 +2324,7 @@ dependencies = [ "pin-project-lite", "rand 0.8.5", "smallvec", - "sqlparser 0.35.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sqlparser 0.36.1", "tempfile", "tokio", "tokio-util 0.7.8", @@ -2335,28 +2336,39 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e5fddcc0dd49bbe199e43aa406f39c46c790bb2a43c7b36a478e5f3f971235" +checksum = "0dd256483875270612d4fa439359bafa6f1760bae080ecb69eecc59a92b5016f" dependencies = [ "arrow", "arrow-array", + "async-compression", + "bytes", + "bzip2", "chrono", + "flate2", + "futures", "num_cpus", "object_store", "parquet", - "sqlparser 0.35.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sqlparser 0.36.1", + "tokio", + "tokio-util 0.7.8", + "xz2", + "zstd", ] [[package]] name = "datafusion-execution" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd50b6cb17acc78d2473c0d28014b8fd4e2e0a2c067c07645d6547b33b0aeeb" +checksum = "4973610d680bdc38f409a678c838d3873356cc6c29a543d1f56d7b4801e8d0a4" dependencies = [ + "arrow", "dashmap", "datafusion-common", "datafusion-expr", + "futures", "hashbrown 0.14.0", "log", "object_store", @@ -2368,24 +2380,24 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1a35dc2cd9eac18063d636f7ddf4f090fe1f34284d80192ac7ade38cc3c6991" +checksum = "7f3599f4cfcf22490f7b7d6d2fc70610ca8045b8bdcd99ef9d4309cf2b387537" dependencies = [ "ahash 0.8.3", "arrow", "datafusion-common", "lazy_static", - "sqlparser 0.35.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sqlparser 0.36.1", "strum 0.25.0", "strum_macros 0.25.1", ] [[package]] name = "datafusion-optimizer" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5043afeb45ec1c0f45519e1eed6a477f2d30732e8f975d9cf9a75fba0ca716" +checksum = "f067401eea6a0967c83021e714746f9153368cca964d45c4a1a4f99869a1512f" dependencies = [ "arrow", "async-trait", @@ -2401,27 +2413,29 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cc892a24f4b829ee7718ad3950884c0346dbdf1517f3df153af4bcf54d8ca4d" +checksum = "964c19161288d374fe066535f84de37a1dab419e47a24e02f3a0ca6413744451" dependencies = [ "ahash 0.8.3", "arrow", "arrow-array", "arrow-buffer", "arrow-schema", + "base64 0.21.0", "blake2", "blake3", "chrono", "datafusion-common", "datafusion-expr", - "datafusion-row", "half 2.3.1", "hashbrown 0.14.0", - "indexmap 1.9.2", + "hex", + "indexmap 2.0.0", "itertools 0.11.0", "lazy_static", "libc", + "log", "md-5 0.10.5", "paste", "petgraph 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2434,9 +2448,9 @@ dependencies = [ [[package]] name = "datafusion-proto" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40f7357464aeec3b530a3193dc23ca01ef20a26bad6c6dfe407ea7fb971701eb" +checksum = "4fde2768f10f1a5d47d164e0219ececb00f0dcd36f33079b656e03ad20e33c68" dependencies = [ "arrow", "chrono", @@ -2447,37 +2461,25 @@ dependencies = [ "prost 0.11.9", ] -[[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" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49cab87e4933a452e0b7b3f0cbd0e760daf7d33fb54d09d70d3ffba229eaa652" +checksum = "5b0939df21e440efcb35078c22b0192c537f7a53ebf1a34288a3a134753dd364" dependencies = [ "arrow", "arrow-schema", "datafusion-common", "datafusion-expr", "log", - "sqlparser 0.35.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sqlparser 0.36.1", ] [[package]] name = "deltalake" -version = "0.13.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0474f075bcff018c73453b289451afacf28421b1e3fb313a10a0930345b67971" +checksum = "39fbcd162d595e3b7e7af762b05abbdb14218615d24e8c40d23b1cfe1a408589" dependencies = [ "arrow", "arrow-array", @@ -2520,7 +2522,7 @@ dependencies = [ "rusoto_sts", "serde", "serde_json", - "sqlparser 0.35.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sqlparser 0.36.1", "thiserror", "tokio", "url", @@ -2864,7 +2866,7 @@ dependencies = [ "num-traits", "ort", "proptest", - "sqlparser 0.35.0 (git+https://github.com/getdozer/sqlparser-rs.git)", + "sqlparser 0.35.0", ] [[package]] @@ -2908,7 +2910,7 @@ dependencies = [ "reqwest", "rusqlite", "sqllogictest", - "sqlparser 0.35.0 (git+https://github.com/getdozer/sqlparser-rs.git)", + "sqlparser 0.35.0", "tempdir", "tokio", "url", @@ -5261,9 +5263,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", @@ -5735,9 +5737,9 @@ dependencies = [ [[package]] name = "parquet" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baab9c36b1c8300b81b4d577d306a0a733f9d34021363098d3548e37757ed6c8" +checksum = "49f9739b984380582bdb7749ae5b5d28839bce899212cf16465c1ac1f8b65d79" dependencies = [ "ahash 0.8.3", "arrow-array", @@ -7817,20 +7819,20 @@ dependencies = [ [[package]] name = "sqlparser" version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca597d77c98894be1f965f2e4e2d2a61575d4998088e655476c73715c54b2b43" +source = "git+https://github.com/getdozer/sqlparser-rs.git#3dd4e9f14a9631c9707c40d7e497ffe0558a88cd" dependencies = [ + "bigdecimal", "log", - "sqlparser_derive", ] [[package]] name = "sqlparser" -version = "0.35.0" -source = "git+https://github.com/getdozer/sqlparser-rs.git#3dd4e9f14a9631c9707c40d7e497ffe0558a88cd" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eaa1e88e78d2c2460d78b7dc3f0c08dbb606ab4222f9aff36f420d36e307d87" dependencies = [ - "bigdecimal", "log", + "sqlparser_derive", ] [[package]] diff --git a/dozer-ingestion/Cargo.toml b/dozer-ingestion/Cargo.toml index 5864095470..baf4fd01dc 100644 --- a/dozer-ingestion/Cargo.toml +++ b/dozer-ingestion/Cargo.toml @@ -25,7 +25,7 @@ tokio-postgres = { version = "0.7.7", features = [ "with-uuid-1", ] } # DataFusion connector -object_store = { version = "0.6", features = ["aws"] } +object_store = { version = "0.6.1", features = ["aws"] } # Eth connector web3 = { version = "0.18.0", optional = true } # Kafka connector @@ -44,7 +44,7 @@ tonic-web = "0.10.0" tonic-reflection = "0.10.0" tower-http = { version = "0.4", features = ["full"] } prost-reflect = { version = "0.12.0", features = ["serde", "text-format"] } -deltalake = { version = "0.13.0", default-features = false, features = [ +deltalake = { version = "0.15.0", default-features = false, features = [ "s3", "datafusion", ] } @@ -77,7 +77,7 @@ rand = "0.8.5" hex-literal = "0.4.1" dozer-tracing = { path = "../dozer-tracing" } tempdir = "0.3.7" -parquet = "42.0.0" +parquet = "45.0.0" env_logger = "0.10.0" hex = "0.4.3" dozer-cli = { path = "../dozer-cli" } diff --git a/dozer-types/Cargo.toml b/dozer-types/Cargo.toml index 6be2ea21af..27f9add09b 100644 --- a/dozer-types/Cargo.toml +++ b/dozer-types/Cargo.toml @@ -28,8 +28,8 @@ pyo3 = { version = "0.18.1", optional = true } tonic = { version = "0.10.0" } prost-types = "0.12.0" prost = "0.12.0" -arrow = { version = "42.0.0" } -arrow-schema = { version = "42.0.0", features = ["serde"] } +arrow = { version = "45.0.0" } +arrow-schema = { version = "45.0.0", features = ["serde"] } tokio-postgres = { version = "0.7.7", features = [ "with-chrono-0_4", "with-geo-types-0_7",