From 58d07e0e6234bbb3aa107717dd1e51eceeffbde5 Mon Sep 17 00:00:00 2001 From: JeremyHi Date: Wed, 30 Aug 2023 19:19:06 +0800 Subject: [PATCH] feat: v04 rm unused exprs (#2285) * feat: rm compact and flush exprs * refactor: continue to rm compact and flush --- Cargo.lock | 621 ++++++++++++----------- Cargo.toml | 2 +- src/api/src/helper.rs | 2 - src/client/examples/logical.rs | 2 +- src/client/src/database.rs | 54 +- src/client/src/metrics.rs | 2 - src/client/src/region.rs | 8 +- src/cmd/src/cli/repl.rs | 2 +- src/common/grpc-expr/src/alter.rs | 8 +- src/common/query/src/lib.rs | 4 +- src/datanode/src/instance/grpc.rs | 6 +- src/datanode/src/server/grpc.rs | 54 +- src/frontend/src/instance.rs | 7 +- src/frontend/src/instance/distributed.rs | 141 +---- src/query/src/dist_plan/merge_scan.rs | 5 +- src/servers/src/grpc/greptime_handler.rs | 2 +- src/servers/src/http.rs | 16 - src/servers/src/http/admin.rs | 112 ---- src/sql/src/statements.rs | 4 +- tests-integration/src/grpc.rs | 125 +---- tests-integration/src/tests.rs | 42 -- tests-integration/tests/sql.rs | 7 +- 22 files changed, 373 insertions(+), 853 deletions(-) delete mode 100644 src/servers/src/http/admin.rs diff --git a/Cargo.lock b/Cargo.lock index f89cf85f08..fc681d7867 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -64,9 +64,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -144,24 +144,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -183,9 +182,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -193,9 +192,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "anymap" @@ -391,7 +390,7 @@ dependencies = [ "arrow-cast", "arrow-ipc", "arrow-schema", - "base64 0.21.2", + "base64 0.21.3", "bytes", "futures", "paste", @@ -500,7 +499,7 @@ dependencies = [ "arrow-select", "num", "regex", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -552,9 +551,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "d495b6dc0184693324491a5ac05f559acc97bf937ab31d7a1c33dd0016be6d2b" dependencies = [ "bzip2", "flate2", @@ -605,7 +604,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -627,7 +626,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -638,7 +637,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -770,7 +769,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -804,9 +803,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -825,9 +824,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "base64ct" @@ -850,7 +849,7 @@ name = "benchmarks" version = "0.4.0-nightly" dependencies = [ "arrow", - "clap 4.3.21", + "clap 4.4.1", "client", "indicatif", "itertools 0.10.5", @@ -915,7 +914,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1068,12 +1067,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "8042c26c77e5bd6897a7358e0abb3ec412ed126d826988135653fc669263899d" dependencies = [ "memchr", - "regex-automata 0.3.6", + "regex-automata 0.3.7", "serde", ] @@ -1273,9 +1272,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", "libc", @@ -1318,9 +1317,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1329,7 +1328,7 @@ dependencies = [ "serde", "time 0.1.43", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -1448,24 +1447,24 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.21" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" +checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" dependencies = [ "clap_builder", - "clap_derive 4.3.12", + "clap_derive 4.4.0", "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.21" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.0", + "clap_lex 0.5.1", "strsim 0.10.0", ] @@ -1484,14 +1483,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1505,9 +1504,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "client" @@ -2125,9 +2124,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpp_demangle" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee34052ee3d93d6d8f3e6f81d85c47921f6653a19a7b70e939e3e602d893a674" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" dependencies = [ "cfg-if 1.0.0", ] @@ -2398,7 +2397,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2420,14 +2419,14 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", "hashbrown 0.14.0", @@ -2445,7 +2444,7 @@ dependencies = [ "arrow", "arrow-array", "arrow-schema", - "async-compression 0.4.1", + "async-compression 0.4.2", "async-trait", "bytes", "bzip2", @@ -2543,7 +2542,7 @@ dependencies = [ "hashbrown 0.14.0", "itertools 0.11.0", "log", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -2556,7 +2555,7 @@ dependencies = [ "arrow-array", "arrow-buffer", "arrow-schema", - "base64 0.21.2", + "base64 0.21.3", "blake2", "blake3", "chrono", @@ -2709,7 +2708,7 @@ dependencies = [ "enum_dispatch", "num", "num-traits", - "ordered-float 3.7.0", + "ordered-float 3.9.1", "paste", "serde", "serde_json", @@ -2749,9 +2748,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" [[package]] name = "derive-new" @@ -2938,9 +2937,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "dyn-clone" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "either" @@ -2965,9 +2964,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if 1.0.0", ] @@ -2995,7 +2994,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3007,7 +3006,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3018,9 +3017,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da96524cc884f6558f1769b6c46686af2fe8e8b4cd253bd5a3cdba8181b8e070" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ "serde", ] @@ -3038,9 +3037,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -3149,7 +3148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if 1.0.0", - "rustix 0.38.8", + "rustix 0.38.10", "windows-sys 0.48.0", ] @@ -3228,9 +3227,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "libz-sys", @@ -3369,7 +3368,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3381,7 +3380,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3393,7 +3392,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3494,7 +3493,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3589,9 +3588,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" @@ -3654,7 +3653,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "btoi", "gix-date", "itoa", @@ -3668,7 +3667,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2231a25934a240d0a4b6f4478401c73ee81d8be52de0293eedbc172334abf3e1" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "gix-features 0.28.1", "gix-glob", "gix-path", @@ -3679,9 +3678,9 @@ dependencies = [ [[package]] name = "gix-bitmap" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa8bbde7551a9e3e783a2871f53bbb0f50aac7a77db5680c8709f69e8ce724f" +checksum = "0ccab4bc576844ddb51b78d81b4a42d73e6229660fa614dfc3d3999c874d1959" dependencies = [ "thiserror", ] @@ -3697,11 +3696,11 @@ dependencies = [ [[package]] name = "gix-command" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2783ad148fb16bf9cfd46423706ba552a62a4d4a18fda5dd07648eb0228862dd" +checksum = "0f28f654184b5f725c5737c7e4f466cbd8f0102ac352d5257eeab19647ee4256" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", ] [[package]] @@ -3710,7 +3709,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbad5ce54a8fc997acc50febd89ec80fa6e97cb7f8d0654cb229936407489d8" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "gix-config-value", "gix-features 0.28.1", "gix-glob", @@ -3733,7 +3732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d09154c0c8677e4da0ec35e896f56ee3e338e741b9599fae06075edd83a4081c" dependencies = [ "bitflags 1.3.2", - "bstr 1.6.0", + "bstr 1.6.1", "gix-path", "libc", "thiserror", @@ -3745,7 +3744,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "750b684197374518ea057e0a0594713e07683faa0a3f43c0f93d97f64130ad8d" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "gix-command", "gix-config-value", "gix-path", @@ -3761,10 +3760,10 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "itoa", "thiserror", - "time 0.3.25", + "time 0.3.28", ] [[package]] @@ -3785,7 +3784,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6eba8ba458cb8f4a6c33409b0fe650b1258655175a7ffd1d24fafd3ed31d880b" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "dunce", "gix-hash 0.10.4", "gix-path", @@ -3837,7 +3836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" dependencies = [ "bitflags 1.3.2", - "bstr 1.6.0", + "bstr 1.6.1", ] [[package]] @@ -3878,7 +3877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "717ab601ece7921f59fe86849dbe27d44a46ebb883b5885732c4f30df4996177" dependencies = [ "bitflags 1.3.2", - "bstr 1.6.0", + "bstr 1.6.1", "btoi", "filetime", "gix-bitmap", @@ -3910,7 +3909,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "gix-actor", "thiserror", ] @@ -3921,7 +3920,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "btoi", "gix-actor", "gix-features 0.28.1", @@ -3980,7 +3979,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32370dce200bb951df013e03dff35b4233fc7a89458642b047629b91734a7e19" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "thiserror", ] @@ -3992,18 +3991,18 @@ checksum = "0f3034d4d935aef2c7bf719aaa54b88c520e82413118d886ae880a31d5bdee57" dependencies = [ "gix-command", "gix-config-value", - "nix 0.26.2", + "nix 0.26.4", "parking_lot 0.12.1", "thiserror", ] [[package]] name = "gix-quote" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfd80d3d0c733508df9449b1d3795da36083807e31d851d7d61d29af13bd4b0a" +checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "btoi", "thiserror", ] @@ -4033,7 +4032,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aba332462bda2e8efeae4302b39a6ed01ad56ef772fd5b7ef197cf2798294d65" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "gix-hash 0.10.4", "gix-revision", "gix-validate", @@ -4047,7 +4046,7 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c6f6ff53f888858afc24bf12628446a14279ceec148df6194481f306f553ad2" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "gix-date", "gix-hash 0.10.4", "gix-hashtable", @@ -4101,7 +4100,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6a22b4b32ad14d68f7b7fb6458fa58d44b01797d94c1b8f4db2d9c7b3c366b5" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "gix-features 0.28.1", "gix-path", "home", @@ -4124,7 +4123,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba9b3737b2cef3dcd014633485f0034b0f1a931ee54aeb7d8f87f177f3c89040" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "thiserror", ] @@ -4134,7 +4133,7 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ec9a000b4f24af706c3cc680c7cda235656cbe3216336522f5692773b8a301" dependencies = [ - "bstr 1.6.0", + "bstr 1.6.1", "gix-attributes", "gix-features 0.28.1", "gix-glob", @@ -4155,7 +4154,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "greptime-proto" version = "0.1.0" -source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=4a277f27caa035a801d5b9c020a0449777736614#4a277f27caa035a801d5b9c020a0449777736614" +source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=7fb5aa1095b62794c5c4333a1a2ed45da1c86a07#7fb5aa1095b62794c5c4333a1a2ed45da1c86a07" dependencies = [ "prost", "serde", @@ -4168,9 +4167,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -4232,9 +4231,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ "hashbrown 0.14.0", ] @@ -4440,7 +4439,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.6", + "rustls 0.21.7", "tokio", "tokio-rustls 0.24.1", ] @@ -4561,7 +4560,7 @@ dependencies = [ "console", "instant", "number_prefix", - "portable-atomic 1.4.2", + "portable-atomic 1.4.3", "unicode-width", ] @@ -4573,12 +4572,12 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "inferno" -version = "0.11.15" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb7c1b80a1dfa604bb4a649a5c5aeef3d913f7c520cb42b40e534e8a61bcdfc" +checksum = "73c0fefcb6d409a6587c07515951495d482006f89a21daa0f2f783aa4fd5e027" dependencies = [ "ahash 0.8.3", - "indexmap 1.9.3", + "indexmap 2.0.0", "is-terminal", "itoa", "log", @@ -4617,9 +4616,9 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "inventory" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53088c87cf71c9d4f3372a2cb9eea1e7b8a0b1bf8b7f7d23fe5b76dbb07e63b" +checksum = "e1be380c410bf0595e94992a648ea89db4dd3f3354ba54af206fd2a68cf5ac8e" [[package]] name = "io-close" @@ -4677,7 +4676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.8", + "rustix 0.38.10", "windows-sys 0.48.0", ] @@ -4740,7 +4739,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "pem 1.1.1", "ring", "serde", @@ -5218,9 +5217,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f478948fd84d9f8e86967bf432640e46adfb5a4bd4f14ef7e864ab38220534ae" [[package]] name = "memcomparable" @@ -5656,7 +5655,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "termcolor", "thiserror", ] @@ -5681,7 +5680,7 @@ dependencies = [ "percent-encoding", "pin-project", "priority-queue", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-pemfile", "serde", "serde_json", @@ -5702,7 +5701,7 @@ version = "0.30.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "bigdecimal", "bindgen 0.66.1", "bitflags 2.4.0", @@ -5731,7 +5730,7 @@ dependencies = [ "smallvec", "subprocess", "thiserror", - "time 0.3.25", + "time 0.3.28", "uuid", ] @@ -5817,16 +5816,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.7.1", "pin-utils", - "static_assertions", ] [[package]] @@ -5865,9 +5863,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -5908,7 +5906,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -6012,9 +6010,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -6081,7 +6079,7 @@ dependencies = [ "async-compat", "async-trait", "backon", - "base64 0.21.2", + "base64 0.21.3", "bytes", "chrono", "flagset", @@ -6291,9 +6289,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.7.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" dependencies = [ "num-traits", "rand", @@ -6415,7 +6413,7 @@ dependencies = [ "redox_syscall 0.3.5", "smallvec", "thread-id", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -6432,7 +6430,7 @@ dependencies = [ "arrow-ipc", "arrow-schema", "arrow-select", - "base64 0.21.2", + "base64 0.21.3", "brotli", "bytes", "chrono", @@ -6518,7 +6516,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "serde", ] @@ -6576,7 +6574,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -6592,12 +6590,12 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] @@ -6607,7 +6605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "593c5af58c6394873b84c6fabf31f97e49ab29a56809e7fd240c1bcc4e5d272f" dependencies = [ "async-trait", - "base64 0.21.2", + "base64 0.21.3", "bytes", "chrono", "derive-new", @@ -6621,7 +6619,7 @@ dependencies = [ "ring", "stringprep", "thiserror", - "time 0.3.25", + "time 0.3.28", "tokio", "tokio-rustls 0.24.1", "tokio-util", @@ -6693,14 +6691,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -6818,22 +6816,22 @@ version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e30165d31df606f5726b090ec7592c308a0eaf61721ff64c9a3018e344a8753e" dependencies = [ - "portable-atomic 1.4.2", + "portable-atomic 1.4.3", ] [[package]] name = "portable-atomic" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "postgres-protocol" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b7fa9f396f51dffd61546fd8573ee20592287996568e6175ceb0f8699ad75d" +checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "byteorder", "bytes", "fallible-iterator", @@ -6847,9 +6845,9 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f028f05971fe20f512bcc679e2c10227e57809a3af86a7606304435bc8896cd6" +checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" dependencies = [ "bytes", "chrono", @@ -6869,7 +6867,7 @@ dependencies = [ "inferno", "libc", "log", - "nix 0.26.2", + "nix 0.26.4", "once_cell", "parking_lot 0.12.1", "prost", @@ -6922,7 +6920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -7395,9 +7393,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -7435,7 +7433,7 @@ dependencies = [ "libc", "log", "lz4-sys", - "nix 0.26.2", + "nix 0.26.4", "num-derive", "num-traits", "parking_lot 0.12.1", @@ -7561,14 +7559,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ - "aho-corasick 1.0.3", + "aho-corasick 1.0.5", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-automata 0.3.7", + "regex-syntax 0.7.5", ] [[package]] @@ -7582,13 +7580,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ - "aho-corasick 1.0.3", + "aho-corasick 1.0.5", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -7599,9 +7597,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regress" @@ -7640,7 +7638,7 @@ checksum = "b04f5fccb94d61c154f0d8520ec42e79afdc145f4b1a392faa269874995fda66" dependencies = [ "anyhow", "async-trait", - "base64 0.21.2", + "base64 0.21.3", "chrono", "form_urlencoded", "hex", @@ -7665,11 +7663,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "bytes", "encoding_rs", "futures-core", @@ -7687,7 +7685,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-native-certs", "rustls-pemfile", "serde", @@ -7702,8 +7700,8 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.22.6", - "winreg", + "webpki-roots 0.25.2", + "winreg 0.50.0", ] [[package]] @@ -7945,7 +7943,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.28", + "syn 2.0.29", "walkdir", ] @@ -7981,13 +7979,12 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a2ab0025103a60ecaaf3abf24db1db240a4e1c15837090d2c32f625ac98abea" +checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" dependencies = [ "arrayvec", "borsh", - "byteorder", "bytes", "num-traits", "rand", @@ -8024,7 +8021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" dependencies = [ "bitflags 1.3.2", - "errno 0.3.2", + "errno 0.3.3", "io-lifetimes", "libc", "linux-raw-sys 0.1.4", @@ -8038,7 +8035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", - "errno 0.3.2", + "errno 0.3.3", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", @@ -8047,12 +8044,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" dependencies = [ "bitflags 2.4.0", - "errno 0.3.2", + "errno 0.3.3", "libc", "linux-raw-sys 0.4.5", "windows-sys 0.48.0", @@ -8060,9 +8057,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring", @@ -8072,13 +8069,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki 0.101.3", + "rustls-webpki 0.101.4", "sct", ] @@ -8100,14 +8097,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ "ring", "untrusted", @@ -8115,9 +8112,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -8296,7 +8293,7 @@ dependencies = [ "memchr", "memmap2", "mt19937", - "nix 0.26.2", + "nix 0.26.4", "num-bigint", "num-complex", "num-integer", @@ -8361,7 +8358,7 @@ dependencies = [ "log", "memchr", "memoffset 0.6.5", - "nix 0.26.2", + "nix 0.26.4", "num-bigint", "num-complex", "num-integer", @@ -8403,7 +8400,7 @@ dependencies = [ "widestring", "winapi", "windows 0.39.0", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -8449,7 +8446,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.26.2", + "nix 0.26.4", "radix_trie", "scopeguard", "unicode-segmentation", @@ -8561,9 +8558,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" dependencies = [ "dyn-clone", "indexmap 1.9.3", @@ -8574,9 +8571,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" dependencies = [ "proc-macro2", "quote", @@ -8709,9 +8706,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -8728,13 +8725,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -8750,9 +8747,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -8777,7 +8774,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -8809,7 +8806,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -8902,7 +8899,7 @@ dependencies = [ "rand", "regex", "rust-embed", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-pemfile", "schemars", "script", @@ -9063,14 +9060,14 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.25", + "time 0.3.28", ] [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skeptic" @@ -9095,9 +9092,9 @@ checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -9374,7 +9371,7 @@ dependencies = [ "percent-encoding", "rand", "rsa 0.6.1", - "rustls 0.20.8", + "rustls 0.20.9", "rustls-pemfile", "serde", "serde_json", @@ -9642,7 +9639,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -9698,7 +9695,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "syn 2.0.28", + "syn 2.0.29", "typify 0.0.11", "walkdir", ] @@ -9720,7 +9717,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "syn 2.0.28", + "syn 2.0.29", "typify 0.0.13", "walkdir", ] @@ -9767,9 +9764,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -9885,9 +9882,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "temp-env" @@ -9900,14 +9897,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.8", + "rustix 0.38.10", "windows-sys 0.48.0", ] @@ -10026,29 +10023,29 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "thread-id" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee93aa2b8331c0fec9091548843f2c90019571814057da3b783f9de09349d73" +checksum = "79474f573561cdc4871a0de34a51c92f7f5a56039113fbb5b9c9f96bdb756669" dependencies = [ "libc", "redox_syscall 0.2.16", @@ -10141,9 +10138,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -10162,9 +10159,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -10211,9 +10208,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ "backtrace", "bytes", @@ -10247,14 +10244,14 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "tokio-postgres" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e89f6234aa8fd43779746012fcf53603cdb91fdd8399aa0de868c2d56b6dde1" +checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" dependencies = [ "async-trait", "byteorder", @@ -10269,9 +10266,11 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", + "rand", "socket2 0.5.3", "tokio", "tokio-util", + "whoami", ] [[package]] @@ -10282,7 +10281,7 @@ checksum = "dd5831152cb0d3f79ef5523b357319ba154795d64c7078b2daa95a803b54057f" dependencies = [ "futures", "ring", - "rustls 0.21.6", + "rustls 0.21.7", "tokio", "tokio-postgres", "tokio-rustls 0.24.1", @@ -10294,7 +10293,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "webpki", ] @@ -10305,7 +10304,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.6", + "rustls 0.21.7", "tokio", ] @@ -10322,9 +10321,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ "async-stream", "bytes", @@ -10432,7 +10431,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.2", + "base64 0.21.3", "bytes", "futures-core", "futures-util", @@ -10563,7 +10562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.25", + "time 0.3.28", "tracing-subscriber", ] @@ -10575,21 +10574,21 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "tracing-bunyan-formatter" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464ce79ea7f689ca56d90a9c5563e803a4b61b2695e789205644ed8e8101e6bf" +checksum = "b5c266b9ac83dedf0e0385ad78514949e6d89491269e7065bee51d2bb8ec7373" dependencies = [ "ahash 0.8.3", "gethostname", "log", "serde", "serde_json", - "time 0.3.25", + "time 0.3.28", "tracing", "tracing-core", "tracing-log", @@ -10701,9 +10700,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "typetag" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec6850cc671cd0cfb3ab285465e48a3b927d9de155051c35797446b32f9169f" +checksum = "80960fd143d4c96275c0e60b08f14b81fbb468e79bc0ef8fbda69fb0afafae43" dependencies = [ "erased-serde", "inventory", @@ -10714,13 +10713,13 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c49a6815b4f8379c36f06618bc1b80ca77aaf8a3fd4d8549dca6fdb016000f" +checksum = "bfc13d450dc4a695200da3074dacf43d449b968baee95e341920e47f61a3b40f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -10774,7 +10773,7 @@ dependencies = [ "regress 0.6.0", "schemars", "serde_json", - "syn 2.0.28", + "syn 2.0.29", "thiserror", "unicode-ident", ] @@ -10807,7 +10806,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream 0.2.0", - "syn 2.0.28", + "syn 2.0.29", "typify-impl 0.0.13", ] @@ -10959,9 +10958,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -11051,9 +11050,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -11093,7 +11092,7 @@ checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -11126,7 +11125,7 @@ dependencies = [ "getset", "rustversion", "thiserror", - "time 0.3.25", + "time 0.3.28", ] [[package]] @@ -11210,7 +11209,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -11244,7 +11243,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11257,9 +11256,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -11303,9 +11302,15 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki 0.100.1", + "rustls-webpki 0.100.2", ] +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "which" version = "4.4.0" @@ -11408,7 +11413,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -11426,7 +11431,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -11446,17 +11451,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -11467,9 +11472,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -11485,9 +11490,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -11503,9 +11508,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -11521,9 +11526,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -11539,9 +11544,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -11551,9 +11556,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -11569,15 +11574,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.10" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5504cc7644f4b593cbc05c4a55bf9bd4e94b867c3c0bd440934174d50482427d" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -11591,6 +11596,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index b3c3209558..66253450fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,7 +77,7 @@ datafusion-substrait = { git = "https://github.com/waynexia/arrow-datafusion.git derive_builder = "0.12" futures = "0.3" futures-util = "0.3" -greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "4a277f27caa035a801d5b9c020a0449777736614" } +greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "7fb5aa1095b62794c5c4333a1a2ed45da1c86a07" } humantime-serde = "1.1" itertools = "0.10" lazy_static = "1.4" diff --git a/src/api/src/helper.rs b/src/api/src/helper.rs index 1f91313b60..cc2134302b 100644 --- a/src/api/src/helper.rs +++ b/src/api/src/helper.rs @@ -339,8 +339,6 @@ fn ddl_request_type(request: &DdlRequest) -> &'static str { Some(Expr::CreateTable(_)) => "ddl.create_table", Some(Expr::Alter(_)) => "ddl.alter", Some(Expr::DropTable(_)) => "ddl.drop_table", - Some(Expr::FlushTable(_)) => "ddl.flush_table", - Some(Expr::CompactTable(_)) => "ddl.compact_table", Some(Expr::TruncateTable(_)) => "ddl.truncate_table", None => "ddl.empty", } diff --git a/src/client/examples/logical.rs b/src/client/examples/logical.rs index 911be170ff..b4d1bd6719 100644 --- a/src/client/examples/logical.rs +++ b/src/client/examples/logical.rs @@ -73,7 +73,7 @@ async fn run() { let logical = mock_logical_plan(); event!(Level::INFO, "plan size: {:#?}", logical.len()); - let result = db.logical_plan(logical, None).await.unwrap(); + let result = db.logical_plan(logical, 0).await.unwrap(); event!(Level::INFO, "result: {:#?}", result); } diff --git a/src/client/src/database.rs b/src/client/src/database.rs index b2c2037ae1..bb792de47b 100644 --- a/src/client/src/database.rs +++ b/src/client/src/database.rs @@ -17,9 +17,9 @@ use api::v1::ddl_request::Expr as DdlExpr; use api::v1::greptime_request::Request; use api::v1::query_request::Query; use api::v1::{ - AlterExpr, AuthHeader, CompactTableExpr, CreateTableExpr, DdlRequest, DeleteRequests, - DropTableExpr, FlushTableExpr, GreptimeRequest, InsertRequests, PromRangeQuery, QueryRequest, - RequestHeader, RowInsertRequests, TruncateTableExpr, + AlterExpr, AuthHeader, CreateTableExpr, DdlRequest, DeleteRequests, DropTableExpr, + GreptimeRequest, InsertRequests, PromRangeQuery, QueryRequest, RequestHeader, + RowInsertRequests, TruncateTableExpr, }; use arrow_flight::Ticket; use async_stream::stream; @@ -147,13 +147,13 @@ impl Database { async fn handle(&self, request: Request) -> Result { let mut client = self.client.make_database_client()?.inner; - let request = self.to_rpc_request(request, None); + let request = self.to_rpc_request(request, 0); let response = client.handle(request).await?.into_inner(); from_grpc_response(response) } #[inline] - fn to_rpc_request(&self, request: Request, trace_id: Option) -> GreptimeRequest { + fn to_rpc_request(&self, request: Request, trace_id: u64) -> GreptimeRequest { GreptimeRequest { header: Some(RequestHeader { catalog: self.catalog.clone(), @@ -161,7 +161,7 @@ impl Database { authorization: self.ctx.auth_header.clone(), dbname: self.dbname.clone(), trace_id, - span_id: None, + span_id: 0, }), request: Some(request), } @@ -173,16 +173,12 @@ impl Database { Request::Query(QueryRequest { query: Some(Query::Sql(sql.to_string())), }), - None, + 0, ) .await } - pub async fn logical_plan( - &self, - logical_plan: Vec, - trace_id: Option, - ) -> Result { + pub async fn logical_plan(&self, logical_plan: Vec, trace_id: u64) -> Result { let _timer = timer!(metrics::METRIC_GRPC_LOGICAL_PLAN); self.do_get( Request::Query(QueryRequest { @@ -210,7 +206,7 @@ impl Database { step: step.to_string(), })), }), - None, + 0, ) .await } @@ -221,7 +217,7 @@ impl Database { Request::Ddl(DdlRequest { expr: Some(DdlExpr::CreateTable(expr)), }), - None, + 0, ) .await } @@ -232,7 +228,7 @@ impl Database { Request::Ddl(DdlRequest { expr: Some(DdlExpr::Alter(expr)), }), - None, + 0, ) .await } @@ -243,29 +239,7 @@ impl Database { Request::Ddl(DdlRequest { expr: Some(DdlExpr::DropTable(expr)), }), - None, - ) - .await - } - - pub async fn flush_table(&self, expr: FlushTableExpr) -> Result { - let _timer = timer!(metrics::METRIC_GRPC_FLUSH_TABLE); - self.do_get( - Request::Ddl(DdlRequest { - expr: Some(DdlExpr::FlushTable(expr)), - }), - None, - ) - .await - } - - pub async fn compact_table(&self, expr: CompactTableExpr) -> Result { - let _timer = timer!(metrics::METRIC_GRPC_COMPACT_TABLE); - self.do_get( - Request::Ddl(DdlRequest { - expr: Some(DdlExpr::CompactTable(expr)), - }), - None, + 0, ) .await } @@ -276,12 +250,12 @@ impl Database { Request::Ddl(DdlRequest { expr: Some(DdlExpr::TruncateTable(expr)), }), - None, + 0, ) .await } - async fn do_get(&self, request: Request, trace_id: Option) -> Result { + async fn do_get(&self, request: Request, trace_id: u64) -> Result { // FIXME(paomian): should be added some labels for metrics let _timer = timer!(metrics::METRIC_GRPC_DO_GET); let request = self.to_rpc_request(request, trace_id); diff --git a/src/client/src/metrics.rs b/src/client/src/metrics.rs index 06a2bb791f..bceb11233e 100644 --- a/src/client/src/metrics.rs +++ b/src/client/src/metrics.rs @@ -21,8 +21,6 @@ pub const METRIC_GRPC_SQL: &str = "grpc.sql"; pub const METRIC_GRPC_LOGICAL_PLAN: &str = "grpc.logical_plan"; pub const METRIC_GRPC_ALTER: &str = "grpc.alter"; pub const METRIC_GRPC_DROP_TABLE: &str = "grpc.drop_table"; -pub const METRIC_GRPC_FLUSH_TABLE: &str = "grpc.flush_table"; -pub const METRIC_GRPC_COMPACT_TABLE: &str = "grpc.compact_table"; pub const METRIC_GRPC_TRUNCATE_TABLE: &str = "grpc.truncate_table"; pub const METRIC_GRPC_DO_GET: &str = "grpc.do_get"; pub(crate) const METRIC_REGION_REQUEST_GRPC: &str = "grpc.region_request"; diff --git a/src/client/src/region.rs b/src/client/src/region.rs index b45937edeb..bef7404b1b 100644 --- a/src/client/src/region.rs +++ b/src/client/src/region.rs @@ -25,8 +25,8 @@ type AffectedRows = u64; #[derive(Debug)] pub struct RegionRequester { - trace_id: Option, - span_id: Option, + trace_id: u64, + span_id: u64, client: Client, } @@ -34,8 +34,8 @@ impl RegionRequester { pub fn new(client: Client) -> Self { // TODO(LFC): Pass in trace_id and span_id from some context when we have it. Self { - trace_id: None, - span_id: None, + trace_id: 0, + span_id: 0, client, } } diff --git a/src/cmd/src/cli/repl.rs b/src/cmd/src/cli/repl.rs index 8c10d978b2..d963944076 100644 --- a/src/cmd/src/cli/repl.rs +++ b/src/cmd/src/cli/repl.rs @@ -180,7 +180,7 @@ impl Repl { .encode(&plan) .context(SubstraitEncodeLogicalPlanSnafu)?; - self.database.logical_plan(plan.to_vec(), None).await + self.database.logical_plan(plan.to_vec(), 0).await } else { self.database.sql(&sql).await } diff --git a/src/common/grpc-expr/src/alter.rs b/src/common/grpc-expr/src/alter.rs index 2d467d790c..bc51fe85de 100644 --- a/src/common/grpc-expr/src/alter.rs +++ b/src/common/grpc-expr/src/alter.rs @@ -186,9 +186,9 @@ fn parse_location(location: Option) -> Result Ok(Some(AddColumnLocation::First)), Some(Location { location_type: LOCATION_TYPE_AFTER, - after_cloumn_name, + after_column_name, }) => Ok(Some(AddColumnLocation::After { - column_name: after_cloumn_name, + column_name: after_column_name, })), Some(Location { location_type, .. }) => UnknownLocationTypeSnafu { location_type }.fail(), None => Ok(None), @@ -262,7 +262,7 @@ mod tests { is_key: false, location: Some(Location { location_type: LocationType::First.into(), - after_cloumn_name: "".to_string(), + after_column_name: "".to_string(), }), }, AddColumn { @@ -275,7 +275,7 @@ mod tests { is_key: false, location: Some(Location { location_type: LocationType::After.into(), - after_cloumn_name: "ts".to_string(), + after_column_name: "ts".to_string(), }), }, ], diff --git a/src/common/query/src/lib.rs b/src/common/query/src/lib.rs index 8050be67a9..1c65267219 100644 --- a/src/common/query/src/lib.rs +++ b/src/common/query/src/lib.rs @@ -59,11 +59,11 @@ impl From<&AddColumnLocation> for Location { match value { AddColumnLocation::First => Location { location_type: LocationType::First.into(), - after_cloumn_name: "".to_string(), + after_column_name: "".to_string(), }, AddColumnLocation::After { column_name } => Location { location_type: LocationType::After.into(), - after_cloumn_name: column_name.to_string(), + after_column_name: column_name.to_string(), }, } } diff --git a/src/datanode/src/instance/grpc.rs b/src/datanode/src/instance/grpc.rs index d3cec2b138..f6cd5dae45 100644 --- a/src/datanode/src/instance/grpc.rs +++ b/src/datanode/src/instance/grpc.rs @@ -216,8 +216,6 @@ impl Instance { DdlExpr::Alter(expr) => self.handle_alter(expr, query_ctx).await, DdlExpr::CreateDatabase(expr) => self.handle_create_database(expr, query_ctx).await, DdlExpr::DropTable(expr) => self.handle_drop_table(expr, query_ctx).await, - DdlExpr::FlushTable(expr) => self.handle_flush_table(expr, query_ctx).await, - DdlExpr::CompactTable(expr) => self.handle_compact_table(expr, query_ctx).await, DdlExpr::TruncateTable(expr) => self.handle_truncate_table(expr, query_ctx).await, } } @@ -726,7 +724,7 @@ mod test { is_key: true, location: Some(Location { location_type: LocationType::First.into(), - after_cloumn_name: "".to_string(), + after_column_name: "".to_string(), }), }, AddColumn { @@ -739,7 +737,7 @@ mod test { is_key: true, location: Some(Location { location_type: LocationType::After.into(), - after_cloumn_name: "a".to_string(), + after_column_name: "a".to_string(), }), }, ], diff --git a/src/datanode/src/server/grpc.rs b/src/datanode/src/server/grpc.rs index 4159d1e8ee..99ab743bed 100644 --- a/src/datanode/src/server/grpc.rs +++ b/src/datanode/src/server/grpc.rs @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use api::v1::{ - AlterExpr, CompactTableExpr, CreateTableExpr, DropTableExpr, FlushTableExpr, TruncateTableExpr, -}; +use api::v1::{AlterExpr, CreateTableExpr, DropTableExpr, TruncateTableExpr}; use common_catalog::consts::IMMUTABLE_FILE_ENGINE; use common_catalog::format_full_table_name; use common_grpc_expr::{alter_expr_to_request, create_expr_to_request}; @@ -22,9 +20,7 @@ use common_query::Output; use common_telemetry::info; use session::context::QueryContextRef; use snafu::prelude::*; -use table::requests::{ - CompactTableRequest, DropTableRequest, FlushTableRequest, TruncateTableRequest, -}; +use table::requests::{DropTableRequest, TruncateTableRequest}; use crate::error::{ AlterExprToRequestSnafu, BumpTableIdSnafu, CatalogSnafu, CreateExprToRequestSnafu, @@ -137,52 +133,6 @@ impl Instance { .await } - pub(crate) async fn handle_flush_table( - &self, - expr: FlushTableExpr, - ctx: QueryContextRef, - ) -> Result { - let table_name = if expr.table_name.trim().is_empty() { - None - } else { - Some(expr.table_name) - }; - - let req = FlushTableRequest { - catalog_name: expr.catalog_name, - schema_name: expr.schema_name, - table_name, - region_number: expr.region_number, - wait: None, - }; - self.sql_handler() - .execute(SqlRequest::FlushTable(req), ctx) - .await - } - - pub(crate) async fn handle_compact_table( - &self, - expr: CompactTableExpr, - ctx: QueryContextRef, - ) -> Result { - let table_name = if expr.table_name.trim().is_empty() { - None - } else { - Some(expr.table_name) - }; - - let req = CompactTableRequest { - catalog_name: expr.catalog_name, - schema_name: expr.schema_name, - table_name, - region_number: expr.region_number, - wait: None, - }; - self.sql_handler() - .execute(SqlRequest::CompactTable(req), ctx) - .await - } - pub(crate) async fn handle_truncate_table( &self, expr: TruncateTableExpr, diff --git a/src/frontend/src/instance.rs b/src/frontend/src/instance.rs index c91832eee5..3db236e0e8 100644 --- a/src/frontend/src/instance.rs +++ b/src/frontend/src/instance.rs @@ -164,11 +164,8 @@ impl Instance { table_metadata_manager.clone(), ); - let dist_instance = DistInstance::new( - meta_client.clone(), - Arc::new(catalog_manager.clone()), - datanode_clients.clone(), - ); + let dist_instance = + DistInstance::new(meta_client.clone(), Arc::new(catalog_manager.clone())); let dist_instance = Arc::new(dist_instance); catalog_manager.set_dist_instance(dist_instance.clone()); diff --git a/src/frontend/src/instance/distributed.rs b/src/frontend/src/instance/distributed.rs index ef7b9adf8d..04906a6b31 100644 --- a/src/frontend/src/instance/distributed.rs +++ b/src/frontend/src/instance/distributed.rs @@ -23,24 +23,21 @@ use api::helper::ColumnDataTypeWrapper; use api::v1::ddl_request::Expr as DdlExpr; use api::v1::greptime_request::Request; use api::v1::{ - column_def, AlterExpr, CompactTableExpr, CreateDatabaseExpr, CreateTableExpr, DeleteRequests, - FlushTableExpr, InsertRequests, RowInsertRequests, TruncateTableExpr, + column_def, AlterExpr, CreateDatabaseExpr, CreateTableExpr, DeleteRequests, InsertRequests, + RowInsertRequests, TruncateTableExpr, }; use async_trait::async_trait; use catalog::{CatalogManager, DeregisterTableRequest, RegisterTableRequest}; use chrono::DateTime; -use client::client_manager::DatanodeClients; -use client::Database; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_catalog::format_full_table_name; use common_error::ext::BoxedError; use common_meta::key::schema_name::{SchemaNameKey, SchemaNameValue}; -use common_meta::peer::Peer; use common_meta::rpc::ddl::{DdlTask, SubmitDdlTaskRequest, SubmitDdlTaskResponse}; -use common_meta::rpc::router::{Partition, Partition as MetaPartition, RouteRequest}; +use common_meta::rpc::router::{Partition, Partition as MetaPartition}; use common_meta::table_name::TableName; use common_query::Output; -use common_telemetry::{debug, info}; +use common_telemetry::info; use datanode::instance::sql::table_idents_to_full_name; use datanode::sql::SqlHandler; use datatypes::prelude::ConcreteDataType; @@ -57,7 +54,6 @@ use sql::ast::{Ident, Value as SqlValue}; use sql::statements::create::{PartitionEntry, Partitions}; use sql::statements::statement::Statement; use sql::statements::{self, sql_value_to_value}; -use store_api::storage::RegionNumber; use table::error::TableOperationSnafu; use table::metadata::{RawTableInfo, RawTableMeta, TableId, TableIdent, TableInfo, TableType}; use table::requests::{AlterTableRequest, TableOptions}; @@ -66,9 +62,9 @@ use table::TableRef; use crate::catalog::FrontendCatalogManager; use crate::error::{ self, AlterExprToRequestSnafu, CatalogSnafu, ColumnDataTypeSnafu, ColumnNotFoundSnafu, - DeserializePartitionSnafu, InvokeDatanodeSnafu, NotSupportedSnafu, ParseSqlSnafu, - RequestDatanodeSnafu, RequestMetaSnafu, Result, SchemaExistsSnafu, TableAlreadyExistSnafu, - TableMetadataManagerSnafu, TableNotFoundSnafu, TableSnafu, UnrecognizedTableOptionSnafu, + DeserializePartitionSnafu, InvokeDatanodeSnafu, NotSupportedSnafu, ParseSqlSnafu, Result, + SchemaExistsSnafu, TableAlreadyExistSnafu, TableMetadataManagerSnafu, TableNotFoundSnafu, + TableSnafu, UnrecognizedTableOptionSnafu, }; use crate::expr_factory; use crate::instance::distributed::deleter::DistDeleter; @@ -82,19 +78,13 @@ const MAX_VALUE: &str = "MAXVALUE"; pub struct DistInstance { meta_client: Arc, pub(crate) catalog_manager: Arc, - datanode_clients: Arc, } impl DistInstance { - pub fn new( - meta_client: Arc, - catalog_manager: Arc, - datanode_clients: Arc, - ) -> Self { + pub fn new(meta_client: Arc, catalog_manager: Arc) -> Self { Self { meta_client, catalog_manager, - datanode_clients, } } @@ -213,109 +203,6 @@ impl DistInstance { Ok(Output::AffectedRows(1)) } - async fn flush_table( - &self, - table_name: TableName, - region_number: Option, - ) -> Result { - let candidates = self - .find_flush_or_compaction_candidates(&table_name, region_number) - .await?; - - let expr = FlushTableExpr { - catalog_name: table_name.catalog_name.clone(), - schema_name: table_name.schema_name.clone(), - table_name: table_name.table_name.clone(), - region_number, - ..Default::default() - }; - - for candidate in candidates { - debug!("Flushing table {table_name} on Datanode {candidate:?}"); - - let client = self.datanode_clients.get_client(&candidate).await; - let client = Database::new(&expr.catalog_name, &expr.schema_name, client); - client - .flush_table(expr.clone()) - .await - .context(RequestDatanodeSnafu)?; - } - - Ok(Output::AffectedRows(0)) - } - - async fn compact_table( - &self, - table_name: TableName, - region_number: Option, - ) -> Result { - let candidates = self - .find_flush_or_compaction_candidates(&table_name, region_number) - .await?; - - let expr = CompactTableExpr { - catalog_name: table_name.catalog_name.clone(), - schema_name: table_name.schema_name.clone(), - table_name: table_name.table_name.clone(), - region_number, - }; - - for candidate in candidates { - debug!("Compacting table {table_name} on Datanode {candidate:?}"); - - let client = self.datanode_clients.get_client(&candidate).await; - let client = Database::new(&expr.catalog_name, &expr.schema_name, client); - client - .compact_table(expr.clone()) - .await - .context(RequestDatanodeSnafu)?; - } - Ok(Output::AffectedRows(0)) - } - - async fn find_flush_or_compaction_candidates( - &self, - table_name: &TableName, - region_number: Option, - ) -> Result> { - let table = self - .catalog_manager - .table( - &table_name.catalog_name, - &table_name.schema_name, - &table_name.table_name, - ) - .await - .context(CatalogSnafu)? - .with_context(|| TableNotFoundSnafu { - table_name: table_name.to_string(), - })?; - let table_id = table.table_info().table_id(); - - let route_response = self - .meta_client - .route(RouteRequest { - table_ids: vec![table_id], - }) - .await - .context(RequestMetaSnafu)?; - - let res = route_response - .table_routes - .iter() - .filter(|route| { - route.region_routes.iter().any(|r| { - let Some(n) = region_number else { - return true; - }; - n == r.region.id.region_number() - }) - }) - .flat_map(|route| route.find_leaders().into_iter()) - .collect::>(); - Ok(res) - } - async fn truncate_table(&self, table_name: TableName) -> Result { let table = self .catalog_manager @@ -423,7 +310,7 @@ impl DistInstance { let table_name = TableName::new(catalog, schema, table); self.truncate_table(table_name).await } - _ => error::NotSupportedSnafu { + _ => NotSupportedSnafu { feat: format!("{stmt:?}"), } .fail(), @@ -723,16 +610,6 @@ impl GrpcQueryHandler for DistInstance { TableName::new(&expr.catalog_name, &expr.schema_name, &expr.table_name); self.drop_table(table_name).await } - DdlExpr::FlushTable(expr) => { - let table_name = - TableName::new(&expr.catalog_name, &expr.schema_name, &expr.table_name); - self.flush_table(table_name, expr.region_number).await - } - DdlExpr::CompactTable(expr) => { - let table_name = - TableName::new(&expr.catalog_name, &expr.schema_name, &expr.table_name); - self.compact_table(table_name, expr.region_number).await - } DdlExpr::TruncateTable(expr) => { let table_name = TableName::new(&expr.catalog_name, &expr.schema_name, &expr.table_name); diff --git a/src/query/src/dist_plan/merge_scan.rs b/src/query/src/dist_plan/merge_scan.rs index af53f446b2..4edb9253b8 100644 --- a/src/query/src/dist_plan/merge_scan.rs +++ b/src/query/src/dist_plan/merge_scan.rs @@ -146,7 +146,10 @@ impl MergeScanExec { let peers = self.peers.clone(); let clients = self.clients.clone(); let table = self.table.clone(); - let trace_id = context.task_id().and_then(|id| id.parse().ok()); + let trace_id = context + .task_id() + .and_then(|id| id.parse().ok()) + .unwrap_or_default(); let metric = MergeScanMetric::new(&self.metric); let stream = Box::pin(stream!({ diff --git a/src/servers/src/grpc/greptime_handler.rs b/src/servers/src/grpc/greptime_handler.rs index d2c1463110..a1af9e8d65 100644 --- a/src/servers/src/grpc/greptime_handler.rs +++ b/src/servers/src/grpc/greptime_handler.rs @@ -170,7 +170,7 @@ pub(crate) fn create_query_context(header: Option<&RequestHeader>) -> QueryConte QueryContextBuilder::default() .current_catalog(catalog.to_string()) .current_schema(schema.to_string()) - .try_trace_id(header.and_then(|h: &RequestHeader| h.trace_id)) + .try_trace_id(header.map(|h| h.trace_id)) .build() } diff --git a/src/servers/src/http.rs b/src/servers/src/http.rs index 0b0f11db15..a86c3133e0 100644 --- a/src/servers/src/http.rs +++ b/src/servers/src/http.rs @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -mod admin; pub mod authorize; pub mod handler; pub mod header; @@ -65,7 +64,6 @@ use self::authorize::HttpAuth; use self::influxdb::{influxdb_health, influxdb_ping, influxdb_write_v1, influxdb_write_v2}; use crate::configurator::ConfiguratorRef; use crate::error::{AlreadyStartedSnafu, Result, StartHttpSnafu}; -use crate::http::admin::{compact, flush}; use crate::http::prometheus::{ instant_query, label_values_query, labels_query, range_query, series_query, }; @@ -487,13 +485,6 @@ impl HttpServer { router = router.nest(&format!("/{HTTP_API_VERSION}"), sql_router); } - if let Some(grpc_handler) = self.grpc_handler.clone() { - router = router.nest( - &format!("/{HTTP_API_VERSION}/admin"), - self.route_admin(grpc_handler.clone()), - ); - } - if let Some(opentsdb_handler) = self.opentsdb_handler.clone() { router = router.nest( &format!("/{HTTP_API_VERSION}/opentsdb"), @@ -674,13 +665,6 @@ impl HttpServer { .with_state(otlp_handler) } - fn route_admin(&self, grpc_handler: ServerGrpcQueryHandlerRef) -> Router { - Router::new() - .route("/flush", routing::post(flush)) - .route("/compact", routing::post(compact)) - .with_state(grpc_handler) - } - fn route_config(&self, state: GreptimeOptionsConfigState) -> ApiRouter { ApiRouter::new() .route("/config", apirouting::get(handler::config)) diff --git a/src/servers/src/http/admin.rs b/src/servers/src/http/admin.rs deleted file mode 100644 index 258ed5778c..0000000000 --- a/src/servers/src/http/admin.rs +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright 2023 Greptime Team -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -use std::collections::HashMap; - -use api::v1::ddl_request::Expr; -use api::v1::greptime_request::Request; -use api::v1::{CompactTableExpr, DdlRequest, FlushTableExpr}; -use axum::extract::{Query, RawBody, State}; -use axum::http::StatusCode; -use axum::Extension; -use common_catalog::consts::DEFAULT_CATALOG_NAME; -use session::context::QueryContextRef; -use snafu::OptionExt; - -use crate::error; -use crate::error::Result; -use crate::query_handler::grpc::ServerGrpcQueryHandlerRef; - -#[axum_macros::debug_handler] -pub async fn flush( - State(grpc_handler): State, - Query(params): Query>, - Extension(query_ctx): Extension, - RawBody(_): RawBody, -) -> Result<(StatusCode, ())> { - let catalog_name = params - .get("catalog") - .cloned() - .unwrap_or(DEFAULT_CATALOG_NAME.to_string()); - let schema_name = params - .get("db") - .cloned() - .context(error::InvalidFlushArgumentSnafu { - err_msg: "db is not present", - })?; - - // if table name is not present, flush all tables inside schema - let table_name = params.get("table").cloned().unwrap_or_default(); - - let region_number: Option = params - .get("region") - .map(|v| v.parse()) - .transpose() - .ok() - .flatten(); - - let request = Request::Ddl(DdlRequest { - expr: Some(Expr::FlushTable(FlushTableExpr { - catalog_name: catalog_name.clone(), - schema_name: schema_name.clone(), - table_name: table_name.clone(), - region_number, - ..Default::default() - })), - }); - - grpc_handler.do_query(request, query_ctx).await?; - Ok((StatusCode::NO_CONTENT, ())) -} - -#[axum_macros::debug_handler] -pub async fn compact( - State(grpc_handler): State, - Query(params): Query>, - Extension(query_ctx): Extension, - RawBody(_): RawBody, -) -> Result<(StatusCode, ())> { - let catalog_name = params - .get("catalog") - .cloned() - .unwrap_or(DEFAULT_CATALOG_NAME.to_string()); - let schema_name = params - .get("db") - .cloned() - .context(error::InvalidFlushArgumentSnafu { - err_msg: "db is not present", - })?; - - // if table name is not present, flush all tables inside schema - let table_name = params.get("table").cloned().unwrap_or_default(); - - let region_number: Option = params - .get("region") - .map(|v| v.parse()) - .transpose() - .ok() - .flatten(); - - let request = Request::Ddl(DdlRequest { - expr: Some(Expr::CompactTable(CompactTableExpr { - catalog_name: catalog_name.clone(), - schema_name: schema_name.clone(), - table_name: table_name.clone(), - region_number, - })), - }); - - grpc_handler.do_query(request, query_ctx).await?; - Ok((StatusCode::NO_CONTENT, ())) -} diff --git a/src/sql/src/statements.rs b/src/sql/src/statements.rs index 955c6cdedb..dba5b3b1fc 100644 --- a/src/sql/src/statements.rs +++ b/src/sql/src/statements.rs @@ -415,11 +415,11 @@ pub fn sql_location_to_grpc_add_column_location( match location { Some(AddColumnLocation::First) => Some(Location { location_type: LocationType::First.into(), - after_cloumn_name: "".to_string(), + after_column_name: "".to_string(), }), Some(AddColumnLocation::After { column_name }) => Some(Location { location_type: LocationType::After.into(), - after_cloumn_name: column_name.to_string(), + after_column_name: column_name.to_string(), }), None => None, } diff --git a/tests-integration/src/grpc.rs b/tests-integration/src/grpc.rs index 6e15edd996..672e40261a 100644 --- a/tests-integration/src/grpc.rs +++ b/tests-integration/src/grpc.rs @@ -23,7 +23,7 @@ mod test { use api::v1::{ alter_expr, AddColumn, AddColumns, AlterExpr, Column, ColumnDataType, ColumnDef, CreateDatabaseExpr, CreateTableExpr, DdlRequest, DeleteRequest, DeleteRequests, - DropTableExpr, FlushTableExpr, InsertRequest, InsertRequests, QueryRequest, SemanticType, + DropTableExpr, InsertRequest, InsertRequests, QueryRequest, SemanticType, }; use common_catalog::consts::MITO_ENGINE; use common_meta::rpc::router::region_distribution; @@ -33,8 +33,6 @@ mod test { use query::parser::QueryLanguageParser; use servers::query_handler::grpc::GrpcQueryHandler; use session::context::QueryContext; - use store_api::storage::RegionNumber; - use tests::{has_parquet_file, test_region_dir}; use crate::tests; use crate::tests::MockDistributedInstance; @@ -294,106 +292,6 @@ CREATE TABLE {table_name} ( test_insert_delete_and_query_on_auto_created_table(instance).await } - #[tokio::test(flavor = "multi_thread")] - async fn test_distributed_flush_table() { - common_telemetry::init_default_ut_logging(); - - let instance = tests::create_distributed_instance("test_distributed_flush_table").await; - let data_tmp_dirs = instance.data_tmp_dirs(); - let frontend = instance.frontend(); - let frontend = frontend.as_ref(); - - let table_name = "my_dist_table"; - let sql = format!( - r" -CREATE TABLE {table_name} ( - a INT, - ts TIMESTAMP, - TIME INDEX (ts) -) PARTITION BY RANGE COLUMNS(a) ( - PARTITION r0 VALUES LESS THAN (10), - PARTITION r1 VALUES LESS THAN (20), - PARTITION r2 VALUES LESS THAN (50), - PARTITION r3 VALUES LESS THAN (MAXVALUE), -)" - ); - create_table(frontend, sql).await; - - test_insert_delete_and_query_on_existing_table(frontend, table_name).await; - - flush_table(frontend, "greptime", "public", table_name, None).await; - // Wait for previous task finished - flush_table(frontend, "greptime", "public", table_name, None).await; - - let table = frontend - .catalog_manager() - .table("greptime", "public", table_name) - .await - .unwrap() - .unwrap(); - let table_id = table.table_info().table_id(); - - let table_route_value = instance - .table_metadata_manager() - .table_route_manager() - .get(table_id) - .await - .unwrap() - .unwrap(); - - let region_to_dn_map = region_distribution(&table_route_value.region_routes) - .unwrap() - .iter() - .map(|(k, v)| (v[0], *k)) - .collect::>(); - - for (region, dn) in region_to_dn_map.iter() { - // data_tmp_dirs -> dn: 1..4 - let data_tmp_dir = data_tmp_dirs.get((*dn - 1) as usize).unwrap(); - let region_dir = test_region_dir( - data_tmp_dir.path().to_str().unwrap(), - "greptime", - "public", - table_id, - *region, - ); - assert!(has_parquet_file(®ion_dir)); - } - } - - #[tokio::test(flavor = "multi_thread")] - async fn test_standalone_flush_table() { - common_telemetry::init_default_ut_logging(); - - let standalone = tests::create_standalone_instance("test_standalone_flush_table").await; - let instance = &standalone.instance; - let data_tmp_dir = standalone.data_tmp_dir(); - - let table_name = "my_table"; - let sql = format!("CREATE TABLE {table_name} (a INT, b STRING, ts TIMESTAMP, TIME INDEX (ts), PRIMARY KEY (a, b))"); - - create_table(instance, sql).await; - - test_insert_delete_and_query_on_existing_table(instance, table_name).await; - - let table_id = 1024; - let region_id = 0; - let region_dir = test_region_dir( - data_tmp_dir.path().to_str().unwrap(), - "greptime", - "public", - table_id, - region_id, - ); - assert!(!has_parquet_file(®ion_dir)); - - flush_table(instance, "greptime", "public", "my_table", None).await; - // Wait for previous task finished - flush_table(instance, "greptime", "public", "my_table", None).await; - - assert!(has_parquet_file(®ion_dir)); - } - async fn create_table(frontend: &Instance, sql: String) { let request = Request::Query(QueryRequest { query: Some(Query::Sql(sql)), @@ -402,27 +300,6 @@ CREATE TABLE {table_name} ( assert!(matches!(output, Output::AffectedRows(0))); } - async fn flush_table( - frontend: &Instance, - catalog_name: &str, - schema_name: &str, - table_name: &str, - region_number: Option, - ) { - let request = Request::Ddl(DdlRequest { - expr: Some(DdlExpr::FlushTable(FlushTableExpr { - catalog_name: catalog_name.to_string(), - schema_name: schema_name.to_string(), - table_name: table_name.to_string(), - region_number, - ..Default::default() - })), - }); - - let output = query(frontend, request).await; - assert!(matches!(output, Output::AffectedRows(0))); - } - async fn test_insert_delete_and_query_on_existing_table(instance: &Instance, table_name: &str) { let ts_millisecond_values = vec![ 1672557972000, diff --git a/tests-integration/src/tests.rs b/tests-integration/src/tests.rs index a987b2fe11..1a6bc1e413 100644 --- a/tests-integration/src/tests.rs +++ b/tests-integration/src/tests.rs @@ -21,10 +21,8 @@ use std::sync::Arc; use catalog::RegisterSchemaRequest; use common_meta::key::TableMetadataManagerRef; -use common_test_util::temp_dir::TempDir; use datanode::instance::Instance as DatanodeInstance; use frontend::instance::Instance; -use table::engine::{region_name, table_dir}; use crate::cluster::{GreptimeDbCluster, GreptimeDbClusterBuilder}; use crate::test_util::{create_tmp_dir_and_datanode_opts, StorageType, TestGuard}; @@ -32,14 +30,6 @@ use crate::test_util::{create_tmp_dir_and_datanode_opts, StorageType, TestGuard} pub struct MockDistributedInstance(GreptimeDbCluster); impl MockDistributedInstance { - pub fn data_tmp_dirs(&self) -> Vec<&TempDir> { - self.0 - ._dir_guards - .iter() - .filter_map(|d| if !d.is_wal { Some(&d.temp_dir) } else { None }) - .collect() - } - pub fn frontend(&self) -> Arc { self.0.frontend.clone() } @@ -58,12 +48,6 @@ pub struct MockStandaloneInstance { _guard: TestGuard, } -impl MockStandaloneInstance { - pub fn data_tmp_dir(&self) -> &TempDir { - &self._guard.home_guard.temp_dir - } -} - pub(crate) async fn create_standalone_instance(test_name: &str) -> MockStandaloneInstance { let (opts, guard) = create_tmp_dir_and_datanode_opts(StorageType::File, test_name); let (dn_instance, heartbeat) = DatanodeInstance::with_opts(&opts, Default::default()) @@ -105,29 +89,3 @@ pub async fn create_distributed_instance(test_name: &str) -> MockDistributedInst let cluster = GreptimeDbClusterBuilder::new(test_name).build().await; MockDistributedInstance(cluster) } - -pub fn test_region_dir( - dir: &str, - catalog_name: &str, - schema_name: &str, - table_id: u32, - region_id: u32, -) -> String { - let table_dir = table_dir(catalog_name, schema_name, table_id); - let region_name = region_name(table_id, region_id); - - format!("{}/{}/{}", dir, table_dir, region_name) -} - -pub fn has_parquet_file(sst_dir: &str) -> bool { - for entry in std::fs::read_dir(sst_dir).unwrap() { - let entry = entry.unwrap(); - let path = entry.path(); - if !path.is_dir() { - assert_eq!("parquet", path.extension().unwrap()); - return true; - } - } - - false -} diff --git a/tests-integration/tests/sql.rs b/tests-integration/tests/sql.rs index c32c39e098..4e10d58605 100644 --- a/tests-integration/tests/sql.rs +++ b/tests-integration/tests/sql.rs @@ -136,7 +136,10 @@ pub async fn test_mysql_crud(store_type: StorageType) { .await .is_ok()); for i in 0..10 { - let dt = DateTime::::from_utc(NaiveDateTime::from_timestamp_opt(60, i).unwrap(), Utc); + let dt: DateTime = DateTime::from_naive_utc_and_offset( + NaiveDateTime::from_timestamp_opt(60, i).unwrap(), + Utc, + ); let d = NaiveDate::from_yo_opt(2015, 100).unwrap(); let hello = format!("hello{i}"); let bytes = hello.as_bytes(); @@ -165,7 +168,7 @@ pub async fn test_mysql_crud(store_type: StorageType) { assert_eq!(ret, i as i64); let expected_d = NaiveDate::from_yo_opt(2015, 100).unwrap(); assert_eq!(expected_d, d); - let expected_dt = DateTime::::from_utc( + let expected_dt: DateTime = DateTime::from_naive_utc_and_offset( NaiveDateTime::from_timestamp_opt(60, i as u32).unwrap(), Utc, );