From df2d7ed43d8147735cd4a35ece7fd066494a94f3 Mon Sep 17 00:00:00 2001 From: everpcpc <git@everpcpc.com> Date: Fri, 28 Apr 2023 17:45:50 +0800 Subject: [PATCH 1/2] z --- cli/src/display.rs | 3 --- cli/src/session.rs | 10 +++++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cli/src/display.rs b/cli/src/display.rs index 025592d9d..ecad3ed42 100644 --- a/cli/src/display.rs +++ b/cli/src/display.rs @@ -176,9 +176,6 @@ impl<'a> FormatDisplay<'a> { if let Some(pb) = self.progress.take() { pb.finish_and_clear(); } - if self.settings.time { - println!("{:.3}", self.start.elapsed().as_secs_f64()); - } Ok(()) } diff --git a/cli/src/session.rs b/cli/src/session.rs index c37a44b20..f8e530ecc 100644 --- a/cli/src/session.rs +++ b/cli/src/session.rs @@ -146,6 +146,7 @@ impl Session { } pub async fn handle_reader<R: BufRead>(&mut self, r: R) { + let start = Instant::now(); let mut lines = r.lines(); while let Some(Ok(line)) = lines.next() { let queries = self.append_query(&line); @@ -165,6 +166,9 @@ impl Session { eprintln!("{}", e); } } + if self.settings.time { + println!("{:.3}", start.elapsed().as_secs_f64()); + } } pub fn append_query(&mut self, line: &str) -> Vec<String> { @@ -300,13 +304,13 @@ impl Session { self.conn = new_connection(&self.dsn)?; if self.is_repl { let info = self.conn.info(); - println!( + eprintln!( "Trying reconnect to {}:{} as user {}.", info.host, info.port, info.user ); let version = self.conn.version().await?; - println!("Connected to {}", version); - println!(); + eprintln!("Connected to {}", version); + eprintln!(); } Ok(()) } From 5e2977828daac2353755648b1df4e9910000295f Mon Sep 17 00:00:00 2001 From: everpcpc <git@everpcpc.com> Date: Fri, 28 Apr 2023 17:48:47 +0800 Subject: [PATCH 2/2] z --- cli/Cargo.toml | 2 +- cli/src/session.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index e76dd09a6..734319aa9 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bendsql" -version = "0.3.6" +version = "0.3.7" edition = "2021" license = "Apache-2.0" description = "Databend Native Command Line Tool" diff --git a/cli/src/session.rs b/cli/src/session.rs index f8e530ecc..62a286d92 100644 --- a/cli/src/session.rs +++ b/cli/src/session.rs @@ -230,15 +230,15 @@ impl Session { let affected = self.conn.exec(query).await?; if is_repl { if affected > 0 { - println!( + eprintln!( "{} rows affected in ({:.3} sec)", affected, start.elapsed().as_secs_f64() ); } else { - println!("Processed in ({:.3} sec)", start.elapsed().as_secs_f64()); + eprintln!("Processed in ({:.3} sec)", start.elapsed().as_secs_f64()); } - println!(); + eprintln!(); } Ok(false) }