diff --git a/Cargo.lock b/Cargo.lock index 122edfc02f..68d36dee5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4500,7 +4500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -6910,7 +6910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.53.2", + "windows-targets 0.48.5", ] [[package]] @@ -7215,9 +7215,9 @@ dependencies = [ [[package]] name = "mappings" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e434981a332777c2b3062652d16a55f8e74fa78e6b1882633f0d77399c84fc2a" +checksum = "db4d277bb50d4508057e7bddd7fcd19ef4a4cc38051b6a5a36868d75ae2cbeb9" dependencies = [ "anyhow", "libc", @@ -9578,9 +9578,9 @@ dependencies = [ [[package]] name = "pprof_util" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa015c78eed2130951e22c58d2095849391e73817ab2e74f71b0b9f63dd8416" +checksum = "f9aba4251d95ac86f14c33e688d57a9344bfcff29e9b0c5a063fc66b5facc8a1" dependencies = [ "anyhow", "backtrace", @@ -9842,7 +9842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", - "heck 0.5.0", + "heck 0.4.1", "itertools 0.12.1", "log", "multimap", @@ -9862,8 +9862,8 @@ version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" dependencies = [ - "heck 0.5.0", - "itertools 0.14.0", + "heck 0.4.1", + "itertools 0.10.5", "log", "multimap", "once_cell", @@ -9909,7 +9909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.104", @@ -11896,7 +11896,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1961e2ef424c1424204d3a5d6975f934f56b6d50ff5732382d84ebf460e147f7" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.104", @@ -12925,9 +12925,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.19.1" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", "getrandom 0.3.3", @@ -14539,7 +14539,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -14730,15 +14730,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.2", -] - [[package]] name = "windows-targets" version = "0.48.5" @@ -14763,29 +14754,13 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", + "windows_i686_gnullvm", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.53.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" -dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", -] - [[package]] name = "windows-threading" version = "0.1.0" @@ -14807,12 +14782,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -14825,12 +14794,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -14843,24 +14806,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -14873,12 +14824,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -14891,12 +14836,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -14909,12 +14848,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -14927,12 +14860,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - [[package]] name = "winnow" version = "0.5.40" diff --git a/src/common/mem-prof/Cargo.toml b/src/common/mem-prof/Cargo.toml index 5db752ed21..ee4753ee88 100644 --- a/src/common/mem-prof/Cargo.toml +++ b/src/common/mem-prof/Cargo.toml @@ -17,7 +17,7 @@ tokio.workspace = true [target.'cfg(not(windows))'.dependencies] tikv-jemalloc-ctl = { version = "0.6", features = ["use_std", "stats"] } -jemalloc-pprof-utils = { version = "0.7", package = "pprof_util", features = [ +jemalloc-pprof-utils = { version = "0.8", package = "pprof_util", features = [ "flamegraph", "symbolize", ] } # for parsing jemalloc prof dump diff --git a/src/sql/src/statements/create/trigger.rs b/src/sql/src/statements/create/trigger.rs index 0788fa7b78..fb135d9696 100644 --- a/src/sql/src/statements/create/trigger.rs +++ b/src/sql/src/statements/create/trigger.rs @@ -9,7 +9,7 @@ use sqlparser_derive::{Visit, VisitMut}; use crate::ast::{Ident, ObjectName}; use crate::statements::OptionMap; -use crate::statements::create::{COMMA_SEP, INDENT, LINE_SEP}; +use crate::statements::create::{COMMA_SEP, INDENT}; #[derive(Debug, PartialEq, Eq, Clone, Visit, VisitMut, Serialize)] pub struct CreateTrigger { @@ -28,22 +28,24 @@ impl Display for CreateTrigger { write!(f, "IF NOT EXISTS ")?; } writeln!(f, "{}", self.trigger_name)?; - writeln!(f, "{}", self.trigger_on)?; + writeln!(f, " {}", self.trigger_on)?; if !self.labels.is_empty() { let labels = self.labels.kv_pairs(); - writeln!(f, "LABELS ({})", format_list_comma!(labels))?; + writeln!(f, " LABELS ({})", format_list_comma!(labels))?; } if !self.annotations.is_empty() { let annotations = self.annotations.kv_pairs(); - writeln!(f, "ANNOTATIONS ({})", format_list_comma!(annotations))?; + writeln!(f, " ANNOTATIONS ({})", format_list_comma!(annotations))?; } if !self.channels.is_empty() { - writeln!(f, "NOTIFY(")?; - write!(f, "{}", format_list_indent!(self.channels))?; - write!(f, ")")?; + writeln!(f, " NOTIFY(")?; + for channel in self.channels.iter() { + writeln!(f, " {},", format_indent!(channel))?; + } + write!(f, " )")?; } Ok(()) @@ -123,7 +125,10 @@ ON (SELECT host AS host_label, cpu, memory FROM machine_monitor WHERE cpu > 2) E LABELS (label_name=label_val) ANNOTATIONS (annotation_name=annotation_val) NOTIFY -(WEBHOOK alert_manager URL 'http://127.0.0.1:9093' WITH (timeout='1m'))"#; +( +WEBHOOK alert_manager1 URL 'http://127.0.0.1:9093' WITH (timeout='1m'), +WEBHOOK alert_manager2 URL 'http://127.0.0.1:9093' WITH (timeout='1m') +)"#; let result = ParserContext::create_with_dialect(sql, &GreptimeDbDialect {}, ParseOptions::default()) @@ -135,11 +140,13 @@ NOTIFY }; let formatted = format!("{}", trigger); let expected = r#"CREATE TRIGGER IF NOT EXISTS cpu_monitor -ON (SELECT host AS host_label, cpu, memory FROM machine_monitor WHERE cpu > 2) EVERY '1day 5 minute'::INTERVAL -LABELS (label_name = 'label_val') -ANNOTATIONS (annotation_name = 'annotation_val') -NOTIFY( - WEBHOOK alert_manager URL 'http://127.0.0.1:9093' WITH (timeout = '1m'))"#; + ON (SELECT host AS host_label, cpu, memory FROM machine_monitor WHERE cpu > 2) EVERY '1day 5 minute'::INTERVAL + LABELS (label_name = 'label_val') + ANNOTATIONS (annotation_name = 'annotation_val') + NOTIFY( + WEBHOOK alert_manager1 URL 'http://127.0.0.1:9093' WITH (timeout = '1m'), + WEBHOOK alert_manager2 URL 'http://127.0.0.1:9093' WITH (timeout = '1m'), + )"#; assert_eq!(expected, formatted); } } diff --git a/tests/runner/src/main.rs b/tests/runner/src/main.rs index 5b1f8ec683..187a7562ab 100644 --- a/tests/runner/src/main.rs +++ b/tests/runner/src/main.rs @@ -129,7 +129,7 @@ async fn main() { .prefix("sqlness") .tempdir() .unwrap(); - let sqlness_home = temp_dir.into_path(); + let sqlness_home = temp_dir.keep(); let mut interceptor_registry: Registry = Default::default(); interceptor_registry.register(