From 80c818bfa8f643450c200af2f6f457f2bbac638f Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Fri, 26 Apr 2024 03:27:46 +0800
Subject: [PATCH] refactor: log statement on error by Display

Signed-off-by: tison <wander4096@gmail.com>
---
 src/frontend/src/instance.rs            |  8 +++-----
 src/frontend/src/instance/prom_store.rs |  4 +---
 src/servers/src/error.rs                |  3 +--
 src/servers/src/query_handler/sql.rs    | 13 +++----------
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/frontend/src/instance.rs b/src/frontend/src/instance.rs
index 5709c57d2931..6a6a331a43bf 100644
--- a/src/frontend/src/instance.rs
+++ b/src/frontend/src/instance.rs
@@ -315,20 +315,18 @@ impl SqlQueryHandler for Instance {
                         break;
                     }
 
-                    match self.query_statement(stmt, query_ctx.clone()).await {
+                    match self.query_statement(stmt.clone(), query_ctx.clone()).await {
                         Ok(output) => {
                             let output_result =
                                 query_interceptor.post_execute(output, query_ctx.clone());
                             results.push(output_result);
                         }
                         Err(e) => {
-                            let redacted = sql::util::redact_sql_secrets(query.as_ref());
                             if e.status_code().should_log_error() {
-                                error!(e; "Failed to execute query: {redacted}");
+                                error!(e; "Failed to execute query: {stmt}");
                             } else {
-                                debug!("Failed to execute query: {redacted}, {e}");
+                                debug!("Failed to execute query: {stmt}, {e}");
                             }
-
                             results.push(Err(e));
                             break;
                         }
diff --git a/src/frontend/src/instance/prom_store.rs b/src/frontend/src/instance/prom_store.rs
index 104573bf8621..e9ff182a0a33 100644
--- a/src/frontend/src/instance/prom_store.rs
+++ b/src/frontend/src/instance/prom_store.rs
@@ -149,9 +149,7 @@ impl Instance {
                 .handle_remote_query(&ctx, catalog_name, schema_name, &table_name, query)
                 .await
                 .map_err(BoxedError::new)
-                .with_context(|_| error::ExecuteQuerySnafu {
-                    query: format!("{query:#?}"),
-                })?;
+                .with_context(|_| error::ExecuteQuerySnafu)?;
 
             results.push((table_name, output));
         }
diff --git a/src/servers/src/error.rs b/src/servers/src/error.rs
index e3172ae8f89c..2af6a38243d7 100644
--- a/src/servers/src/error.rs
+++ b/src/servers/src/error.rs
@@ -97,9 +97,8 @@ pub enum Error {
         error: Box<dyn std::error::Error + Send + Sync>,
     },
 
-    #[snafu(display("Failed to execute query, query: {}", query))]
+    #[snafu(display("Failed to execute query"))]
     ExecuteQuery {
-        query: String,
         location: Location,
         source: BoxedError,
     },
diff --git a/src/servers/src/query_handler/sql.rs b/src/servers/src/query_handler/sql.rs
index 79e63f86e7a7..6d4d70349bf8 100644
--- a/src/servers/src/query_handler/sql.rs
+++ b/src/servers/src/query_handler/sql.rs
@@ -84,10 +84,7 @@ where
             .do_query(query, query_ctx)
             .await
             .into_iter()
-            .map(|x| {
-                x.map_err(BoxedError::new)
-                    .context(error::ExecuteQuerySnafu { query })
-            })
+            .map(|x| x.map_err(BoxedError::new).context(error::ExecuteQuerySnafu))
             .collect()
     }
 
@@ -109,12 +106,8 @@ where
             .await
             .into_iter()
             .map(|x| {
-                x.map_err(BoxedError::new).with_context(|_| {
-                    let query_literal = format!("{query:?}");
-                    error::ExecuteQuerySnafu {
-                        query: query_literal,
-                    }
-                })
+                x.map_err(BoxedError::new)
+                    .with_context(|_| error::ExecuteQuerySnafu)
             })
             .collect()
     }