From 225f7e2d46c376058efb47e9e3c8a3ed5381f09f Mon Sep 17 00:00:00 2001 From: universalmind303 Date: Wed, 3 Apr 2024 14:55:41 -0500 Subject: [PATCH 1/3] wip: df 36 upgrade --- Cargo.lock | 2508 +++++++++-------- Cargo.toml | 10 +- crates/datafusion_ext/src/planner/expr/mod.rs | 7 +- crates/datafusion_ext/src/planner/mod.rs | 3 + crates/datasources/Cargo.toml | 2 +- crates/datasources/src/mongodb/mod.rs | 18 +- crates/datasources/src/native/access.rs | 10 +- crates/datasources/src/native/insert.rs | 56 +- crates/datasources/src/object_store/mod.rs | 3 +- crates/parser/src/lib.rs | 36 +- .../protogen/src/metastore/types/options.rs | 18 +- crates/sqlbuiltins/Cargo.toml | 11 +- crates/sqlbuiltins/src/functions/mod.rs | 16 +- .../src/functions/scalars/df_scalars.rs | 69 +- .../src/functions/scalars/hashing.rs | 87 +- .../src/functions/scalars/openai.rs | 41 +- .../src/functions/scalars/postgres.rs | 25 +- .../src/functions/scalars/similarity.rs | 2 +- crates/sqlexec/src/planner/session_planner.rs | 18 +- testdata/sqllogictests/datatypes.slt | 5 +- testdata/sqllogictests/functions/hashing.slt | 4 +- 21 files changed, 1652 insertions(+), 1297 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c0296cca..b0f2c7c08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,9 +25,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", @@ -47,9 +47,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "const-random", @@ -61,9 +61,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -126,30 +126,30 @@ checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -169,7 +169,7 @@ checksum = "ceb7c683b2f8f40970b70e39ff8be514c95b96fcb9c4af87e1ed2cb2e10801a0" dependencies = [ "bzip2", "crc32fast", - "digest 0.10.7", + "digest", "lazy_static", "libflate", "log", @@ -191,9 +191,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "ariadne" @@ -260,14 +260,14 @@ version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "arrow-buffer", "arrow-data", "arrow-schema", "chrono", "chrono-tz", "half", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "num", ] @@ -372,7 +372,7 @@ dependencies = [ "arrow-schema", "flatbuffers", "lz4_flex", - "zstd 0.13.0", + "zstd 0.13.1", ] [[package]] @@ -388,7 +388,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.2.5", + "indexmap 2.2.6", "lexical-core", "num", "serde", @@ -416,13 +416,13 @@ version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "007035e17ae09c4e8993e4cb8b5b96edf0afb927cd38e2dff27189b274d83dcf" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "arrow-array", "arrow-buffer", "arrow-data", "arrow-schema", "half", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -431,7 +431,7 @@ version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "serde", ] @@ -441,7 +441,7 @@ version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce20973c1912de6514348e064829e50947e35977bb9d7fb637dc99ea9ffd78c" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "arrow-array", "arrow-buffer", "arrow-data", @@ -462,7 +462,7 @@ dependencies = [ "arrow-select", "num", "regex", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -497,7 +497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 5.0.0", + "event-listener 5.2.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -505,9 +505,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +checksum = "86a9249d1447a85f95810c620abea82e001fe58a31713fcce614caf52499f905" dependencies = [ "bzip2", "flate2", @@ -517,8 +517,8 @@ dependencies = [ "pin-project-lite", "tokio", "xz2", - "zstd 0.13.0", - "zstd-safe 7.0.0", + "zstd 0.13.1", + "zstd-safe 7.1.0", ] [[package]] @@ -552,7 +552,7 @@ dependencies = [ "derive_builder", "futures", "rand", - "reqwest", + "reqwest 0.11.27", "reqwest-eventsource", "secrecy", "serde", @@ -572,7 +572,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -606,18 +606,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "async-trait" -version = "0.1.78" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -652,9 +652,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "aws-config" @@ -662,22 +662,22 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6b3804dca60326e07205179847f17a4fce45af3a1106939177ad41ac08a6de" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.56.1", "aws-http", - "aws-sdk-sso", - "aws-sdk-sts", - "aws-smithy-async", + "aws-sdk-sso 0.30.0", + "aws-sdk-sts 0.30.0", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.56.1", "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", - "aws-types", + "aws-smithy-json 0.56.1", + "aws-smithy-types 0.56.1", + "aws-types 0.56.1", "bytes", "fastrand", "hex", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "ring 0.16.20", "time", "tokio", @@ -686,33 +686,76 @@ dependencies = [ "zeroize", ] +[[package]] +name = "aws-config" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297b64446175a73987cedc3c438d79b2a654d0fff96f65ff530fbe039347644c" +dependencies = [ + "aws-credential-types 1.1.8", + "aws-runtime 1.1.8", + "aws-sdk-sso 1.18.0", + "aws-sdk-ssooidc", + "aws-sdk-sts 1.18.0", + "aws-smithy-async 1.2.0", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", + "aws-smithy-runtime 1.1.8", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", + "aws-types 1.1.8", + "bytes", + "fastrand", + "hex", + "http 0.2.12", + "hyper 0.14.28", + "ring 0.17.8", + "time", + "tokio", + "tracing", + "url", + "zeroize", +] + [[package]] name = "aws-credential-types" version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70a66ac8ef5fa9cf01c2d999f39d16812e90ec1467bd382cbbb74ba23ea86201" dependencies = [ - "aws-smithy-async", - "aws-smithy-types", + "aws-smithy-async 0.56.1", + "aws-smithy-types 0.56.1", "fastrand", "tokio", "tracing", "zeroize", ] +[[package]] +name = "aws-credential-types" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8587ae17c8e967e4b05a62d495be2fb7701bec52a97f7acfe8a29f938384c8" +dependencies = [ + "aws-smithy-async 1.2.0", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", + "zeroize", +] + [[package]] name = "aws-http" version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e626370f9ba806ae4c439e49675fd871f5767b093075cdf4fef16cac42ba900" dependencies = [ - "aws-credential-types", - "aws-smithy-http", - "aws-smithy-types", - "aws-types", + "aws-credential-types 0.56.1", + "aws-smithy-http 0.56.1", + "aws-smithy-types 0.56.1", + "aws-types 0.56.1", "bytes", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "lazy_static", "percent-encoding", "pin-project-lite", @@ -725,84 +768,220 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ac5cf0ff19c1bca0cea7932e11b239d1025a45696a4f44f72ea86e2b8bdd07" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.56.1", "aws-http", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", + "aws-sigv4 0.56.1", + "aws-smithy-async 0.56.1", + "aws-smithy-http 0.56.1", + "aws-smithy-runtime-api 0.56.1", + "aws-smithy-types 0.56.1", + "aws-types 0.56.1", + "fastrand", + "http 0.2.12", + "percent-encoding", + "tracing", + "uuid", +] + +[[package]] +name = "aws-runtime" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13dc54b4b49f8288532334bba8f87386a40571c47c37b1304979b556dc613c8" +dependencies = [ + "aws-credential-types 1.1.8", + "aws-sigv4 1.2.0", + "aws-smithy-async 1.2.0", + "aws-smithy-http 0.60.7", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", + "aws-types 1.1.8", + "bytes", "fastrand", - "http", + "http 0.2.12", + "http-body 0.4.6", "percent-encoding", + "pin-project-lite", "tracing", "uuid", ] +[[package]] +name = "aws-sdk-dynamodb" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff4be07ef8185ee6de617e1af24da76cbc4532ceb45417d997cc33d169d3485" +dependencies = [ + "aws-credential-types 1.1.8", + "aws-runtime 1.1.8", + "aws-smithy-async 1.2.0", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", + "aws-smithy-runtime 1.1.8", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", + "aws-types 1.1.8", + "bytes", + "fastrand", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + [[package]] name = "aws-sdk-sso" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "903f888ff190e64f6f5c83fb0f8d54f9c20481f1dc26359bb8896f5d99908949" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.56.1", "aws-http", - "aws-runtime", - "aws-smithy-async", + "aws-runtime 0.56.1", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", + "aws-smithy-http 0.56.1", + "aws-smithy-json 0.56.1", + "aws-smithy-runtime 0.56.1", + "aws-smithy-runtime-api 0.56.1", + "aws-smithy-types 0.56.1", + "aws-types 0.56.1", "bytes", - "http", + "http 0.2.12", "regex", "tokio-stream", "tracing", ] +[[package]] +name = "aws-sdk-sso" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "019a07902c43b03167ea5df0182f0cb63fae89f9a9682c44d18cf2e4a042cb34" +dependencies = [ + "aws-credential-types 1.1.8", + "aws-runtime 1.1.8", + "aws-smithy-async 1.2.0", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", + "aws-smithy-runtime 1.1.8", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", + "aws-types 1.1.8", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c46ee08a48a7f4eaa4ad201dcc1dd537b49c50859d14d4510e00ad9d3f9af2" +dependencies = [ + "aws-credential-types 1.1.8", + "aws-runtime 1.1.8", + "aws-smithy-async 1.2.0", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", + "aws-smithy-runtime 1.1.8", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", + "aws-types 1.1.8", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + [[package]] name = "aws-sdk-sts" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a47ad6bf01afc00423d781d464220bf69fb6a674ad6629cbbcb06d88cdc2be82" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.56.1", "aws-http", - "aws-runtime", - "aws-smithy-async", + "aws-runtime 0.56.1", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-query", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "http", + "aws-smithy-http 0.56.1", + "aws-smithy-json 0.56.1", + "aws-smithy-query 0.56.1", + "aws-smithy-runtime 0.56.1", + "aws-smithy-runtime-api 0.56.1", + "aws-smithy-types 0.56.1", + "aws-smithy-xml 0.56.1", + "aws-types 0.56.1", + "http 0.2.12", "regex", "tracing", ] +[[package]] +name = "aws-sdk-sts" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f752ac730125ca6017f72f9db5ec1772c9ecc664f87aa7507a7d81b023c23713" +dependencies = [ + "aws-credential-types 1.1.8", + "aws-runtime 1.1.8", + "aws-smithy-async 1.2.0", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", + "aws-smithy-query 0.60.7", + "aws-smithy-runtime 1.1.8", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", + "aws-smithy-xml 0.60.7", + "aws-types 1.1.8", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + [[package]] name = "aws-sigv4" version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7b28f4910bb956b7ab320b62e98096402354eca976c587d1eeccd523d9bac03" dependencies = [ - "aws-smithy-http", + "aws-smithy-http 0.56.1", "form_urlencoded", "hex", - "hmac 0.12.1", - "http", + "hmac", + "http 0.2.12", "once_cell", "percent-encoding", "regex", - "sha2 0.10.8", + "sha2", + "time", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d6f29688a4be9895c0ba8bef861ad0c0dac5c15e9618b9b7a6c233990fc263" +dependencies = [ + "aws-credential-types 1.1.8", + "aws-smithy-http 0.60.7", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", + "bytes", + "form_urlencoded", + "hex", + "hmac", + "http 0.2.12", + "http 1.1.0", + "once_cell", + "percent-encoding", + "sha2", "time", "tracing", ] @@ -819,21 +998,32 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "aws-smithy-async" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a41ccd6b74401a49ca828617049e5c23d83163d330a4f90a8081aadee0ac45" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + [[package]] name = "aws-smithy-client" version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c27b2756264c82f830a91cb4d2d485b2d19ad5bea476d9a966e03d27f27ba59a" dependencies = [ - "aws-smithy-async", - "aws-smithy-http", + "aws-smithy-async 0.56.1", + "aws-smithy-http 0.56.1", "aws-smithy-http-tower", - "aws-smithy-types", + "aws-smithy-types 0.56.1", "bytes", "fastrand", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls 0.24.2", "lazy_static", "pin-project-lite", @@ -849,13 +1039,33 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54cdcf365d8eee60686885f750a34c190e513677db58bbc466c44c588abf4199" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.56.1", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-http" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f10fa66956f01540051b0aa7ad54574640f748f9839e843442d99b970d3aff9" +dependencies = [ + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", "bytes", "bytes-utils", "futures-core", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", "once_cell", "percent-encoding", "pin-project-lite", @@ -869,11 +1079,11 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "822de399d0ce62829a69dfa8c5cd08efdbe61a7426b953e2268f8b8b52a607bd" dependencies = [ - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-http 0.56.1", + "aws-smithy-types 0.56.1", "bytes", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "pin-project-lite", "tower", "tracing", @@ -885,7 +1095,16 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb1e7ab8fa7ad10c193af7ae56d2420989e9f4758bf03601a342573333ea34f" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.56.1", +] + +[[package]] +name = "aws-smithy-json" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" +dependencies = [ + "aws-smithy-types 1.1.8", ] [[package]] @@ -894,7 +1113,17 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28556a3902091c1f768a34f6c998028921bdab8d47d92586f363f14a4a32d047" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.56.1", + "urlencoding", +] + +[[package]] +name = "aws-smithy-query" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" +dependencies = [ + "aws-smithy-types 1.1.8", "urlencoding", ] @@ -904,18 +1133,43 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "745e096b3553e7e0f40622aa04971ce52765af82bebdeeac53aa6fc82fe801e6" dependencies = [ - "aws-smithy-async", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", + "aws-smithy-http 0.56.1", + "aws-smithy-runtime-api 0.56.1", + "aws-smithy-types 0.56.1", + "bytes", + "fastrand", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec81002d883e5a7fd2bb063d6fb51c4999eb55d404f4fff3dd878bf4733b9f01" +dependencies = [ + "aws-smithy-async 1.2.0", + "aws-smithy-http 0.60.7", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", "bytes", "fastrand", - "http", - "http-body", + "h2", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", "pin-utils", + "rustls 0.21.10", "tokio", "tracing", ] @@ -926,15 +1180,32 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93d0ae0c9cfd57944e9711ea610b48a963fb174a53aabacc08c5794a594b1d02" dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-async 0.56.1", + "aws-smithy-http 0.56.1", + "aws-smithy-types 0.56.1", "bytes", - "http", + "http 0.2.12", "tokio", "tracing", ] +[[package]] +name = "aws-smithy-runtime-api" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9acb931e0adaf5132de878f1398d83f8677f90ba70f01f65ff87f6d7244be1c5" +dependencies = [ + "aws-smithy-async 1.2.0", + "aws-smithy-types 1.1.8", + "bytes", + "http 0.2.12", + "http 1.1.0", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + [[package]] name = "aws-smithy-types" version = "0.56.1" @@ -949,6 +1220,29 @@ dependencies = [ "time", ] +[[package]] +name = "aws-smithy-types" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe14dceea1e70101d38fbf2a99e6a34159477c0fb95e68e05c66bd7ae4c3729" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + [[package]] name = "aws-smithy-xml" version = "0.56.1" @@ -958,18 +1252,42 @@ dependencies = [ "xmlparser", ] +[[package]] +name = "aws-smithy-xml" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "872c68cf019c0e4afc5de7753c4f7288ce4b71663212771bf5e4542eb9346ca9" +dependencies = [ + "xmlparser", +] + [[package]] name = "aws-types" version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85aa0451bf8af1bf22a4f028d5d28054507a14be43cb8ac0597a8471fba9edfe" dependencies = [ - "aws-credential-types", - "aws-smithy-async", + "aws-credential-types 0.56.1", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-types", - "http", + "aws-smithy-http 0.56.1", + "aws-smithy-types 0.56.1", + "http 0.2.12", + "rustc_version 0.4.0", + "tracing", +] + +[[package]] +name = "aws-types" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dbf2f3da841a8930f159163175cf6a3d16ddde517c1b0fba7aa776822800f40" +dependencies = [ + "aws-credential-types 1.1.8", + "aws-smithy-async 1.2.0", + "aws-smithy-runtime-api 1.2.0", + "aws-smithy-types 1.1.8", + "http 0.2.12", "rustc_version 0.4.0", "tracing", ] @@ -985,9 +1303,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -1011,8 +1329,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -1035,9 +1353,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -1107,9 +1425,9 @@ dependencies = [ [[package]] name = "bigdecimal" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06619be423ea5bb86c95f087d5707942791a08a85530df0db2209a3ecfb8bc9" +checksum = "9324c8014cd04590682b34f1e9448d38f0674d0f7b2dc553331016ef0e4e9ebc" dependencies = [ "autocfg", "libm", @@ -1124,7 +1442,7 @@ version = "0.1.2" source = "git+https://github.com/glaredb/bigquery-storage?branch=deps/2023-10-27-update#85fab4035d0fda4226e5fa3f183a7dcadfb0db76" dependencies = [ "futures", - "hyper", + "hyper 0.14.28", "prost", "prost-types", "tonic", @@ -1134,22 +1452,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -1160,9 +1478,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -1185,14 +1503,14 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -1201,15 +1519,6 @@ dependencies = [ "constant_time_eq 0.3.0", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -1221,9 +1530,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" +checksum = "0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6" dependencies = [ "borsh-derive", "cfg_aliases", @@ -1231,23 +1540,23 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" +checksum = "51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5" dependencies = [ "once_cell", - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", "syn_derive", ] [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1256,9 +1565,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1270,11 +1579,11 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce21468c1c9c154a85696bb25c20582511438edb6ad67f846ba1378ffdd80222" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "base64 0.13.1", "bitvec", "hex", - "indexmap 2.2.5", + "indexmap 2.2.6", "js-sys", "once_cell", "rand", @@ -1287,12 +1596,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "serde", ] @@ -1316,15 +1625,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytecheck" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -1333,9 +1642,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", "quote", @@ -1350,9 +1659,9 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -1362,15 +1671,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytes-utils" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" dependencies = [ "bytes", "either", @@ -1432,9 +1741,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -1447,7 +1756,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.21", + "semver 1.0.22", "serde", "serde_json", ] @@ -1470,9 +1779,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -1501,9 +1810,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1511,7 +1820,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -1542,7 +1851,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", "stacker", ] @@ -1564,20 +1873,20 @@ checksum = "93a719913643003b84bd13022b4b7e703c09342cd03b679c4641c7d2e50dc34d" [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading", ] [[package]] name = "clap" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -1597,14 +1906,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -1684,9 +1993,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -1736,15 +2045,15 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11df32a13d7892ec42d51d3d175faba5211ffe13ed25d4fb348ac9e9ce835593" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -1809,9 +2118,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1819,9 +2128,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -1834,29 +2143,28 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -1866,44 +2174,38 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] @@ -1919,7 +2221,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "crossterm_winapi", "libc", "mio", @@ -1947,9 +2249,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core", @@ -1967,16 +2269,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "csv" version = "1.3.0" @@ -2014,19 +2306,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", - "digest 0.10.7", + "digest", "fiat-crypto", "platforms", "rustc_version 0.4.0", @@ -2035,13 +2327,13 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -2066,12 +2358,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.8", + "darling_macro 0.20.8", ] [[package]] @@ -2104,16 +2396,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -2140,13 +2432,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.8", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -2162,7 +2454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -2170,9 +2462,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "datadriven" @@ -2186,11 +2478,11 @@ dependencies = [ [[package]] name = "datafusion" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4328f5467f76d890fe3f924362dbc3a838c6a733f762b32d87f9e0b7bef5fb49" +checksum = "b2b360b692bf6c6d6e6b6dbaf41a3be0020daeceac0f406aed54c75331e50dbb" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "apache-avro", "arrow", "arrow-array", @@ -2205,6 +2497,8 @@ dependencies = [ "datafusion-common", "datafusion-execution", "datafusion-expr", + "datafusion-functions", + "datafusion-functions-array", "datafusion-optimizer", "datafusion-physical-expr", "datafusion-physical-plan", @@ -2213,9 +2507,9 @@ dependencies = [ "futures", "glob", "half", - "hashbrown 0.14.2", - "indexmap 2.2.5", - "itertools 0.12.0", + "hashbrown 0.14.3", + "indexmap 2.2.6", + "itertools 0.12.1", "log", "num-traits", "num_cpus", @@ -2224,23 +2518,23 @@ dependencies = [ "parquet", "pin-project-lite", "rand", - "sqlparser 0.41.0", + "sqlparser 0.43.1", "tempfile", "tokio", "tokio-util", "url", "uuid", "xz2", - "zstd 0.13.0", + "zstd 0.13.1", ] [[package]] name = "datafusion-common" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29a7752143b446db4a2cccd9a6517293c6b97e8c39e520ca43ccd07135a4f7e" +checksum = "37f343ccc298f440e25aa38ff82678291a7acc24061c7370ba6c0ff5cc811412" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "apache-avro", "arrow", "arrow-array", @@ -2253,14 +2547,14 @@ dependencies = [ "object_store", "parquet", "pyo3", - "sqlparser 0.41.0", + "sqlparser 0.43.1", ] [[package]] name = "datafusion-execution" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d447650af16e138c31237f53ddaef6dd4f92f0e2d3f2f35d190e16c214ca496" +checksum = "3f9c93043081487e335399a21ebf8295626367a647ac5cb87d41d18afad7d0f7" dependencies = [ "arrow", "chrono", @@ -2268,7 +2562,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "futures", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "log", "object_store", "parking_lot", @@ -2279,25 +2573,54 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d19598e48a498850fb79f97a9719b1f95e7deb64a7a06f93f313e8fa1d524b" +checksum = "e204d89909e678846b6a95f156aafc1ee5b36cb6c9e37ec2e1449b078a38c818" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "arrow", "arrow-array", "datafusion-common", "paste", - "sqlparser 0.41.0", - "strum 0.25.0", - "strum_macros 0.25.3", + "sqlparser 0.43.1", + "strum 0.26.2", + "strum_macros 0.26.2", +] + +[[package]] +name = "datafusion-functions" +version = "36.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98f1c73f7801b2b8ba2297b3ad78ffcf6c1fc6b8171f502987eb9ad5cb244ee7" +dependencies = [ + "arrow", + "base64 0.21.7", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "hex", + "log", +] + +[[package]] +name = "datafusion-functions-array" +version = "36.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d16a0ddf2c991526f6ffe2f47a72c6da0b7354d6c32411dd20631fe2e38937" +dependencies = [ + "arrow", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "log", + "paste", ] [[package]] name = "datafusion-optimizer" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7feb0391f1fc75575acb95b74bfd276903dc37a5409fcebe160bc7ddff2010" +checksum = "5ae27e07bf1f04d327be5c2a293470879801ab5535204dc3b16b062fda195496" dependencies = [ "arrow", "async-trait", @@ -2305,53 +2628,55 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-physical-expr", - "hashbrown 0.14.2", - "itertools 0.12.0", + "hashbrown 0.14.3", + "itertools 0.12.1", "log", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] name = "datafusion-physical-expr" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e911bca609c89a54e8f014777449d8290327414d3e10c57a3e3c2122e38878d0" +checksum = "dde620cd9ef76a3bca9c754fb68854bd2349c49f55baf97e08001f9e967f6d6b" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "arrow", "arrow-array", "arrow-buffer", "arrow-ord", "arrow-schema", + "arrow-string", "base64 0.21.7", "blake2", "blake3", "chrono", "datafusion-common", + "datafusion-execution", "datafusion-expr", "half", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "hex", - "indexmap 2.2.5", - "itertools 0.12.0", + "indexmap 2.2.6", + "itertools 0.12.1", "log", - "md-5 0.10.6", + "md-5", "paste", "petgraph", "rand", "regex", - "sha2 0.10.8", + "sha2", "unicode-segmentation", "uuid", ] [[package]] name = "datafusion-physical-plan" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b546b8a02e9c2ab35ac6420d511f12a4701950c1eb2e568c122b4fefb0be3" +checksum = "9a4c75fba9ea99d64b2246cbd2fcae2e6fc973e6616b1015237a616036506dd4" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "arrow", "arrow-array", "arrow-buffer", @@ -2364,9 +2689,9 @@ dependencies = [ "datafusion-physical-expr", "futures", "half", - "hashbrown 0.14.2", - "indexmap 2.2.5", - "itertools 0.12.0", + "hashbrown 0.14.3", + "indexmap 2.2.6", + "itertools 0.12.1", "log", "once_cell", "parking_lot", @@ -2378,9 +2703,9 @@ dependencies = [ [[package]] name = "datafusion-proto" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5742f993d1812d6bb3cdc4ce2a0aa99e10f6dc0daa11dd69b0ff57f2d8e7518c" +checksum = "2292251d5441d88d92a90d1511d5a8c88759a6562ff38ac1711b1587e6bf19c4" dependencies = [ "arrow", "chrono", @@ -2393,28 +2718,28 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d18d36f260bbbd63aafdb55339213a23d540d3419810575850ef0a798a6b768" +checksum = "21474a95c3a62d113599d21b439fa15091b538bac06bd20be0bb2e7d22903c09" dependencies = [ "arrow", "arrow-schema", "datafusion-common", "datafusion-expr", "log", - "sqlparser 0.41.0", + "sqlparser 0.43.1", ] [[package]] name = "datafusion-substrait" -version = "35.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad6bef77af3d8a697ae63ffbcb5aa66b74cd08ea93a31e2e757da75b2f1452f" +checksum = "aab89c01ef66a59ec92d2360db63893224b4f7e085e2ee6351e0bb77f88931f0" dependencies = [ "async-recursion", "chrono", "datafusion", - "itertools 0.12.0", + "itertools 0.12.1", "object_store", "prost", "prost-types", @@ -2475,7 +2800,7 @@ dependencies = [ "futures", "gcp-bigquery-client", "glob", - "indexmap 2.2.5", + "indexmap 2.2.6", "ioutil", "json-stream", "klickhouse", @@ -2494,7 +2819,7 @@ dependencies = [ "rand", "regex", "repr", - "reqwest", + "reqwest 0.11.27", "ring 0.17.8", "rust_decimal", "rustls 0.21.10", @@ -2528,8 +2853,8 @@ dependencies = [ [[package]] name = "deltalake" -version = "0.17.0" -source = "git+https://github.com/delta-io/delta-rs.git?rev=993e2c202936719855f8831513bcbab1b9930b94#993e2c202936719855f8831513bcbab1b9930b94" +version = "0.17.1" +source = "git+https://github.com/GlareDB/delta-rs.git?rev=94773cb304ebc5eaa48d7540eb01cdf08f8b401f#94773cb304ebc5eaa48d7540eb01cdf08f8b401f" dependencies = [ "deltalake-aws", "deltalake-azure", @@ -2540,9 +2865,14 @@ dependencies = [ [[package]] name = "deltalake-aws" version = "0.1.0" -source = "git+https://github.com/delta-io/delta-rs.git?rev=993e2c202936719855f8831513bcbab1b9930b94#993e2c202936719855f8831513bcbab1b9930b94" +source = "git+https://github.com/GlareDB/delta-rs.git?rev=94773cb304ebc5eaa48d7540eb01cdf08f8b401f#94773cb304ebc5eaa48d7540eb01cdf08f8b401f" dependencies = [ "async-trait", + "aws-config 1.1.9", + "aws-credential-types 1.1.8", + "aws-sdk-dynamodb", + "aws-sdk-sts 1.18.0", + "aws-smithy-runtime-api 1.2.0", "backoff", "bytes", "deltalake-core", @@ -2551,10 +2881,6 @@ dependencies = [ "maplit", "object_store", "regex", - "rusoto_core", - "rusoto_credential", - "rusoto_dynamodb", - "rusoto_sts", "thiserror", "tokio", "tracing", @@ -2565,7 +2891,7 @@ dependencies = [ [[package]] name = "deltalake-azure" version = "0.1.0" -source = "git+https://github.com/delta-io/delta-rs.git?rev=993e2c202936719855f8831513bcbab1b9930b94#993e2c202936719855f8831513bcbab1b9930b94" +source = "git+https://github.com/GlareDB/delta-rs.git?rev=94773cb304ebc5eaa48d7540eb01cdf08f8b401f#94773cb304ebc5eaa48d7540eb01cdf08f8b401f" dependencies = [ "async-trait", "bytes", @@ -2582,8 +2908,8 @@ dependencies = [ [[package]] name = "deltalake-core" -version = "0.17.0" -source = "git+https://github.com/delta-io/delta-rs.git?rev=993e2c202936719855f8831513bcbab1b9930b94#993e2c202936719855f8831513bcbab1b9930b94" +version = "0.17.1" +source = "git+https://github.com/GlareDB/delta-rs.git?rev=94773cb304ebc5eaa48d7540eb01cdf08f8b401f#94773cb304ebc5eaa48d7540eb01cdf08f8b401f" dependencies = [ "arrow", "arrow-arith", @@ -2604,6 +2930,7 @@ dependencies = [ "datafusion", "datafusion-common", "datafusion-expr", + "datafusion-functions", "datafusion-physical-expr", "datafusion-proto", "datafusion-sql", @@ -2611,9 +2938,9 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.14.2", - "indexmap 2.2.5", - "itertools 0.12.0", + "hashbrown 0.14.3", + "indexmap 2.2.6", + "itertools 0.12.1", "lazy_static", "libc", "maplit", @@ -2631,7 +2958,7 @@ dependencies = [ "roaring", "serde", "serde_json", - "sqlparser 0.41.0", + "sqlparser 0.44.0", "thiserror", "tokio", "tracing", @@ -2643,7 +2970,7 @@ dependencies = [ [[package]] name = "deltalake-gcp" version = "0.1.0" -source = "git+https://github.com/delta-io/delta-rs.git?rev=993e2c202936719855f8831513bcbab1b9930b94#993e2c202936719855f8831513bcbab1b9930b94" +source = "git+https://github.com/GlareDB/delta-rs.git?rev=94773cb304ebc5eaa48d7540eb01cdf08f8b401f#94773cb304ebc5eaa48d7540eb01cdf08f8b401f" dependencies = [ "async-trait", "bytes", @@ -2670,9 +2997,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -2739,22 +3066,13 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "const-oid", "crypto-common", "subtle", @@ -2769,16 +3087,6 @@ dependencies = [ "dirs-sys", ] -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - [[package]] name = "dirs-sys" version = "0.4.1" @@ -2791,17 +3099,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "distexec" version = "0.9.2" @@ -2829,18 +3126,18 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", - "digest 0.10.7", + "digest", "elliptic-curve", "rfc6979", "signature", @@ -2858,13 +3155,14 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", - "sha2 0.10.8", + "sha2", + "subtle", ] [[package]] @@ -2881,9 +3179,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" @@ -2893,7 +3191,7 @@ checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", - "digest 0.10.7", + "digest", "ff", "generic-array", "group", @@ -2998,7 +3296,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -3011,27 +3309,27 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -3090,9 +3388,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.0.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", @@ -3101,11 +3399,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ - "event-listener 5.0.0", + "event-listener 5.2.0", "pin-project-lite", ] @@ -3140,9 +3438,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fd-lock" @@ -3167,9 +3465,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.2" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" +checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" [[package]] name = "finl_unicode" @@ -3272,7 +3570,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -3284,7 +3582,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -3296,14 +3594,17 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "fs-err" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] [[package]] name = "funty" @@ -3367,7 +3668,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -3384,9 +3685,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" @@ -3408,17 +3709,17 @@ dependencies = [ [[package]] name = "gcp-bigquery-client" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0ce6fcbdaca0a4521a734f2bc7f2f6bd872fe40576e24f8bd0b05732c19a74f" +checksum = "a7fe3895eb99784b8ad2776688b41e068e918d18ebb736dafb1a321bce46c749" dependencies = [ "async-stream", "async-trait", "dyn-clone", - "hyper", - "hyper-rustls 0.24.2", + "hyper 0.14.28", + "hyper-rustls 0.25.0", "log", - "reqwest", + "reqwest 0.12.2", "serde", "serde_json", "thiserror", @@ -3426,7 +3727,7 @@ dependencies = [ "tokio", "tokio-stream", "url", - "yup-oauth2 8.3.0", + "yup-oauth2 8.3.3", ] [[package]] @@ -3442,9 +3743,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -3455,17 +3756,17 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" -version = "0.18.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "libgit2-sys", "log", @@ -3536,17 +3837,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.2.5", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -3570,7 +3871,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.8", ] [[package]] @@ -3579,16 +3880,16 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", ] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "allocator-api2", ] @@ -3598,7 +3899,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -3646,9 +3947,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -3662,23 +3963,13 @@ version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -3703,9 +3994,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -3714,12 +4016,35 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", - "http", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -3743,28 +4068,47 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.6", "tokio", "tower-service", "tracing", "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.22.1" @@ -3773,7 +4117,7 @@ checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "ct-logs", "futures-util", - "hyper", + "hyper 0.14.28", "log", "rustls 0.19.1", "rustls-native-certs 0.5.0", @@ -3789,8 +4133,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "log", "rustls 0.21.10", "rustls-native-certs 0.6.3", @@ -3798,23 +4142,77 @@ dependencies = [ "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.28", + "log", + "rustls 0.22.3", + "rustls-native-certs 0.7.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.2.0", + "hyper-util", + "rustls 0.22.3", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", +] + [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3873,20 +4271,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "serde", ] [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inout" @@ -3926,7 +4324,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", + "socket2 0.5.6", "widestring", "windows-sys 0.48.0", "winreg", @@ -3938,15 +4336,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.11.0" @@ -3958,24 +4347,24 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] @@ -4012,9 +4401,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -4044,11 +4433,11 @@ dependencies = [ [[package]] name = "keyed_priority_queue" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d63b6407b66fc81fc539dccf3ddecb669f393c5101b6a2be3976c95099a06e8" +checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.2.6", ] [[package]] @@ -4064,7 +4453,7 @@ dependencies = [ "compiler-tools", "compiler-tools-derive", "futures", - "indexmap 2.2.5", + "indexmap 2.2.6", "klickhouse_derive", "libc", "log", @@ -4093,8 +4482,8 @@ dependencies = [ [[package]] name = "lance" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ "arrow", "arrow-arith", @@ -4107,7 +4496,7 @@ dependencies = [ "async-recursion", "async-trait", "async_cell", - "aws-credential-types", + "aws-credential-types 0.56.1", "byteorder", "bytes", "chrono", @@ -4116,15 +4505,15 @@ dependencies = [ "datafusion-physical-expr", "futures", "half", - "itertools 0.12.0", - "lance-arrow 0.10.2", - "lance-core 0.10.2", + "itertools 0.12.1", + "lance-arrow", + "lance-core", "lance-datafusion", "lance-datagen", "lance-file", "lance-index", "lance-io", - "lance-linalg 0.10.2", + "lance-linalg", "lance-table", "lazy_static", "log", @@ -4150,26 +4539,8 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "arrow-select", - "getrandom", - "half", - "num-traits", - "rand", - "serde", -] - -[[package]] -name = "lance-arrow" -version = "0.10.3" -source = "git+https://github.com/GlareDB/lance?branch=datafusion-without-submodules#62ff0c46ffe931c4e7c42840ba83178c224ff1f8" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ "arrow-array", "arrow-buffer", @@ -4186,8 +4557,8 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ "arrow-array", "arrow-buffer", @@ -4199,37 +4570,7 @@ dependencies = [ "datafusion-common", "datafusion-sql", "futures", - "lance-arrow 0.10.2", - "lazy_static", - "libc", - "mock_instant", - "moka 0.11.3", - "object_store", - "pin-project", - "prost", - "rand", - "roaring", - "serde_json", - "snafu", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "lance-core" -version = "0.10.3" -source = "git+https://github.com/GlareDB/lance?branch=datafusion-without-submodules#62ff0c46ffe931c4e7c42840ba83178c224ff1f8" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-schema", - "async-trait", - "byteorder", - "bytes", - "chrono", - "futures", - "lance-arrow 0.10.3", + "lance-arrow", "lazy_static", "libc", "mock_instant", @@ -4242,14 +4583,16 @@ dependencies = [ "serde_json", "snafu", "tokio", + "tokio-stream", + "tokio-util", "tracing", "url", ] [[package]] name = "lance-datafusion" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ "arrow", "arrow-array", @@ -4261,32 +4604,32 @@ dependencies = [ "datafusion-physical-expr", "datafusion-substrait", "futures", - "lance-arrow 0.10.2", - "lance-core 0.10.2", + "lance-arrow", + "lance-core", "prost", "snafu", - "substrait", "tokio", ] [[package]] name = "lance-datagen" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ "arrow", "arrow-array", "arrow-cast", "arrow-schema", "chrono", + "hex", "rand", "rand_xoshiro", ] [[package]] name = "lance-file" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ "arrow-arith", "arrow-array", @@ -4297,8 +4640,8 @@ dependencies = [ "async-trait", "datafusion-common", "futures", - "lance-arrow 0.10.2", - "lance-core 0.10.2", + "lance-arrow", + "lance-core", "lance-io", "num-traits", "num_cpus", @@ -4313,8 +4656,8 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ "arrow", "arrow-array", @@ -4330,13 +4673,13 @@ dependencies = [ "datafusion-sql", "futures", "half", - "itertools 0.12.0", - "lance-arrow 0.10.2", - "lance-core 0.10.2", + "itertools 0.12.1", + "lance-arrow", + "lance-core", "lance-datafusion", "lance-file", "lance-io", - "lance-linalg 0.10.2", + "lance-linalg", "lance-table", "lazy_static", "log", @@ -4358,9 +4701,10 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ + "arrow", "arrow-arith", "arrow-array", "arrow-buffer", @@ -4370,14 +4714,14 @@ dependencies = [ "arrow-select", "async-recursion", "async-trait", - "aws-config", - "aws-credential-types", + "aws-config 0.56.1", + "aws-credential-types 0.56.1", "byteorder", "bytes", "chrono", "futures", - "lance-arrow 0.10.2", - "lance-core 0.10.2", + "lance-arrow", + "lance-core", "lazy_static", "num_cpus", "object_store", @@ -4394,30 +4738,8 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" -dependencies = [ - "arrow-array", - "arrow-ord", - "arrow-schema", - "cc", - "futures", - "half", - "lance-arrow 0.10.2", - "lance-core 0.10.2", - "lazy_static", - "log", - "num-traits", - "num_cpus", - "rand", - "tokio", - "tracing", -] - -[[package]] -name = "lance-linalg" -version = "0.10.3" -source = "git+https://github.com/GlareDB/lance?branch=datafusion-without-submodules#62ff0c46ffe931c4e7c42840ba83178c224ff1f8" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ "arrow-array", "arrow-ord", @@ -4425,8 +4747,8 @@ dependencies = [ "cc", "futures", "half", - "lance-arrow 0.10.3", - "lance-core 0.10.3", + "lance-arrow", + "lance-core", "lazy_static", "log", "num-traits", @@ -4438,21 +4760,21 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.10.2" -source = "git+https://github.com/GlareDB/lance?rev=de6df70d9c5d95a4818b8799c23e3d1ad649bc1d#de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" +version = "0.10.6" +source = "git+https://github.com/GlareDB/lance?branch=df36#7d8b8f4fa4807fd17f00db169284db53d83a64d2" dependencies = [ "arrow-array", "arrow-buffer", "arrow-ipc", "arrow-schema", "async-trait", - "aws-credential-types", + "aws-credential-types 0.56.1", "byteorder", "bytes", "chrono", "futures", - "lance-arrow 0.10.2", - "lance-core 0.10.2", + "lance-arrow", + "lance-core", "lance-file", "lance-io", "log", @@ -4594,22 +4916,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -4618,6 +4930,16 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + [[package]] name = "libsqlite3-sys" version = "0.27.0" @@ -4642,9 +4964,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.13" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f526fdd09d99e19742883e43de41e1aa9e36db0c7ab7f935165d611c5cccc66" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "libc", @@ -4660,9 +4982,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -4701,11 +5023,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -4745,9 +5067,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" dependencies = [ "twox-hash", ] @@ -4765,9 +5087,9 @@ dependencies = [ [[package]] name = "mach2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -4805,17 +5127,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "md-5" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "md-5" version = "0.10.6" @@ -4823,20 +5134,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ "cfg-if", - "digest 0.10.7", + "digest", ] [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -4854,9 +5165,9 @@ dependencies = [ [[package]] name = "memoize-inner" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bfde264c318ec8c2de5c39e0ba3910fac8d1065e3b947b183ebd884b799719b" +checksum = "27bdece7e91f0d1e33df7b46ec187a93ea0d4e642113a1039ac8bfdd4a3273ac" dependencies = [ "lazy_static", "proc-macro2", @@ -4912,7 +5223,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -4939,9 +5250,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -4960,9 +5271,9 @@ dependencies = [ [[package]] name = "mock_instant" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c1a54de846c4006b88b1516731cc1f6026eb5dc4bcb186aa071ef66d40524ec" +checksum = "9366861eb2a2c436c20b12c8dbec5f798cea6b47ad99216be0282942e2c81ea0" dependencies = [ "once_cell", ] @@ -5003,7 +5314,7 @@ dependencies = [ "futures-util", "once_cell", "parking_lot", - "quanta 0.12.2", + "quanta 0.12.3", "rustc_version 0.4.0", "skeptic", "smallvec", @@ -5031,9 +5342,9 @@ dependencies = [ "futures-io", "futures-util", "hex", - "hmac 0.12.1", + "hmac", "lazy_static", - "md-5 0.10.6", + "md-5", "pbkdf2", "percent-encoding", "rand", @@ -5044,7 +5355,7 @@ dependencies = [ "serde_bytes", "serde_with 1.14.0", "sha-1", - "sha2 0.10.8", + "sha2", "socket2 0.4.10", "stringprep", "strsim 0.10.0", @@ -5057,7 +5368,7 @@ dependencies = [ "trust-dns-resolver", "typed-builder 0.10.0", "uuid", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", ] [[package]] @@ -5072,14 +5383,14 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c60492b5eb751e55b42d716b6b26dceb66767996cd7a5560a842fbf613ca2e92" dependencies = [ - "darling 0.20.3", + "darling 0.20.8", "heck 0.4.1", "num-bigint", "proc-macro-crate 3.1.0", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", "termcolor", "thiserror", ] @@ -5098,7 +5409,7 @@ dependencies = [ "futures-util", "keyed_priority_queue", "lazy_static", - "lru 0.12.0", + "lru 0.12.3", "mio", "mysql_common", "once_cell", @@ -5106,11 +5417,11 @@ dependencies = [ "percent-encoding", "pin-project", "rand", - "rustls 0.22.2", + "rustls 0.22.3", "rustls-pemfile 2.1.1", "serde", "serde_json", - "socket2 0.5.5", + "socket2 0.5.6", "thiserror", "tokio", "tokio-rustls 0.25.0", @@ -5123,14 +5434,14 @@ dependencies = [ [[package]] name = "mysql_common" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a60cb978c0a1d654edcc1460f8d6092dacf21346ed6017d81fb76a23ef5a8de" +checksum = "0ccdc1fe2bb3ef97e07ba4397327ed45509a1e2e499e2f8265243879cbc7313c" dependencies = [ "base64 0.21.7", "bigdecimal", "bindgen", - "bitflags 2.4.1", + "bitflags 2.5.0", "bitvec", "btoi", "byteorder", @@ -5152,22 +5463,22 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2 0.10.8", + "sha2", "smallvec", "subprocess", "thiserror", "time", "uuid", - "zstd 0.13.0", + "zstd 0.13.1", ] [[package]] name = "napi" -version = "2.16.0" +version = "2.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a63d0570e4c3e0daf7a8d380563610e159f538e20448d6c911337246f40e84" +checksum = "c4ca998356d8ff9fba7a070dae4508a2298439c98c9f3bc9c07669538b999e8f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "chrono", "ctor", "encoding_rs", @@ -5187,31 +5498,31 @@ checksum = "2f9130fccc5f763cf2069b34a089a18f0d0883c66aceb81f2fad541a3d823c43" [[package]] name = "napi-derive" -version = "2.16.0" +version = "2.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bb7c37e3c1dda9312fdbe4a9fc7507fca72288ba154ec093e2d49114e727ce" +checksum = "b138cecf1141ae0ff5d62f4aa0e2f269aec339f66070f346ba6fb4279f1fc178" dependencies = [ "cfg-if", "convert_case 0.6.0", "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "napi-derive-backend" -version = "1.0.62" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f785a8b8d7b83e925f5aa6d2ae3c159d17fe137ac368dc185bef410e7acdaeb4" +checksum = "ce5126b64f6ad9e28e30e6d15213dd378626b38f556454afebc42f7f02a90902" dependencies = [ "convert_case 0.6.0", "once_cell", "proc-macro2", "quote", "regex", - "semver 1.0.21", - "syn 2.0.48", + "semver 1.0.22", + "syn 2.0.57", ] [[package]] @@ -5220,7 +5531,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" dependencies = [ - "libloading 0.8.1", + "libloading", ] [[package]] @@ -5302,28 +5613,33 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -5358,7 +5674,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.9", "libc", ] @@ -5380,23 +5696,23 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -5413,14 +5729,14 @@ dependencies = [ "chrono", "futures", "humantime", - "hyper", - "itertools 0.12.0", - "md-5 0.10.6", + "hyper 0.14.28", + "itertools 0.12.1", + "md-5", "parking_lot", "percent-encoding", "quick-xml", "rand", - "reqwest", + "reqwest 0.11.27", "ring 0.17.8", "rustls-pemfile 2.1.1", "serde", @@ -5456,12 +5772,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssh" version = "0.10.3" @@ -5534,7 +5844,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -5546,7 +5856,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -5560,7 +5870,7 @@ dependencies = [ "elliptic-curve", "primeorder", "rand_core", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -5587,7 +5897,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -5598,7 +5908,7 @@ version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "547b92ebf0c1177e3892f44c8f79757ee62e678d564a9834189725f2c5b7a750" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "arrow-array", "arrow-buffer", "arrow-cast", @@ -5613,7 +5923,7 @@ dependencies = [ "flate2", "futures", "half", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lz4_flex", "num", "num-bigint", @@ -5624,7 +5934,7 @@ dependencies = [ "thrift", "tokio", "twox-hash", - "zstd 0.13.0", + "zstd 0.13.1", ] [[package]] @@ -5670,23 +5980,17 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.7", - "hmac 0.12.1", + "digest", + "hmac", "password-hash", - "sha2 0.10.8", + "sha2", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ "base64 0.21.7", "serde", @@ -5709,9 +6013,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.6" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" +checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" dependencies = [ "memchr", "thiserror", @@ -5725,7 +6029,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.5", + "indexmap 2.2.6", ] [[package]] @@ -5774,7 +6078,7 @@ dependencies = [ "parser", "pgrepr", "proxyutil", - "reqwest", + "reqwest 0.11.27", "rustls 0.21.10", "rustls-pemfile 2.1.1", "serde", @@ -5830,29 +6134,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -5883,15 +6187,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.1.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "portable-atomic" @@ -5899,20 +6203,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" -[[package]] -name = "postgres" -version = "0.19.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" -dependencies = [ - "bytes", - "fallible-iterator 0.2.0", - "futures-util", - "log", - "tokio", - "tokio-postgres", -] - [[package]] name = "postgres-protocol" version = "0.6.6" @@ -5923,11 +6213,11 @@ dependencies = [ "byteorder", "bytes", "fallible-iterator 0.2.0", - "hmac 0.12.1", - "md-5 0.10.6", + "hmac", + "md-5", "memchr", "rand", - "sha2 0.10.8", + "sha2", "stringprep", ] @@ -5996,12 +6286,12 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -6023,15 +6313,6 @@ dependencies = [ "toml_edit 0.19.15", ] -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -6067,9 +6348,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -6101,7 +6382,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.48", + "syn 2.0.57", "tempfile", "which", ] @@ -6116,7 +6397,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -6152,7 +6433,7 @@ version = "0.9.2" dependencies = [ "async-trait", "futures", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "thiserror", @@ -6181,20 +6462,20 @@ dependencies = [ "chrono", "csv", "enum-as-inner 0.6.0", - "itertools 0.12.0", + "itertools 0.12.1", "log", "once_cell", "prqlc-ast", "prqlc-parser", "regex", - "semver 1.0.21", + "semver 1.0.22", "serde", "serde_json", "serde_yaml", "sqlformat", "sqlparser 0.43.1", - "strum 0.26.1", - "strum_macros 0.26.1", + "strum 0.26.2", + "strum_macros 0.26.2", ] [[package]] @@ -6205,9 +6486,9 @@ checksum = "c98923b046bc48046e3846b14a5fde5a059f681c7c367bd0ab96ebd3ecc33a71" dependencies = [ "anyhow", "enum-as-inner 0.6.0", - "semver 1.0.21", + "semver 1.0.22", "serde", - "strum 0.26.1", + "strum 0.26.2", ] [[package]] @@ -6217,9 +6498,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "855ad9aba599ef608efc88a30ebd731155997d9bbe780639eb175de060b6cddc" dependencies = [ "chumsky", - "itertools 0.12.0", + "itertools 0.12.1", "prqlc-ast", - "semver 1.0.21", + "semver 1.0.22", "stacker", ] @@ -6254,11 +6535,11 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "memchr", "unicase", ] @@ -6337,7 +6618,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -6350,7 +6631,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -6377,9 +6658,9 @@ dependencies = [ [[package]] name = "quanta" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" dependencies = [ "crossbeam-utils", "libc", @@ -6485,16 +6766,7 @@ version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" dependencies = [ - "bitflags 2.4.1", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -6508,12 +6780,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -6526,7 +6798,7 @@ dependencies = [ "chrono", "crossterm", "fd-lock", - "itertools 0.12.0", + "itertools 0.12.1", "nu-ansi-term 0.50.0", "serde", "strip-ansi-escapes", @@ -6539,14 +6811,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -6560,13 +6832,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -6583,9 +6855,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "regress" @@ -6599,15 +6871,15 @@ dependencies = [ [[package]] name = "relative-path" -version = "1.9.0" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca" +checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" [[package]] name = "rend" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] @@ -6635,9 +6907,9 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls 0.24.2", "ipnet", "js-sys", @@ -6664,7 +6936,48 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", + "winreg", +] + +[[package]] +name = "reqwest" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338" +dependencies = [ + "base64 0.21.7", + "bytes", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-rustls 0.26.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.22.3", + "rustls-pemfile 1.0.4", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.26.1", "winreg", ] @@ -6680,7 +6993,7 @@ dependencies = [ "mime", "nom", "pin-project-lite", - "reqwest", + "reqwest 0.11.27", "thiserror", ] @@ -6694,19 +7007,13 @@ dependencies = [ "quick-error", ] -[[package]] -name = "retain_mut" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" - [[package]] name = "rfc6979" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac 0.12.1", + "hmac", "subtle", ] @@ -6742,12 +7049,13 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -6759,9 +7067,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", "quote", @@ -6776,13 +7084,12 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "roaring" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873" +checksum = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" dependencies = [ "bytemuck", "byteorder", - "retain_mut", ] [[package]] @@ -6814,19 +7121,19 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ "const-oid", - "digest 0.10.7", + "digest", "num-bigint-dig", "num-integer", "num-traits", "pkcs1", "pkcs8", "rand_core", - "sha2 0.10.8", + "sha2", "signature", "spki", "subtle", @@ -6858,115 +7165,17 @@ dependencies = [ "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.48", + "syn 2.0.57", "unicode-ident", ] -[[package]] -name = "rusoto_core" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4f000e8934c1b4f70adde180056812e7ea6b1a247952db8ee98c94cd3116cc" -dependencies = [ - "async-trait", - "base64 0.13.1", - "bytes", - "crc32fast", - "futures", - "http", - "hyper", - "hyper-rustls 0.22.1", - "lazy_static", - "log", - "rusoto_credential", - "rusoto_signature", - "rustc_version 0.4.0", - "serde", - "serde_json", - "tokio", - "xml-rs", -] - -[[package]] -name = "rusoto_credential" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a46b67db7bb66f5541e44db22b0a02fed59c9603e146db3a9e633272d3bac2f" -dependencies = [ - "async-trait", - "chrono", - "dirs-next", - "futures", - "hyper", - "serde", - "serde_json", - "shlex", - "tokio", - "zeroize", -] - -[[package]] -name = "rusoto_dynamodb" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7935e1f9ca57c4ee92a4d823dcd698eb8c992f7e84ca21976ae72cd2b03016e7" -dependencies = [ - "async-trait", - "bytes", - "futures", - "rusoto_core", - "serde", - "serde_json", -] - -[[package]] -name = "rusoto_signature" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6264e93384b90a747758bcc82079711eacf2e755c3a8b5091687b5349d870bcc" -dependencies = [ - "base64 0.13.1", - "bytes", - "chrono", - "digest 0.9.0", - "futures", - "hex", - "hmac 0.11.0", - "http", - "hyper", - "log", - "md-5 0.9.1", - "percent-encoding", - "pin-project-lite", - "rusoto_credential", - "rustc_version 0.4.0", - "serde", - "sha2 0.9.9", - "tokio", -] - -[[package]] -name = "rusoto_sts" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7edd42473ac006fd54105f619e480b0a94136e7f53cf3fb73541363678fd92" -dependencies = [ - "async-trait", - "bytes", - "chrono", - "futures", - "rusoto_core", - "serde_urlencoded", - "xml-rs", -] - [[package]] name = "rusqlite" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "fallible-iterator 0.3.0", "fallible-streaming-iterator", "hashlink", @@ -6976,20 +7185,19 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.34.3" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", "borsh", "bytes", "num-traits", - "postgres", + "postgres-types", "rand", "rkyv", "serde", "serde_json", - "tokio-postgres", ] [[package]] @@ -7028,7 +7236,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.21", + "semver 1.0.22", ] [[package]] @@ -7043,11 +7251,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -7093,9 +7301,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" dependencies = [ "log", "ring 0.17.8", @@ -7129,6 +7337,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.1", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -7150,9 +7371,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" [[package]] name = "rustls-webpki" @@ -7183,9 +7404,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -7204,11 +7425,11 @@ checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -7293,7 +7514,7 @@ dependencies = [ "scylla-macros", "smallvec", "snap", - "socket2 0.5.5", + "socket2 0.5.6", "strum 0.23.0", "strum_macros 0.23.1", "thiserror", @@ -7326,10 +7547,10 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb6085ff9c3fd7e5163826901d39164ab86f11bdca16b2f766a00c528ff9cef9" dependencies = [ - "darling 0.20.3", + "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -7364,9 +7585,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -7377,9 +7598,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -7392,7 +7613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12485833e00457a6bbba60397d3f19362751a0caefe27f6755fff1a2be4fd601" dependencies = [ "async-trait", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "thiserror", @@ -7419,9 +7640,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -7473,7 +7694,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -7489,11 +7710,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -7508,7 +7729,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -7543,7 +7764,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_derive", "serde_json", @@ -7569,19 +7790,19 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ - "darling 0.20.3", + "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "serde_yaml" -version = "0.9.31" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -7596,7 +7817,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -7607,20 +7828,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[package]] @@ -7631,7 +7839,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -7696,11 +7904,11 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest 0.10.7", + "digest", "rand_core", ] @@ -7712,9 +7920,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "similar" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "siphasher" @@ -7787,9 +7995,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snafu" @@ -7815,9 +8023,9 @@ dependencies = [ [[package]] name = "snap" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snowflake_connector" @@ -7831,7 +8039,7 @@ dependencies = [ "flate2", "hex", "logutil", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "thiserror", @@ -7852,12 +8060,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -7874,9 +8082,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -7891,6 +8099,7 @@ dependencies = [ "async-trait", "catalog", "datafusion", + "datafusion-functions-array", "datafusion_ext", "datasources", "decimal", @@ -7898,7 +8107,7 @@ dependencies = [ "futures", "ioutil", "kdl", - "lance-linalg 0.10.3", + "lance-linalg", "logutil", "memoize", "num-traits", @@ -7907,9 +8116,9 @@ dependencies = [ "parser", "pgrepr", "protogen", - "reqwest", + "reqwest 0.11.27", "siphasher 1.0.1", - "strum 0.25.0", + "strum 0.26.2", "telemetry", "tempfile", "thiserror", @@ -7946,7 +8155,7 @@ dependencies = [ "prost", "protogen", "proxyutil", - "reqwest", + "reqwest 0.11.27", "serde", "sqlbuiltins", "telemetry", @@ -7967,7 +8176,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools 0.12.0", + "itertools 0.12.1", "nom", "unicode_categories", ] @@ -7986,7 +8195,7 @@ dependencies = [ "humantime", "itertools 0.11.0", "libtest-mimic", - "md-5 0.10.6", + "md-5", "owo-colors", "regex", "similar", @@ -7998,22 +8207,22 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.41.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc2c25a6c66789625ef164b4c7d2e548d627902280c13710d33da8222169964" +checksum = "f95c4bae5aba7cd30bd506f7140026ade63cff5afd778af8854026f9606bf5d4" dependencies = [ "log", + "serde", "sqlparser_derive", ] [[package]] name = "sqlparser" -version = "0.43.1" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95c4bae5aba7cd30bd506f7140026ade63cff5afd778af8854026f9606bf5d4" +checksum = "aaf9c7ff146298ffda83a200f8d5084f08dcee1edfc135fcc1d646a45d50ffd6" dependencies = [ "log", - "serde", ] [[package]] @@ -8024,7 +8233,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -8045,7 +8254,7 @@ checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15" dependencies = [ "base64ct", "pem-rfc7468", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -8061,7 +8270,7 @@ dependencies = [ "rand_core", "rsa", "sec1", - "sha2 0.10.8", + "sha2", "signature", "ssh-cipher", "ssh-encoding", @@ -8131,17 +8340,14 @@ 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" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ - "strum_macros 0.26.1", + "strum_macros 0.26.2", ] [[package]] @@ -8167,20 +8373,20 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "strum_macros" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -8205,9 +8411,9 @@ dependencies = [ [[package]] name = "substrait" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5478fbd0313a9b0915a1c0e7ebf15b5fed7d7c6dd7229b4f5e32ce75b10f256a" +checksum = "2c8ffb7a3e7505bb835513e77ebfe67d359e57d684a5972323e3bdefbecc1f25" dependencies = [ "git2", "heck 0.4.1", @@ -8216,11 +8422,11 @@ dependencies = [ "prost-build", "prost-types", "schemars", - "semver 1.0.21", + "semver 1.0.22", "serde", "serde_json", "serde_yaml", - "syn 2.0.48", + "syn 2.0.57", "typify", "walkdir", ] @@ -8244,9 +8450,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2", "quote", @@ -8262,7 +8468,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -8312,9 +8518,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "telemetry" @@ -8341,9 +8547,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -8387,14 +8593,14 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -8450,13 +8656,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -8472,10 +8679,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -8505,9 +8713,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -8517,7 +8725,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.6", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -8541,7 +8749,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -8574,7 +8782,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand", - "socket2 0.5.5", + "socket2 0.5.6", "tokio", "tokio-util", "whoami", @@ -8618,16 +8826,16 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.3", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -8661,18 +8869,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.5", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow", ] @@ -8683,7 +8880,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow", ] @@ -8700,9 +8897,9 @@ dependencies = [ "base64 0.21.7", "bytes", "h2", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -8729,7 +8926,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -8742,7 +8939,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -8797,7 +8994,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -8854,9 +9051,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" +checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" [[package]] name = "trust-dns-proto" @@ -8905,9 +9102,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "twox-hash" @@ -8948,7 +9145,7 @@ checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -8980,7 +9177,7 @@ dependencies = [ "regress", "schemars", "serde_json", - "syn 2.0.48", + "syn 2.0.57", "thiserror", "unicode-ident", ] @@ -8997,7 +9194,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.48", + "syn 2.0.57", "typify-impl", ] @@ -9018,9 +9215,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -9030,18 +9227,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -9069,9 +9266,9 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -9128,7 +9325,7 @@ checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -9209,11 +9406,17 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -9221,24 +9424,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -9248,9 +9451,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -9258,22 +9461,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" @@ -9290,9 +9493,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -9320,9 +9523,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" @@ -9347,11 +9550,12 @@ dependencies = [ [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "wasm-bindgen", + "redox_syscall", + "wasite", "web-sys", ] @@ -9394,11 +9598,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -9416,7 +9620,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -9436,17 +9640,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -9457,9 +9661,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -9469,9 +9673,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -9481,9 +9685,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -9493,9 +9697,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -9505,9 +9709,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -9517,9 +9721,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -9529,15 +9733,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -9561,12 +9765,6 @@ dependencies = [ "tap", ] -[[package]] -name = "xml-rs" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" - [[package]] name = "xmlparser" version = "0.13.6" @@ -9575,18 +9773,18 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xshell" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad" +checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437" dependencies = [ "xshell-macros", ] [[package]] name = "xshell-macros" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" +checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" [[package]] name = "xtask" @@ -9622,8 +9820,8 @@ dependencies = [ "base64 0.13.1", "chrono", "futures", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "hyper-rustls 0.22.1", "log", "percent-encoding", @@ -9637,21 +9835,21 @@ dependencies = [ [[package]] name = "yup-oauth2" -version = "8.3.0" +version = "8.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "364ca376b5c04d9b2be9693054e3e0d2d146b363819d0f9a10c6ee66e4c8406b" +checksum = "45b7ff561fdc7809a2adad8bce73e157d01129074098e6405d0d7dfa2d087782" dependencies = [ "anyhow", "async-trait", - "base64 0.13.1", + "base64 0.21.7", "futures", - "http", - "hyper", - "hyper-rustls 0.24.2", - "itertools 0.10.5", + "http 0.2.12", + "hyper 0.14.28", + "hyper-rustls 0.25.0", + "itertools 0.12.1", "log", "percent-encoding", - "rustls 0.21.10", + "rustls 0.22.3", "rustls-pemfile 1.0.4", "seahash", "serde", @@ -9670,22 +9868,22 @@ checksum = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc" [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -9707,7 +9905,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "flate2", - "hmac 0.12.1", + "hmac", "pbkdf2", "sha1", "time", @@ -9734,11 +9932,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ - "zstd-safe 7.0.0", + "zstd-safe 7.1.0", ] [[package]] @@ -9763,18 +9961,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 6f9362b5d..ced8aa86b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,9 +18,9 @@ wildcard_imports = "deny" [workspace.dependencies] clap = { version = "4.5.3", features = ["derive"] } -datafusion = { version = "35.0.0", features = ["avro"] } +datafusion = { version = "36.0.0", features = ["avro"] } arrow-flight = { version = "50.0.0", features = ["flight-sql-experimental"] } -datafusion-proto = { version = "35.0.0" } +datafusion-proto = { version = "36.0.0" } reqwest = { version = "0.11.27", default-features = false, features = [ "json", "rustls-tls", @@ -30,7 +30,7 @@ tokio = { version = "1", features = ["full"] } tonic = { version = "0.10", features = ["transport", "tls", "tls-roots"] } anyhow = "1.0.81" async-trait = "0.1.78" -chrono = "0.4.35" +chrono = "0.4.37" futures = "0.3.30" object_store = "0.9" prost = "0.12" @@ -43,6 +43,6 @@ tracing = "0.1" url = "2.5.0" [workspace.dependencies.deltalake] -git = "https://github.com/delta-io/delta-rs.git" -rev = "993e2c202936719855f8831513bcbab1b9930b94" +git = "https://github.com/GlareDB/delta-rs.git" +rev = "94773cb304ebc5eaa48d7540eb01cdf08f8b401f" features = ["s3", "gcs", "azure", "datafusion"] diff --git a/crates/datafusion_ext/src/planner/expr/mod.rs b/crates/datafusion_ext/src/planner/expr/mod.rs index b3748fef8..cff550ae7 100644 --- a/crates/datafusion_ext/src/planner/expr/mod.rs +++ b/crates/datafusion_ext/src/planner/expr/mod.rs @@ -792,8 +792,13 @@ impl<'a, S: AsyncContextProvider> SqlQueryPlanner<'a, S> { self.sql_expr_to_logical_expr(*right, schema, planner_context) .await?, ); + let stride = Box::new(Expr::Literal(ScalarValue::Int64(Some(1)))); - GetFieldAccess::ListRange { start, stop } + GetFieldAccess::ListRange { + start, + stop, + stride, + } } _ => GetFieldAccess::ListIndex { key: Box::new( diff --git a/crates/datafusion_ext/src/planner/mod.rs b/crates/datafusion_ext/src/planner/mod.rs index 62514a197..747aefa4e 100644 --- a/crates/datafusion_ext/src/planner/mod.rs +++ b/crates/datafusion_ext/src/planner/mod.rs @@ -324,6 +324,9 @@ impl<'a, S: AsyncContextProvider> SqlQueryPlanner<'a, S> { | SQLDataType::Int64 | SQLDataType::Float64 | SQLDataType::Struct(_) + | SQLDataType::JSONB + | SQLDataType::Unspecified + => not_impl_err!( "Unsupported SQL type {sql_type:?}" ), diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index 0cbaf42cd..d27083a53 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -70,7 +70,7 @@ tiberius = { version = "0.12.2", default-features = false, features = [ "rustls", "chrono", ] } -lance = { git = "https://github.com/GlareDB/lance", rev = "de6df70d9c5d95a4818b8799c23e3d1ad649bc1d" } +lance = { git = "https://github.com/GlareDB/lance", branch = "df36" } bson = "2.9.0" scylla = { version = "0.12.0" } glob = "0.3.1" diff --git a/crates/datasources/src/mongodb/mod.rs b/crates/datasources/src/mongodb/mod.rs index 91cc37f86..d191d1088 100644 --- a/crates/datasources/src/mongodb/mod.rs +++ b/crates/datasources/src/mongodb/mod.rs @@ -86,7 +86,6 @@ impl ParseOptionValue for OptionValue { } } - impl Display for MongoDbProtocol { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { let s = match self { @@ -462,15 +461,24 @@ fn df_to_bson(val: ScalarValue) -> Result { ScalarValue::UInt64(v) => Ok(Bson::Int64(i64::try_from(v.unwrap_or_default()).unwrap())), ScalarValue::Float32(v) => Ok(Bson::Double(f64::from(v.unwrap_or_default()))), ScalarValue::Float64(v) => Ok(Bson::Double(v.unwrap_or_default())), - ScalarValue::Struct(v, f) => { + ScalarValue::Struct(sa) => { let mut doc = RawDocumentBuf::new(); - for (key, value) in f.into_iter().zip(v.unwrap_or_default().into_iter()) { + let fields = sa.fields(); + let columns = sa.columns(); + for (field, column) in fields.iter().zip(columns.iter()) { + if column.len() != 1 { + return Err(ExtensionError::String( + "Struct column should have only one row".to_string(), + )); + } + let sv = ScalarValue::try_from_array(column, 0).unwrap(); doc.append( - key.name(), - RawBson::try_from(df_to_bson(value)?) + field.name(), + RawBson::try_from(df_to_bson(sv)?) .map_err(|e| DataFusionError::External(Box::new(e)))?, ); } + Ok(Bson::Document( doc.to_document() .map_err(|e| DataFusionError::External(Box::new(e)))?, diff --git a/crates/datasources/src/native/access.rs b/crates/datasources/src/native/access.rs index 4a41e4340..fda01648c 100644 --- a/crates/datasources/src/native/access.rs +++ b/crates/datasources/src/native/access.rs @@ -16,6 +16,7 @@ use datafusion::physical_plan::projection::ProjectionExec; use datafusion::physical_plan::{ExecutionPlan, Statistics}; use datafusion::prelude::Expr; use datafusion_ext::metrics::ReadOnlyDataSourceMetricsExecAdapter; +use deltalake::delta_datafusion::DataFusionMixins; use deltalake::kernel::{ArrayType, DataType as DeltaDataType}; use deltalake::logstore::{default_logstore, logstores, LogStore, LogStoreFactory}; use deltalake::operations::create::CreateBuilder; @@ -97,6 +98,7 @@ impl LogStoreFactory for FakeStoreFactory { /// DeltaField represents data types as stored in Delta Lake, with additional /// metadata for indicating the 'real' (original) type, for cases when /// downcasting occurs. +#[derive(Debug)] struct DeltaField { data_type: DeltaDataType, metadata: Option>, @@ -111,10 +113,9 @@ fn arrow_to_delta_safe(arrow_type: &DataType) -> DeltaResult { (&DataType::Timestamp(TimeUnit::Microsecond, tz.clone())).try_into()?; let mut metadata = HashMap::new(); metadata.insert("arrow_type".to_string(), json!(dtype)); - Ok(DeltaField { data_type: delta_type, - metadata: None, + metadata: Some(metadata), }) } dtype @ DataType::FixedSizeList(fld, _) => { @@ -216,7 +217,6 @@ impl NativeTableStorage { for col in &opts.columns { let delta_col = arrow_to_delta_safe(&col.arrow_type)?; - builder = builder.with_column( col.name.clone(), delta_col.data_type, @@ -225,8 +225,9 @@ impl NativeTableStorage { ); } + let delta_table = builder.await?; // TODO: Partitioning - NativeTable::new(builder.await?) + NativeTable::new(delta_table) }; Ok(tbl) @@ -356,6 +357,7 @@ impl NativeTable { } else { SaveMode::Append }; + let store = self.delta.log_store(); let snapshot = self.delta.state.clone(); Arc::new(NativeTableInsertExec::new( diff --git a/crates/datasources/src/native/insert.rs b/crates/datasources/src/native/insert.rs index 9bb79ff0b..ff55ea334 100644 --- a/crates/datasources/src/native/insert.rs +++ b/crates/datasources/src/native/insert.rs @@ -1,11 +1,14 @@ use std::any::Any; use std::sync::Arc; -use datafusion::arrow::datatypes::SchemaRef; +use datafusion::arrow::datatypes::{DataType, SchemaRef}; +use datafusion::common::ToDFSchema; use datafusion::error::{DataFusionError, Result as DataFusionResult}; use datafusion::execution::context::SessionState; use datafusion::execution::TaskContext; -use datafusion::physical_expr::PhysicalSortExpr; +use datafusion::logical_expr::{ident, Cast, Expr}; +use datafusion::physical_expr::{create_physical_expr, PhysicalSortExpr}; +use datafusion::physical_plan::projection::ProjectionExec; use datafusion::physical_plan::stream::RecordBatchStreamAdapter; use datafusion::physical_plan::{ DisplayAs, @@ -16,6 +19,7 @@ use datafusion::physical_plan::{ SendableRecordBatchStream, Statistics, }; +use deltalake::kernel::StructField; use deltalake::logstore::LogStore; use deltalake::operations::write::WriteBuilder; use deltalake::protocol::SaveMode; @@ -107,6 +111,51 @@ impl ExecutionPlan for NativeTableInsertExec { context.session_config().clone(), context.runtime_env(), ); + + let schema = self.input.schema(); + let fields = schema.fields().clone(); + let input_dfschema = schema.to_dfschema()?; + // delta-rs does not support all data types, so we need to check if the input schema + // contains any unsupported data types. + // If it does, we need to cast them to supported data types. + let mut contains_unsupported_fields = false; + let projections = fields + .iter() + .map(|field| { + let e = if StructField::try_from(field.as_ref()).is_ok() { + ident(field.name()) + } else { + contains_unsupported_fields = true; + + match field.data_type() { + DataType::Timestamp(_, _) => Expr::Cast(Cast { + expr: Box::new(ident(field.name())), + data_type: DataType::Timestamp( + datafusion::arrow::datatypes::TimeUnit::Microsecond, + None, + ), + }), + + dtype => { + return Err(DataFusionError::Execution(format!( + "Unsupported data type {:?} for field {}", + dtype, + field.name() + ))) + } + } + }; + let e = create_physical_expr(&e, &input_dfschema, state.execution_props()).unwrap(); + Ok((e, field.name().clone())) + }) + .collect::>>()?; + + let input = if contains_unsupported_fields { + Arc::new(ProjectionExec::try_new(projections, self.input.clone())?) + } else { + self.input.clone() + }; + // Allows writing multiple output partitions from the input execution // plan. // @@ -114,9 +163,8 @@ impl ExecutionPlan for NativeTableInsertExec { let builder = WriteBuilder::new(self.store.clone(), Some(self.snapshot.clone())) .with_input_session_state(state) .with_save_mode(self.save_mode.clone()) - .with_input_execution_plan(self.input.clone()); + .with_input_execution_plan(input.clone()); - let input = self.input.clone(); let output = futures::stream::once(async move { let _ = builder .await diff --git a/crates/datasources/src/object_store/mod.rs b/crates/datasources/src/object_store/mod.rs index b80e590e1..978b207b1 100644 --- a/crates/datasources/src/object_store/mod.rs +++ b/crates/datasources/src/object_store/mod.rs @@ -324,7 +324,8 @@ impl TableProvider for ObjStoreTableProvider { }) .boxed() .buffered(ctx.config_options().execution.meta_fetch_concurrency); - let (files, statistics) = get_statistics_with_limit(files, self.schema(), limit).await?; + let (files, statistics) = + get_statistics_with_limit(files, self.schema(), limit, true).await?; // If there are no files, return an empty exec plan. if files.is_empty() { diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs index 557cb1a44..964eebd47 100644 --- a/crates/parser/src/lib.rs +++ b/crates/parser/src/lib.rs @@ -629,13 +629,13 @@ impl<'a> CustomParser<'a> { self.parser.expect_token(&Token::RParen)?; CopyToSource::Query(query) } else { - let table_name = self.parser.parse_object_name()?; + let table_name = self.parser.parse_object_name(false)?; CopyToSource::Table(table_name) }; // TO 'source' self.parser.expect_keyword(Keyword::TO)?; - let dest = self.parser.parse_identifier()?; + let dest = self.parser.parse_identifier(false)?; // [FORMAT ..] let format = self.parse_data_format()?; @@ -670,7 +670,7 @@ impl<'a> CustomParser<'a> { let if_not_exists = self.parser .parse_keywords(&[Keyword::IF, Keyword::NOT, Keyword::EXISTS]); - let name = self.parser.parse_object_name()?; + let name = self.parser.parse_object_name(false)?; validate_object_name(&name)?; // FROM datasource @@ -733,7 +733,7 @@ impl<'a> CustomParser<'a> { self.parser .parse_keywords(&[Keyword::IF, Keyword::NOT, Keyword::EXISTS]); - let name = self.parser.parse_identifier()?; + let name = self.parser.parse_identifier(false)?; validate_ident(&name)?; // FROM datasource @@ -767,7 +767,7 @@ impl<'a> CustomParser<'a> { self.parser .parse_keywords(&[Keyword::IF, Keyword::NOT, Keyword::EXISTS]); - let name = self.parser.parse_identifier()?; + let name = self.parser.parse_identifier(false)?; validate_ident(&name)?; // FROM tunnel @@ -790,7 +790,7 @@ impl<'a> CustomParser<'a> { deprecated: bool, or_replace: bool, ) -> Result { - let name = self.parser.parse_identifier()?; + let name = self.parser.parse_identifier(false)?; validate_ident(&name)?; // PROVIDER credentials @@ -830,7 +830,7 @@ impl<'a> CustomParser<'a> { /// Example: `TUNNEL xyz`... fn parse_optional_ref(&mut self, k: &str) -> Result, ParserError> { let opt = if self.consume_token(&Token::make_keyword(k)) { - let opt = self.parser.parse_identifier()?; + let opt = self.parser.parse_identifier(false)?; validate_ident(&opt)?; Some(opt) } else { @@ -886,7 +886,7 @@ impl<'a> CustomParser<'a> { // TODO: Keep the options "key" as identifier so later we can // normalize it. - let key = self.parser.parse_identifier()?.value; + let key = self.parser.parse_identifier(false)?.value; // Optional `=` let _ = self.parser.consume_token(&Token::Eq); @@ -912,7 +912,7 @@ impl<'a> CustomParser<'a> { fn parse_options_value(&mut self) -> Result { let opt_val = if self.consume_token(&Token::make_keyword("SECRET")) { - OptionValue::Secret(self.parser.parse_identifier()?.value) + OptionValue::Secret(self.parser.parse_identifier(false)?.value) } else { let tok = self.parser.next_token(); match tok.token { @@ -983,7 +983,7 @@ impl<'a> CustomParser<'a> { let names = self .parser - .parse_comma_separated(Parser::parse_identifier)?; + .parse_comma_separated(|parser| parser.parse_identifier(false))?; for name in names.iter() { validate_ident(name)?; @@ -1000,7 +1000,7 @@ impl<'a> CustomParser<'a> { let names = self .parser - .parse_comma_separated(Parser::parse_identifier)?; + .parse_comma_separated(|parser| parser.parse_identifier(false))?; for name in names.iter() { validate_ident(name)?; @@ -1017,7 +1017,7 @@ impl<'a> CustomParser<'a> { let names = self .parser - .parse_comma_separated(Parser::parse_identifier)?; + .parse_comma_separated(|parser| parser.parse_identifier(false))?; for name in names.iter() { validate_ident(name)?; @@ -1029,18 +1029,18 @@ impl<'a> CustomParser<'a> { } fn parse_alter_database(&mut self) -> Result { - let name = self.parser.parse_identifier()?; + let name = self.parser.parse_identifier(false)?; validate_ident(&name)?; let operation = if self.parser.parse_keywords(&[Keyword::RENAME, Keyword::TO]) { - let new_name = self.parser.parse_identifier()?; + let new_name = self.parser.parse_identifier(false)?; validate_ident(&new_name)?; AlterDatabaseOperation::RenameDatabase { new_name } } else if self.parser.parse_keyword(Keyword::SET) { self.expect_token(&Token::make_keyword("ACCESS_MODE"))?; self.expect_token(&Token::make_keyword("TO"))?; - let access_mode = self.parser.parse_identifier()?; + let access_mode = self.parser.parse_identifier(false)?; AlterDatabaseOperation::SetAccessMode { access_mode } } else { return self.expected( @@ -1058,13 +1058,13 @@ impl<'a> CustomParser<'a> { fn parse_alter_table(&mut self) -> Result { let if_exists = self.parser.parse_keywords(&[Keyword::IF, Keyword::EXISTS]); let only = self.parser.parse_keyword(Keyword::ONLY); - let name = self.parser.parse_object_name()?; + let name = self.parser.parse_object_name(false)?; let operation = if self.parser.parse_keyword(Keyword::SET) { self.expect_token(&Token::make_keyword("ACCESS_MODE"))?; self.expect_token(&Token::make_keyword("TO"))?; - let access_mode = self.parser.parse_identifier()?; + let access_mode = self.parser.parse_identifier(false)?; AlterTableOperationExtension::SetAccessMode { access_mode } } else { let operations = self @@ -1088,7 +1088,7 @@ impl<'a> CustomParser<'a> { fn parse_alter_tunnel(&mut self) -> Result { let if_exists = self.parser.parse_keywords(&[Keyword::IF, Keyword::EXISTS]); - let name = self.parser.parse_identifier()?; + let name = self.parser.parse_identifier(false)?; validate_ident(&name)?; let mut action = None; diff --git a/crates/protogen/src/metastore/types/options.rs b/crates/protogen/src/metastore/types/options.rs index 003d69840..7299d2c95 100644 --- a/crates/protogen/src/metastore/types/options.rs +++ b/crates/protogen/src/metastore/types/options.rs @@ -3,6 +3,7 @@ use std::fmt::{self, Display}; use std::hash::Hash; use std::sync::Arc; +use datafusion::arrow::array::{ArrayRef, GenericStringArray, StructArray}; use datafusion::arrow::datatypes::{DataType, Field, Fields, SchemaRef}; use datafusion::common::DFSchemaRef; use serde::de::DeserializeOwned; @@ -1567,7 +1568,6 @@ impl From for options::TableOptionsSnowflake { } } - #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] pub struct DatabaseOptionsSqlite { pub location: String, @@ -1944,14 +1944,14 @@ impl CredentialsOptionsOpenAI { } impl From for datafusion::scalar::ScalarValue { fn from(value: CredentialsOptionsOpenAI) -> Self { - datafusion::scalar::ScalarValue::Struct( - Some(vec![ - datafusion::scalar::ScalarValue::Utf8(Some(value.api_key)), - datafusion::scalar::ScalarValue::Utf8(value.api_base), - datafusion::scalar::ScalarValue::Utf8(value.org_id), - ]), - CredentialsOptionsOpenAI::fields(), - ) + let arrays: Vec = vec![ + Arc::new(GenericStringArray::::from(vec![value.api_key])), + Arc::new(GenericStringArray::::from(vec![value.api_base])), + Arc::new(GenericStringArray::::from(vec![value.org_id])), + ]; + + let sa = StructArray::new(CredentialsOptionsOpenAI::fields(), arrays, None); + datafusion::scalar::ScalarValue::Struct(Arc::new(sa)) } } diff --git a/crates/sqlbuiltins/Cargo.toml b/crates/sqlbuiltins/Cargo.toml index e055d5318..7ddf79e5c 100644 --- a/crates/sqlbuiltins/Cargo.toml +++ b/crates/sqlbuiltins/Cargo.toml @@ -29,11 +29,16 @@ reqwest = { workspace = true } async-openai = "0.19.1" once_cell = "1.19.0" num-traits = "0.2.18" -strum = "0.25.0" +strum = "0.26.2" kdl = "5.0.0-alpha.1" siphasher = "1.0.1" fnv = "1.0.7" memoize = { version = "0.4.2", features = ["full"] } uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } -arrow-cast = { version = "50.0.0" } # MUST synchronize sync with the datafusion::arrow version -lance-linalg = { git = "https://github.com/GlareDB/lance", branch = "datafusion-without-submodules" } # omits duckdb submodule + +# MUST synchronize sync with the datafusion::arrow version +arrow-cast = { version = "50.0.0" } + +# omits duckdb submodule +lance-linalg = { git = "https://github.com/GlareDB/lance", branch = "df36" } +datafusion-functions-array = { version = "36.0.0" } diff --git a/crates/sqlbuiltins/src/functions/mod.rs b/crates/sqlbuiltins/src/functions/mod.rs index 88ce151c4..bf493fa4e 100644 --- a/crates/sqlbuiltins/src/functions/mod.rs +++ b/crates/sqlbuiltins/src/functions/mod.rs @@ -192,12 +192,14 @@ pub struct FunctionRegistry { impl FunctionRegistry { pub fn new() -> Self { use strum::IntoEnumIterator; - let scalars = BuiltinScalarFunction::iter().map(|f| { + let scalars = BuiltinScalarFunction::iter(); + let scalars = scalars.into_iter().map(|f| { let key = f.to_string().to_lowercase(); // Display impl is already lowercase for scalars, but lowercase here just to be sure. let value: Arc = Arc::new(f); (vec![key], value) }); - let aggregates = AggregateFunction::iter().map(|f| { + let aggregates = AggregateFunction::iter(); + let aggregates = aggregates.into_iter().map(|f| { let key = f.to_string().to_lowercase(); // Display impl is uppercase for aggregates. Lowercase it to be consistent. let value: Arc = Arc::new(f); (vec![key], value) @@ -313,15 +315,7 @@ impl FunctionRegistry { /// /// A function will only be returned once, even if it has multiple aliases. pub fn scalar_udfs_iter(&self) -> impl Iterator> { - self.udfs.values().filter(|func| { - // Currently we have two "array_to_string" entries, one provided by - // datafusion, and one "aliased" to "pg_catalog.array_to_string". - // However those exist in different maps, and so the current - // aliasing logic doesn't work well. - // - // See https://github.com/GlareDB/glaredb/issues/2371 - func.name() != "array_to_string" - }) + self.udfs.values() } /// Iterate over all table funcs. diff --git a/crates/sqlbuiltins/src/functions/scalars/df_scalars.rs b/crates/sqlbuiltins/src/functions/scalars/df_scalars.rs index df75c43f8..98fd833bc 100644 --- a/crates/sqlbuiltins/src/functions/scalars/df_scalars.rs +++ b/crates/sqlbuiltins/src/functions/scalars/df_scalars.rs @@ -672,8 +672,43 @@ document! { doc => "Resize an array to the specified length", example => "array_resize([1, 2, 3], 5, 0)", name => array_resize +} + +document! { + doc => "Reverse the elements of an array", + example => "array_reverse([1, 2, 3])", + name => array_reverse +} + +document! { + doc => "Returns true if value ends with the specified suffix", + example => "ends_with('hello', 'lo')", + name => ends_with +} + +document! { + doc => "Returns the position of the first occurrence of substring in string", + example => "instr('hello', 'el')", + name => instr +} +document! { + doc => "Returns true if the string matches the regular expression", + example => "regexp_like('hello', 'el')", + name => regexp_like +} + +document! { + doc => "Create a date from year, month, and day", + example => "make_date(2020, 1, 1)", + name => make_date } +document! { + doc => "Converts a date to a string", + example => "to_char(make_date(2020, 1, 1), 'YYYY-MM-DD')", + name => to_char +} + impl BuiltinFunction for BuiltinScalarFunction { fn function_type(&self) -> FunctionType { FunctionType::Scalar @@ -700,7 +735,6 @@ impl BuiltinFunction for BuiltinScalarFunction { Factorial => factorial::NAME, Floor => floor::NAME, Gcd => gcd::NAME, - Isnan => isnan::NAME, Iszero => iszero::NAME, Lcm => lcm::NAME, Ln => ln::NAME, @@ -721,7 +755,6 @@ impl BuiltinFunction for BuiltinScalarFunction { Tanh => tanh::NAME, Trunc => trunc::NAME, Coalesce => coalesce::NAME, - NullIf => nullif::NAME, Ascii => ascii::NAME, BitLength => bit_length::NAME, Btrim => btrim::NAME, @@ -771,8 +804,6 @@ impl BuiltinFunction for BuiltinScalarFunction { SHA256 => sha256::NAME, SHA384 => sha384::NAME, SHA512 => sha512::NAME, - Encode => encode::NAME, - Decode => decode::NAME, ArrowTypeof => arrow_typeof::NAME, ArrayAppend => array_append::NAME, ArrayConcat => array_concat::NAME, @@ -797,7 +828,6 @@ impl BuiltinFunction for BuiltinScalarFunction { ArrayReplaceN => array_replace_n::NAME, ArrayReplaceAll => array_replace_all::NAME, ArraySlice => array_slice::NAME, - ArrayToString => array_to_string::NAME, ArraySort => array_sort::NAME, ArrayPopFront => array_pop_front::NAME, ArrayDistinct => array_distinct::NAME, @@ -813,6 +843,13 @@ impl BuiltinFunction for BuiltinScalarFunction { FindInSet => find_in_set::NAME, Struct => struct_::NAME, ArrayResize => array_resize::NAME, + + ArrayReverse => array_reverse::NAME, + EndsWith => ends_with::NAME, + InStr => instr::NAME, + RegexpLike => regexp_like::NAME, + MakeDate => make_date::NAME, + ToChar => to_char::NAME, } } @@ -837,7 +874,6 @@ impl BuiltinFunction for BuiltinScalarFunction { Factorial => factorial::EXAMPLE, Floor => floor::EXAMPLE, Gcd => gcd::EXAMPLE, - Isnan => isnan::EXAMPLE, Iszero => iszero::EXAMPLE, Lcm => lcm::EXAMPLE, Ln => ln::EXAMPLE, @@ -858,7 +894,6 @@ impl BuiltinFunction for BuiltinScalarFunction { Tanh => tanh::EXAMPLE, Trunc => trunc::EXAMPLE, Coalesce => coalesce::EXAMPLE, - NullIf => nullif::EXAMPLE, Ascii => ascii::EXAMPLE, BitLength => bit_length::EXAMPLE, Btrim => btrim::EXAMPLE, @@ -908,8 +943,6 @@ impl BuiltinFunction for BuiltinScalarFunction { SHA256 => sha256::EXAMPLE, SHA384 => sha384::EXAMPLE, SHA512 => sha512::EXAMPLE, - Encode => encode::EXAMPLE, - Decode => decode::EXAMPLE, ArrowTypeof => arrow_typeof::EXAMPLE, ArrayAppend => array_append::EXAMPLE, ArrayConcat => array_concat::EXAMPLE, @@ -934,7 +967,6 @@ impl BuiltinFunction for BuiltinScalarFunction { ArrayReplaceN => array_replace_n::EXAMPLE, ArrayReplaceAll => array_replace_all::EXAMPLE, ArraySlice => array_slice::EXAMPLE, - ArrayToString => array_to_string::EXAMPLE, ArraySort => array_sort::EXAMPLE, ArrayPopFront => array_pop_front::EXAMPLE, ArrayDistinct => array_distinct::EXAMPLE, @@ -950,6 +982,12 @@ impl BuiltinFunction for BuiltinScalarFunction { FindInSet => find_in_set::EXAMPLE, Struct => struct_::EXAMPLE, ArrayResize => array_resize::EXAMPLE, + ArrayReverse => array_reverse::EXAMPLE, + EndsWith => ends_with::EXAMPLE, + InStr => instr::EXAMPLE, + RegexpLike => regexp_like::EXAMPLE, + MakeDate => make_date::EXAMPLE, + ToChar => to_char::EXAMPLE, }) } @@ -974,7 +1012,6 @@ impl BuiltinFunction for BuiltinScalarFunction { Factorial => factorial::DESCRIPTION, Floor => floor::DESCRIPTION, Gcd => gcd::DESCRIPTION, - Isnan => isnan::DESCRIPTION, Iszero => iszero::DESCRIPTION, Lcm => lcm::DESCRIPTION, Ln => ln::DESCRIPTION, @@ -995,7 +1032,6 @@ impl BuiltinFunction for BuiltinScalarFunction { Tanh => tanh::DESCRIPTION, Trunc => trunc::DESCRIPTION, Coalesce => coalesce::DESCRIPTION, - NullIf => nullif::DESCRIPTION, Ascii => ascii::DESCRIPTION, BitLength => bit_length::DESCRIPTION, Btrim => btrim::DESCRIPTION, @@ -1045,8 +1081,6 @@ impl BuiltinFunction for BuiltinScalarFunction { SHA256 => sha256::DESCRIPTION, SHA384 => sha384::DESCRIPTION, SHA512 => sha512::DESCRIPTION, - Encode => encode::DESCRIPTION, - Decode => decode::DESCRIPTION, ArrowTypeof => arrow_typeof::DESCRIPTION, ArrayAppend => array_append::DESCRIPTION, ArrayConcat => array_concat::DESCRIPTION, @@ -1071,7 +1105,6 @@ impl BuiltinFunction for BuiltinScalarFunction { ArrayReplaceN => array_replace_n::DESCRIPTION, ArrayReplaceAll => array_replace_all::DESCRIPTION, ArraySlice => array_slice::DESCRIPTION, - ArrayToString => array_to_string::DESCRIPTION, ArraySort => array_sort::DESCRIPTION, ArrayPopFront => array_pop_front::DESCRIPTION, ArrayDistinct => array_distinct::DESCRIPTION, @@ -1087,6 +1120,12 @@ impl BuiltinFunction for BuiltinScalarFunction { FindInSet => find_in_set::DESCRIPTION, Struct => struct_::DESCRIPTION, ArrayResize => array_resize::DESCRIPTION, + ArrayReverse => array_reverse::DESCRIPTION, + EndsWith => ends_with::DESCRIPTION, + InStr => instr::DESCRIPTION, + RegexpLike => regexp_like::DESCRIPTION, + MakeDate => make_date::DESCRIPTION, + ToChar => to_char::DESCRIPTION, }) } } diff --git a/crates/sqlbuiltins/src/functions/scalars/hashing.rs b/crates/sqlbuiltins/src/functions/scalars/hashing.rs index 64721045f..cd0bbfedf 100644 --- a/crates/sqlbuiltins/src/functions/scalars/hashing.rs +++ b/crates/sqlbuiltins/src/functions/scalars/hashing.rs @@ -6,6 +6,7 @@ use datafusion::arrow::datatypes::DataType; use datafusion::error::{DataFusionError, Result as DataFusionResult}; use datafusion::logical_expr::expr::ScalarFunction; use datafusion::logical_expr::{ + ColumnarValue, ReturnTypeFunction, ScalarFunctionImplementation, ScalarUDF, @@ -19,7 +20,7 @@ use fnv::FnvHasher; use protogen::metastore::types::catalog::FunctionType; use siphasher::sip::SipHasher24; -use super::{get_nth_scalar_value, get_nth_u64_fn_arg}; +use super::{apply_op_to_col_array, get_nth_scalar_value, get_nth_u64_fn_arg}; use crate::errors::BuiltinError; use crate::functions::{BuiltinScalarUDF, ConstBuiltinFunction}; @@ -33,9 +34,8 @@ impl ConstBuiltinFunction for SipHash { const FUNCTION_TYPE: FunctionType = FunctionType::Scalar; fn signature(&self) -> Option { - Some(Signature::new( - // args: - TypeSignature::Any(1), + Some(Signature::one_of( + vec![TypeSignature::Any(0), TypeSignature::Any(1)], Volatility::Immutable, )) } @@ -44,14 +44,35 @@ impl BuiltinScalarUDF for SipHash { fn try_as_expr(&self, _: &SessionCatalog, args: Vec) -> DataFusionResult { let return_type_fn: ReturnTypeFunction = Arc::new(|_| Ok(Arc::new(DataType::UInt64))); let scalar_fn_impl: ScalarFunctionImplementation = Arc::new(move |input| { - Ok(get_nth_scalar_value(input, 0, &|value| -> Result< - ScalarValue, - BuiltinError, - > { - let mut hasher = SipHasher24::new(); - value.hash(&mut hasher); - Ok(ScalarValue::UInt64(Some(hasher.finish()))) - })?) + Ok(match input { + [] => { + let mut hasher = SipHasher24::new(); + let value = ScalarValue::Null; + value.hash(&mut hasher); + ColumnarValue::Scalar(ScalarValue::UInt64(Some(hasher.finish()))) + } + [ColumnarValue::Scalar(scalar)] => { + let mut hasher = SipHasher24::new(); + scalar.hash(&mut hasher); + ColumnarValue::Scalar(ScalarValue::UInt64(Some(hasher.finish()))) + } + [ColumnarValue::Array(array)] => { + let out = apply_op_to_col_array(array, &|value| -> Result< + ScalarValue, + BuiltinError, + > { + let mut hasher = SipHasher24::new(); + value.hash(&mut hasher); + Ok(ScalarValue::UInt64(Some(hasher.finish()))) + })?; + ColumnarValue::Array(out) + } + _ => { + return Err(DataFusionError::Internal( + "siphash expects exactly one argument".to_string(), + )); + } + }) }); let udf = ScalarUDF::new( Self::NAME, @@ -76,9 +97,8 @@ impl ConstBuiltinFunction for FnvHash { const FUNCTION_TYPE: FunctionType = FunctionType::Scalar; fn signature(&self) -> Option { - Some(Signature::new( - // args: - TypeSignature::Any(1), + Some(Signature::one_of( + vec![TypeSignature::Any(0), TypeSignature::Any(1)], Volatility::Immutable, )) } @@ -88,14 +108,35 @@ impl BuiltinScalarUDF for FnvHash { fn try_as_expr(&self, _: &SessionCatalog, args: Vec) -> DataFusionResult { let return_type_fn: ReturnTypeFunction = Arc::new(|_| Ok(Arc::new(DataType::UInt64))); let scalar_fn_impl: ScalarFunctionImplementation = Arc::new(move |input| { - Ok(get_nth_scalar_value(input, 0, &|value| -> Result< - ScalarValue, - BuiltinError, - > { - let mut hasher = FnvHasher::default(); - value.hash(&mut hasher); - Ok(ScalarValue::UInt64(Some(hasher.finish()))) - })?) + Ok(match input { + [] => { + let mut hasher = FnvHasher::default(); + let value = ScalarValue::Null; + value.hash(&mut hasher); + ColumnarValue::Scalar(ScalarValue::UInt64(Some(hasher.finish()))) + } + [ColumnarValue::Scalar(scalar)] => { + let mut hasher = FnvHasher::default(); + scalar.hash(&mut hasher); + ColumnarValue::Scalar(ScalarValue::UInt64(Some(hasher.finish()))) + } + [ColumnarValue::Array(array)] => { + let out = apply_op_to_col_array(array, &|value| -> Result< + ScalarValue, + BuiltinError, + > { + let mut hasher = FnvHasher::default(); + value.hash(&mut hasher); + Ok(ScalarValue::UInt64(Some(hasher.finish()))) + })?; + ColumnarValue::Array(out) + } + _ => { + return Err(DataFusionError::Internal( + "fnvhash expects exactly one argument".to_string(), + )); + } + }) }); let udf = ScalarUDF::new( Self::NAME, diff --git a/crates/sqlbuiltins/src/functions/scalars/openai.rs b/crates/sqlbuiltins/src/functions/scalars/openai.rs index 3ead517a8..54dab5aa6 100644 --- a/crates/sqlbuiltins/src/functions/scalars/openai.rs +++ b/crates/sqlbuiltins/src/functions/scalars/openai.rs @@ -130,24 +130,29 @@ impl BuiltinScalarUDF for OpenAIEmbed { match scalar.ok()? { ScalarValue::Utf8(v) => Some(OpenAIConfig::new().with_api_key(v.unwrap())), - ScalarValue::Struct(Some(values), _) => { - let api_key = values.first()?; - let api_base = values.get(1); - let org_id = values.get(2); - let api_key = match api_key { - ScalarValue::Utf8(v) => v.clone().unwrap(), - _ => return None, - }; - let mut config = OpenAIConfig::new().with_api_key(api_key); - config = match api_base { - Some(ScalarValue::Utf8(Some(v))) => config.with_api_base(v.clone()), - _ => config, - }; - config = match org_id { - Some(ScalarValue::Utf8(Some(v))) => config.with_org_id(v.clone()), - _ => config, - }; - Some(config) + ScalarValue::Struct(sa) => { + let api_key = sa + .column_by_name("api_key") + .map(|c| c.as_string::().value(0)); + let api_base = sa + .column_by_name("api_base") + .map(|c| c.as_string::().value(0)); + let org_id = sa + .column_by_name("org_id") + .map(|c| c.as_string::().value(0)); + + if let Some(api_key) = api_key { + let mut config = OpenAIConfig::new().with_api_key(api_key); + if let Some(api_base) = api_base { + config = config.with_api_base(api_base); + } + if let Some(org_id) = org_id { + config = config.with_org_id(org_id); + } + Some(config) + } else { + return None; + } } _ => None, } diff --git a/crates/sqlbuiltins/src/functions/scalars/postgres.rs b/crates/sqlbuiltins/src/functions/scalars/postgres.rs index 692ecc4ba..cc670d1c2 100644 --- a/crates/sqlbuiltins/src/functions/scalars/postgres.rs +++ b/crates/sqlbuiltins/src/functions/scalars/postgres.rs @@ -2,10 +2,9 @@ use std::sync::Arc; use catalog::session_catalog::SessionCatalog; use datafusion::arrow::datatypes::{DataType, Field}; -use datafusion::error::Result as DataFusionResult; +use datafusion::error::{DataFusionError, Result as DataFusionResult}; use datafusion::logical_expr::expr::ScalarFunction; use datafusion::logical_expr::{ - BuiltinScalarFunction, ReturnTypeFunction, ScalarFunctionImplementation, ScalarUDF, @@ -105,7 +104,6 @@ impl BuiltinScalarUDF for PgTableIsVisible { &return_type_fn, &scalar_fn_impl, ); - Ok(Expr::ScalarFunction(ScalarFunction::new_udf( Arc::new(udf), args, @@ -476,9 +474,6 @@ impl BuiltinScalarUDF for User { } } -// This one is a bit different from the others as it's also handled via -// datafusion. So all we need to do is add it to the pg_catalog namespace and -// map it to the df implementation #[derive(Clone, Copy, Debug)] pub struct PgArrayToString; @@ -488,20 +483,26 @@ impl ConstBuiltinFunction for PgArrayToString { const EXAMPLE: &'static str = array_to_string::EXAMPLE; const FUNCTION_TYPE: FunctionType = FunctionType::Scalar; fn signature(&self) -> Option { - Some(BuiltinScalarFunction::ArrayToString.signature()) + // Datafusion doesn't have a good way to represent the signature of this function + None } } impl BuiltinScalarUDF for PgArrayToString { fn try_as_expr(&self, _: &SessionCatalog, args: Vec) -> DataFusionResult { - Ok(Expr::ScalarFunction(ScalarFunction::new( - BuiltinScalarFunction::ArrayToString, - args, - ))) + if args.len() < 2 || args.len() > 3 { + return Err(DataFusionError::Plan( + "array_to_string() takes exactly two or three arguments".to_string(), + )); + } + Ok(datafusion_functions_array::expr_fn::array_to_string( + args[0].clone(), + args[1].clone(), + )) } fn namespace(&self) -> FunctionNamespace { - FunctionNamespace::Required("pg_catalog") + FunctionNamespace::Optional("pg_catalog") } } diff --git a/crates/sqlbuiltins/src/functions/scalars/similarity.rs b/crates/sqlbuiltins/src/functions/scalars/similarity.rs index 94a002433..862bf5f8e 100644 --- a/crates/sqlbuiltins/src/functions/scalars/similarity.rs +++ b/crates/sqlbuiltins/src/functions/scalars/similarity.rs @@ -62,7 +62,7 @@ fn arr_to_query_vec( dtype @ DataType::List(fld) => match fld.data_type() { DataType::Float64 | DataType::Float16 | DataType::Float32 => { let arr = arr.as_any().downcast_ref::().unwrap().value(0); - arrow_cast::cast(&arr, to_type)? + arrow_cast::cast(arr.as_ref(), to_type)? } _ => { return Err(DataFusionError::Execution(format!( diff --git a/crates/sqlexec/src/planner/session_planner.rs b/crates/sqlexec/src/planner/session_planner.rs index 5989d5d5f..254e7192c 100644 --- a/crates/sqlexec/src/planner/session_planner.rs +++ b/crates/sqlexec/src/planner/session_planner.rs @@ -820,7 +820,6 @@ impl<'a> SessionPlanner<'a> { opts.inner .insert(AzureConfigKey::AccessKey.as_ref().to_string(), access_key); - TableOptionsV0::Azure(TableOptionsObjectStore { name: None, location: source_url, @@ -969,7 +968,6 @@ impl<'a> SessionPlanner<'a> { })?; } - let schema = stmt .columns .map(|columns| { @@ -1006,7 +1004,6 @@ impl<'a> SessionPlanner<'a> { .get_tbl_opts_from_v0(datasource.as_str(), m, creds_options, tunnel_options) .await?; - let table_name = object_name_to_table_ref(stmt.name)?; let plan = CreateExternalTable { @@ -1298,13 +1295,13 @@ impl<'a> SessionPlanner<'a> { name, columns, query, - with_options, + options, .. } => { validate_object_name(&name)?; let name = object_name_to_table_ref(name)?; - if !with_options.is_empty() { + if !matches!(options, ast::CreateTableOptions::None) { return Err(PlanError::UnsupportedFeature("view options")); } @@ -1324,7 +1321,10 @@ impl<'a> SessionPlanner<'a> { let mut planner = SqlQueryPlanner::new(&mut context_provider); let input = planner.query_to_plan(*query).await?; - let columns: Vec<_> = columns.into_iter().map(normalize_ident).collect(); + let columns: Vec<_> = columns + .into_iter() + .map(|col| normalize_ident(col.name)) + .collect(); // Only validate number of aliases equals number of fields in // the ouput if aliases were actually provided. if !columns.is_empty() && input.schema().fields().len() != columns.len() { @@ -1356,6 +1356,7 @@ impl<'a> SessionPlanner<'a> { on: None, returning: None, ignore: _, + .. } if after_columns.is_empty() => { let source = source.ok_or(PlanError::InvalidInsertStatement { msg: "Nothing to insert: source empty", @@ -2355,7 +2356,10 @@ fn convert_simple_data_type(sql_type: &ast::DataType) -> Result { | ast::DataType::BigNumeric(_) | ast::DataType::BigDecimal(_) | ast::DataType::Struct(_) - | ast::DataType::Clob(_) => Err(internal!( + | ast::DataType::Clob(_) + | ast::DataType::JSONB + | ast::DataType::Unspecified + => Err(internal!( "Unsupported SQL type {:?}", sql_type )), diff --git a/testdata/sqllogictests/datatypes.slt b/testdata/sqllogictests/datatypes.slt index 25e78dd6f..0c4ab519e 100644 --- a/testdata/sqllogictests/datatypes.slt +++ b/testdata/sqllogictests/datatypes.slt @@ -27,12 +27,13 @@ select distinct arrow_typeof(f) from test ---- FixedSizeList(Field { name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: {} }, 2) - # array functions don't work on fixed size lists statement error select array_element(1, f) from test; -statement error +# but this one does work? +# TODO: should this be allowed? +statement ok select array_append(f, 3) from test; diff --git a/testdata/sqllogictests/functions/hashing.slt b/testdata/sqllogictests/functions/hashing.slt index afce0068f..93c5fbc21 100644 --- a/testdata/sqllogictests/functions/hashing.slt +++ b/testdata/sqllogictests/functions/hashing.slt @@ -58,7 +58,7 @@ select siphash('42'); query I select siphash([0, 100, 100, 300, 500, 800]); ---- -4101357204800564241 +4492675455749706323 query I select fnv(); @@ -83,7 +83,7 @@ select fnv('42'); query I select fnv([0, 100, 100, 300, 500, 800]); ---- -14186027448029747613 +18410388893443824429 # rerun some earlier cases to ensure we're not accidentally stateful From 8dd2d34cc56ddb1eba229dcf6226d588c036cdde Mon Sep 17 00:00:00 2001 From: universalmind303 Date: Thu, 4 Apr 2024 11:17:26 -0500 Subject: [PATCH 2/3] add df functions back in --- crates/datafusion_ext/src/planner/mod.rs | 1 - crates/datasources/src/native/insert.rs | 4 +- crates/sqlbuiltins/src/functions/mod.rs | 6 + .../src/functions/scalars/df_scalars.rs | 180 ++++++++++++++++++ .../src/functions/scalars/openai.rs | 2 +- crates/sqlexec/src/planner/session_planner.rs | 4 +- 6 files changed, 191 insertions(+), 6 deletions(-) diff --git a/crates/datafusion_ext/src/planner/mod.rs b/crates/datafusion_ext/src/planner/mod.rs index 747aefa4e..f11e8f8c1 100644 --- a/crates/datafusion_ext/src/planner/mod.rs +++ b/crates/datafusion_ext/src/planner/mod.rs @@ -326,7 +326,6 @@ impl<'a, S: AsyncContextProvider> SqlQueryPlanner<'a, S> { | SQLDataType::Struct(_) | SQLDataType::JSONB | SQLDataType::Unspecified - => not_impl_err!( "Unsupported SQL type {sql_type:?}" ), diff --git a/crates/datasources/src/native/insert.rs b/crates/datasources/src/native/insert.rs index ff55ea334..830f8a20c 100644 --- a/crates/datasources/src/native/insert.rs +++ b/crates/datasources/src/native/insert.rs @@ -90,7 +90,7 @@ impl ExecutionPlan for NativeTableInsertExec { input: children[0].clone(), store: self.store.clone(), snapshot: self.snapshot.clone(), - save_mode: self.save_mode.clone(), + save_mode: self.save_mode, })) } @@ -162,7 +162,7 @@ impl ExecutionPlan for NativeTableInsertExec { // TODO: Possibly try avoiding cloning the snapshot. let builder = WriteBuilder::new(self.store.clone(), Some(self.snapshot.clone())) .with_input_session_state(state) - .with_save_mode(self.save_mode.clone()) + .with_save_mode(self.save_mode) .with_input_execution_plan(input.clone()); let output = futures::stream::once(async move { diff --git a/crates/sqlbuiltins/src/functions/mod.rs b/crates/sqlbuiltins/src/functions/mod.rs index bf493fa4e..eef98e97f 100644 --- a/crates/sqlbuiltins/src/functions/mod.rs +++ b/crates/sqlbuiltins/src/functions/mod.rs @@ -40,6 +40,7 @@ use scalars::{ConnectionId, Version}; use table::{BuiltinTableFuncs, TableFunc}; use self::alias_map::AliasMap; +use crate::functions::scalars::df_scalars::{Decode, Encode, IsNan, NullIf}; use crate::functions::scalars::openai::OpenAIEmbed; use crate::functions::scalars::similarity::CosineSimilarity; @@ -214,6 +215,11 @@ impl FunctionRegistry { // GlareDB specific functions let udfs: Vec> = vec![ + // Datafusion functions that aren't part of BuiltinScalarFunction + Arc::new(IsNan), + Arc::new(NullIf), + Arc::new(Encode), + Arc::new(Decode), // Postgres functions Arc::new(HasSchemaPrivilege), Arc::new(HasDatabasePrivilege), diff --git a/crates/sqlbuiltins/src/functions/scalars/df_scalars.rs b/crates/sqlbuiltins/src/functions/scalars/df_scalars.rs index 98fd833bc..c10bbd043 100644 --- a/crates/sqlbuiltins/src/functions/scalars/df_scalars.rs +++ b/crates/sqlbuiltins/src/functions/scalars/df_scalars.rs @@ -4,7 +4,11 @@ #![allow(non_camel_case_types)] +use datafusion::arrow::datatypes::DataType; +use datafusion::logical_expr::{Signature, TypeSignature, Volatility}; + use super::{document, BuiltinFunction, BuiltinScalarFunction, ConstBuiltinFunction, FunctionType}; +use crate::functions::BuiltinScalarUDF; #[derive(Debug, Clone, Copy)] pub struct ArrowCastFunction; @@ -1129,3 +1133,179 @@ impl BuiltinFunction for BuiltinScalarFunction { }) } } + +// The rest of these functions are ones that are implemented using datafusion's new function system. +// Until 37.1.0 is released, we need to redefine these functions here instead of using the ones in datafusion +// because they are not public. (only the `expr` is public, not the struct itself) +// see https://github.com/apache/arrow-datafusion/pull/9903 + +#[derive(Debug, Clone, Copy)] +pub struct IsNan; + +impl ConstBuiltinFunction for IsNan { + const NAME: &'static str = "isnan"; + const DESCRIPTION: &'static str = "Returns true if the argument is NaN, false otherwise."; + const EXAMPLE: &'static str = "isnan(0.0)"; + const FUNCTION_TYPE: FunctionType = FunctionType::Scalar; + fn signature(&self) -> Option { + Some(Signature::one_of( + vec![ + TypeSignature::Exact(vec![DataType::Float32]), + TypeSignature::Exact(vec![DataType::Float64]), + ], + Volatility::Immutable, + )) + } +} + +impl BuiltinScalarUDF for IsNan { + fn try_as_expr( + &self, + _: &catalog::session_catalog::SessionCatalog, + args: Vec, + ) -> datafusion::error::Result { + if args.len() != 1 { + return Err(datafusion::error::DataFusionError::Execution( + "isnan() takes exactly one argument".to_string(), + )); + } + Ok(datafusion::functions::math::expr_fn::isnan(args[0].clone())) + } +} +#[derive(Debug, Clone, Copy)] +pub struct NullIf; + +/// Currently supported types by the nullif function. +/// The order of these types correspond to the order on which coercion applies +/// This should thus be from least informative to most informative +static SUPPORTED_NULLIF_TYPES: &[DataType] = &[ + DataType::Boolean, + DataType::UInt8, + DataType::UInt16, + DataType::UInt32, + DataType::UInt64, + DataType::Int8, + DataType::Int16, + DataType::Int32, + DataType::Int64, + DataType::Float32, + DataType::Float64, + DataType::Utf8, + DataType::LargeUtf8, +]; + +impl ConstBuiltinFunction for NullIf { + const NAME: &'static str = "nullif"; + const DESCRIPTION: &'static str = + "Returns null if the two arguments are equal, otherwise returns the first argument."; + const EXAMPLE: &'static str = "nullif(1, 1)"; + const FUNCTION_TYPE: FunctionType = FunctionType::Scalar; + fn signature(&self) -> Option { + Some(Signature::uniform( + 2, + SUPPORTED_NULLIF_TYPES.to_vec(), + Volatility::Immutable, + )) + } +} + +impl BuiltinScalarUDF for NullIf { + fn try_as_expr( + &self, + _: &catalog::session_catalog::SessionCatalog, + args: Vec, + ) -> datafusion::error::Result { + if args.len() != 2 { + return Err(datafusion::error::DataFusionError::Execution( + "nullif() takes exactly two arguments".to_string(), + )); + } + Ok(datafusion::functions::expr_fn::nullif( + args[0].clone(), + args[1].clone(), + )) + } +} + +#[derive(Debug, Clone, Copy)] +pub struct Encode; + +impl ConstBuiltinFunction for Encode { + const NAME: &'static str = encode::NAME; + const DESCRIPTION: &'static str = encode::DESCRIPTION; + const EXAMPLE: &'static str = encode::EXAMPLE; + const FUNCTION_TYPE: FunctionType = FunctionType::Scalar; + fn signature(&self) -> Option { + use DataType::*; + use TypeSignature::*; + + Some(Signature::one_of( + vec![ + Exact(vec![Utf8, Utf8]), + Exact(vec![LargeUtf8, Utf8]), + Exact(vec![Binary, Utf8]), + Exact(vec![LargeBinary, Utf8]), + ], + Volatility::Immutable, + )) + } +} + +impl BuiltinScalarUDF for Encode { + fn try_as_expr( + &self, + _: &catalog::session_catalog::SessionCatalog, + args: Vec, + ) -> datafusion::error::Result { + if args.len() != 2 { + return Err(datafusion::error::DataFusionError::Execution( + "encode() takes exactly two arguments".to_string(), + )); + } + Ok(datafusion::functions::expr_fn::encode( + args[0].clone(), + args[1].clone(), + )) + } +} + +#[derive(Debug, Clone, Copy)] +pub struct Decode; +impl ConstBuiltinFunction for Decode { + const NAME: &'static str = decode::NAME; + const DESCRIPTION: &'static str = decode::DESCRIPTION; + const EXAMPLE: &'static str = decode::EXAMPLE; + const FUNCTION_TYPE: FunctionType = FunctionType::Scalar; + fn signature(&self) -> Option { + use DataType::*; + use TypeSignature::*; + + Some(Signature::one_of( + vec![ + Exact(vec![Utf8, Utf8]), + Exact(vec![LargeUtf8, Utf8]), + Exact(vec![Binary, Utf8]), + Exact(vec![LargeBinary, Utf8]), + ], + Volatility::Immutable, + )) + } +} + +impl BuiltinScalarUDF for Decode { + fn try_as_expr( + &self, + _: &catalog::session_catalog::SessionCatalog, + args: Vec, + ) -> datafusion::error::Result { + if args.len() != 2 { + return Err(datafusion::error::DataFusionError::Execution( + "decode() takes exactly two arguments".to_string(), + )); + } + Ok(datafusion::functions::expr_fn::decode( + args[0].clone(), + args[1].clone(), + )) + } +} diff --git a/crates/sqlbuiltins/src/functions/scalars/openai.rs b/crates/sqlbuiltins/src/functions/scalars/openai.rs index 54dab5aa6..be4010853 100644 --- a/crates/sqlbuiltins/src/functions/scalars/openai.rs +++ b/crates/sqlbuiltins/src/functions/scalars/openai.rs @@ -151,7 +151,7 @@ impl BuiltinScalarUDF for OpenAIEmbed { } Some(config) } else { - return None; + None } } _ => None, diff --git a/crates/sqlexec/src/planner/session_planner.rs b/crates/sqlexec/src/planner/session_planner.rs index 254e7192c..2531c9323 100644 --- a/crates/sqlexec/src/planner/session_planner.rs +++ b/crates/sqlexec/src/planner/session_planner.rs @@ -2356,8 +2356,8 @@ fn convert_simple_data_type(sql_type: &ast::DataType) -> Result { | ast::DataType::BigNumeric(_) | ast::DataType::BigDecimal(_) | ast::DataType::Struct(_) - | ast::DataType::Clob(_) - | ast::DataType::JSONB + | ast::DataType::Clob(_) + | ast::DataType::JSONB | ast::DataType::Unspecified => Err(internal!( "Unsupported SQL type {:?}", From 851abcc2170951870dc7660f0173f1ae0800a4e4 Mon Sep 17 00:00:00 2001 From: universalmind303 Date: Mon, 8 Apr 2024 09:25:33 -0500 Subject: [PATCH 3/3] fix bad commit --- Cargo.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index af1f54c93..7d8aab01e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6804,8 +6804,8 @@ dependencies = [ "nu-ansi-term 0.50.0", "serde", "strip-ansi-escapes", - "strum 0.26.1", - "strum_macros 0.26.1", + "strum 0.26.2", + "strum_macros 0.26.2", "thiserror", "unicode-segmentation", "unicode-width", @@ -9411,15 +9411,6 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasite" version = "0.1.0" -<<<<<<< HEAD -======= -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" ->>>>>>> a2c69e723133f0eab013d9cfe78a905f04f6618a source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" @@ -9565,7 +9556,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "redox_syscall 0.4.1", + "redox_syscall", "wasite", "web-sys", ]