chore(query): all queryies should generate hash (#15560)

* fix(query): all query should generate hash

* fix clippy

Author: TCeason

src/query/service/src/interpreters/interpreter.rs

@@ -234,22 +234,24 @@ fn log_query_finished(ctx: &QueryContext, error: Option<ErrorCode>, has_profiles
 pub async fn interpreter_plan_sql(ctx: Arc<QueryContext>, sql: &str) -> Result<(Plan, PlanExtras)> {
     let mut planner = Planner::new(ctx.clone());
     let result = planner.plan_sql(sql).await;
-
-    if let Ok((_, extras)) = &result {
-        let mut stmt = extras.statement.clone();
-        attach_query_hash(&ctx, &mut stmt);
+    let short_sql = short_sql(sql.to_string());
+    let mut stmt = if let Ok((_, extras)) = &result {
+        Some(extras.statement.clone())
     } else {
         // Only log if there's an error
-        ctx.attach_query_str(QueryKind::Unknown, short_sql(sql.to_string()));
+        ctx.attach_query_str(QueryKind::Unknown, short_sql.to_string());
         log_query_start(&ctx);
         log_query_finished(&ctx, result.as_ref().err().cloned(), false);
-    }
+        None
+    };
+
+    attach_query_hash(&ctx, &mut stmt, &short_sql);
 
     result
 }
 
-fn attach_query_hash(ctx: &Arc<QueryContext>, stmt: &mut Statement) {
-    if let Statement::Query(_) = stmt {
+fn attach_query_hash(ctx: &Arc<QueryContext>, stmt: &mut Option<Statement>, sql: &str) {
+    let (query_hash, query_parameterized_hash) = if let Some(stmt) = stmt {
         let query_hash = format!("{:x}", Md5::digest(stmt.to_string()));
         // Use Literal::Null replace literal. Ignore Literal.
         // SELECT * FROM t1 WHERE name = 'data' => SELECT * FROM t1 WHERE name = NULL
@@ -267,7 +269,11 @@ fn attach_query_hash(ctx: &Arc<QueryContext>, stmt: &mut Statement) {
         let mut visitor = AstVisitor {};
         stmt.drive_mut(&mut visitor);
 
-        let query_parameterized_hash = format!("{:x}", Md5::digest(stmt.to_string()));
-        ctx.attach_query_hash(query_hash, query_parameterized_hash);
-    }
+        (query_hash, format!("{:x}", Md5::digest(stmt.to_string())))
+    } else {
+        let hash = format!("{:x}", Md5::digest(sql));
+        (hash.to_string(), hash)
+    };
+
+    ctx.attach_query_hash(query_hash, query_parameterized_hash);
 }

tests/sqllogictests/suites/base/01_system/01_0002_system_query_log.test

@@ -17,6 +17,17 @@ drop table if exists tbl_01_0002 all
 statement ok
 create table tbl_01_0002(a int)
 
+statement ok
+insert into  tbl_01_0002 values    (1)
+
+statement error
+insert into  tbl_01_0002 values    (?,?,?)
+
+query TTT
+select query_text, query_hash, query_parameterized_hash from system.query_log where query_text='INSERT INTO tbl_01_0002 VALUES (?,?,?)' limit 1;
+----
+INSERT INTO tbl_01_0002 VALUES (?,?,?) 56531330ce650af109dc38ae2fe2a6a3 56531330ce650af109dc38ae2fe2a6a3
+
 statement ok
 insert into  tbl_01_0002 values(1)
 
@@ -56,6 +67,16 @@ select count(query_text)>1 from system.query_log where query_text like 'SELECT *
 ----
 1
 
+query TTT
+select query_text, query_hash, query_parameterized_hash from system.query_log where query_hash='932d5555e275c38b46574f4adfa5e01b' limit 1;
+----
+INSERT INTO tbl_01_0002 VALUES (1) 932d5555e275c38b46574f4adfa5e01b 932d5555e275c38b46574f4adfa5e01b
+
+query B
+select count(query_text)>1 from system.query_log where query_text like 'INSERT INTO tbl_01_0002%' group by query_parameterized_hash having query_parameterized_hash='932d5555e275c38b46574f4adfa5e01b';
+----
+1
+
 query TTT
 select query_text, query_hash, query_parameterized_hash from system.query_log where query_text like 'SELECT * FROM tbl_01_0002 WHERE a = 200' and log_type_name='Finish' limit 1;
 ----