Fix sql audit compability

internal/dashboard/business/sql/sql.go

@@ -141,7 +141,6 @@ func ListSqlStats(ctx context.Context, filter *sql.SqlFilter) (*sql.SqlStatsList
 				QuerySql:          item.QuerySql,
 				ClientIp:          item.ClientIp,
 				Event:             item.Event,
-				FormatSqlId:       item.FormatSqlId,
 				EffectiveTenantId: item.EffectiveTenantId,
 				TraceId:           item.TraceId,
 				Sid:               item.Sid,

internal/dashboard/model/sql/sql_info.go

@@ -43,7 +43,6 @@ type SqlMetaInfo struct {
 	QuerySql          string `json:"querySql"`
 	ClientIp          string `json:"clientIp"`
 	Event             string `json:"event"`
-	FormatSqlId       string `json:"formatSqlId"`
 	EffectiveTenantId uint64 `json:"effectiveTenantId"`
 	TraceId           string `json:"traceId"`
 	Sid               uint64 `json:"sid"`

internal/sql-analyzer/api/model/sql_stats.go

@@ -51,7 +51,6 @@ type SqlStatsItem struct {
 	QuerySql          string `json:"querySql"`
 	ClientIp          string `json:"clientIp"`
 	Event             string `json:"event"`
-	FormatSqlId       string `json:"formatSqlId"`
 	EffectiveTenantId uint64 `json:"effectiveTenantId"`
 	TraceId           string `json:"traceId"`
 	Sid               uint64 `json:"sid"`

internal/sql-analyzer/business/sql_stats.go

@@ -24,12 +24,11 @@ import (
 )
 
 var fixedDimensions = map[string]any{
-	"tenant_name":   struct{}{},
-	"user_name":     struct{}{},
-	"db_name":       struct{}{},
-	"sql_id":        struct{}{},
-	"plan_id":       struct{}{},
-	"format_sql_id": struct{}{},
+	"tenant_name": struct{}{},
+	"user_name":   struct{}{},
+	"db_name":     struct{}{},
+	"sql_id":      struct{}{},
+	"plan_id":     struct{}{},
 }
 
 var dimensions = map[string]any{
@@ -177,8 +176,6 @@ func (s *SqlStatsService) transformResults(results []map[string]any) []apimodel.
 				item.ClientIp, _ = val.(string)
 			case "event":
 				item.Event, _ = val.(string)
-			case "format_sql_id":
-				item.FormatSqlId, _ = val.(string)
 			case "effective_tenant_id":
 				if v, ok := val.(int64); ok {
 					item.EffectiveTenantId = uint64(v)

internal/sql-analyzer/const/sql/sql_audit.go

@@ -18,7 +18,7 @@ const (
         svr_ip VARCHAR, svr_port BIGINT, tenant_id BIGINT, tenant_name VARCHAR, user_id BIGINT, user_name VARCHAR,
         db_id BIGINT, db_name VARCHAR, sql_id VARCHAR, plan_id BIGINT,
         query_sql TEXT, client_ip VARCHAR, event VARCHAR,
-        format_sql_id VARCHAR, effective_tenant_id BIGINT, trace_id VARCHAR, sid BIGINT,
+        effective_tenant_id BIGINT, trace_id VARCHAR, sid BIGINT,
         user_client_ip VARCHAR, tx_id VARCHAR,
         executions BIGINT, min_request_time BIGINT, max_request_time BIGINT,
         max_request_id BIGINT, min_request_id BIGINT,
@@ -71,7 +71,7 @@ const (
 		SELECT
 			svr_ip, svr_port, tenant_id, tenant_name, user_id, user_name, db_id, db_name, sql_id, plan_id,
 			MAX(query_sql) as query_sql, MAX(client_ip) as client_ip, MAX(event) as event, 
-			MAX(format_sql_id) as format_sql_id, MAX(effective_tenant_id) as effective_tenant_id, MAX(trace_id) as trace_id, MAX(sid) as sid, MAX(user_client_ip) as user_client_ip, MAX(tx_id) as tx_id,
+			MAX(effective_tenant_id) as effective_tenant_id, MAX(trace_id) as trace_id, MAX(sid) as sid, MAX(user_client_ip) as user_client_ip, MAX(tx_id) as tx_id,
 			COUNT(*) as executions, MIN(request_time) as min_request_time, MAX(request_time) as max_request_time,
 			MAX(request_id) as max_request_id, MIN(request_id) as min_request_id,
 			SUM(elapsed_time) as elapsed_time_sum, MAX(elapsed_time) as elapsed_time_max, MIN(elapsed_time) as elapsed_time_min,

internal/sql-analyzer/generated/swagger/docs.go

@@ -606,9 +606,6 @@ const docTemplate = `{
                 "event": {
                     "type": "string"
                 },
-                "formatSqlId": {
-                    "type": "string"
-                },
                 "lastFailInfo": {
                     "type": "integer"
                 },

internal/sql-analyzer/generated/swagger/swagger.json

@@ -595,9 +595,6 @@
                 "event": {
                     "type": "string"
                 },
-                "formatSqlId": {
-                    "type": "string"
-                },
                 "lastFailInfo": {
                     "type": "integer"
                 },

internal/sql-analyzer/generated/swagger/swagger.yaml

@@ -244,8 +244,6 @@ definitions:
         type: integer
       event:
         type: string
-      formatSqlId:
-        type: string
       lastFailInfo:
         type: integer
       planId:

internal/sql-analyzer/model/sql_audit.go

@@ -29,7 +29,6 @@ type SqlAudit struct {
 	QuerySql          string `db:"query_sql"`
 	ClientIp          string `db:"client_ip"`
 	Event             string `db:"event"`
-	FormatSqlId       string `db:"format_sql_id"`
 	EffectiveTenantId uint64 `db:"effective_tenant_id"`
 	TraceId           string `db:"trace_id"`
 	Sid               uint64 `db:"sid"`

internal/sql-analyzer/store/sql_audit.go

@@ -150,7 +150,7 @@ func (s *SqlAuditStore) InsertBatch(resultsSlices [][]model.SqlAudit) error {
 			for _, r := range results {
 				err := appender.AppendRow(
 					r.SvrIP, r.SvrPort, r.TenantId, r.TenantName, r.UserId, r.UserName, r.DBId, r.DBName, r.SqlId, r.PlanId,
-					r.QuerySql, r.ClientIp, r.Event, r.FormatSqlId, r.EffectiveTenantId, r.TraceId, r.Sid, r.UserClientIp, r.TxId,
+					r.QuerySql, r.ClientIp, r.Event, r.EffectiveTenantId, r.TraceId, r.Sid, r.UserClientIp, r.TxId,
 					r.Executions, r.MinRequestTime, r.MaxRequestTime, r.MaxRequestId, r.MinRequestId,
 					r.ElapsedTimeSum, r.ElapsedTimeMax, r.ElapsedTimeMin,
 					r.ExecuteTimeSum, r.ExecuteTimeMax, r.ExecuteTimeMin,