Merge pull request #2823 from actiontech/fix_audit_plan_detail_error

fix: add audit status for sqls, fix unmarshal error
actiontech · Dec 16, 2024 · f0bcb90 · f0bcb90
2 parents f9f1c23 + a18db8b
commit f0bcb90
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/sqle/model/instance_audit_plan_list.go b/sqle/model/instance_audit_plan_list.go
@@ -113,10 +113,14 @@ type InstanceAuditPlanSQLListDetail struct {
 	Schema         string         `json:"schema_name"`
 	Info           JSON           `json:"info"`
 	AuditResult    AuditResults   `json:"audit_results"`
+	AuditStatus    string         `json:"audit_status"`
 	Priority       sql.NullString `json:"priority"`
 }
 
-const AuditResultName = "audit_results"
+const (
+	AuditResultName = "audit_results"
+	AuditStatus     = "audit_status"
+)
 
 var AuditResultDesc = locale.ApAuditResult
 
@@ -170,7 +174,8 @@ audit_plan_sqls.sql_fingerprint,
 audit_plan_sqls.sql_text,
 audit_plan_sqls.schema_name,
 audit_plan_sqls.info,
-IF(audit_plan_sqls.audit_results IS NULL,'being_audited',audit_plan_sqls.audit_results) AS audit_results,
+audit_plan_sqls.audit_results,
+IF(audit_plan_sqls.audit_results IS NULL,'being_audited','') AS audit_status,
 audit_plan_sqls.priority
 
 {{- template "body" . -}} 

diff --git a/sqle/model/instance_audit_plan_list_test.go b/sqle/model/instance_audit_plan_list_test.go
@@ -32,7 +32,8 @@ audit_plan_sqls.sql_fingerprint,
 audit_plan_sqls.sql_text,
 audit_plan_sqls.schema_name,
 audit_plan_sqls.info,
-IF(audit_plan_sqls.audit_results IS NULL,'being_audited',audit_plan_sqls.audit_results) AS audit_results,
+audit_plan_sqls.audit_results,
+IF(audit_plan_sqls.audit_results IS NULL,'being_audited','') AS audit_status,
 audit_plan_sqls.priority
 
 FROM sql_manage_records AS audit_plan_sqls
@@ -59,7 +60,8 @@ audit_plan_sqls.sql_fingerprint,
 audit_plan_sqls.sql_text,
 audit_plan_sqls.schema_name,
 audit_plan_sqls.info,
-IF(audit_plan_sqls.audit_results IS NULL,'being_audited',audit_plan_sqls.audit_results) AS audit_results,
+audit_plan_sqls.audit_results,
+IF(audit_plan_sqls.audit_results IS NULL,'being_audited','') AS audit_status,
 audit_plan_sqls.priority
 
 FROM sql_manage_records AS audit_plan_sqls
@@ -87,7 +89,8 @@ audit_plan_sqls.sql_fingerprint,
 audit_plan_sqls.sql_text,
 audit_plan_sqls.schema_name,
 audit_plan_sqls.info,
-IF(audit_plan_sqls.audit_results IS NULL,'being_audited',audit_plan_sqls.audit_results) AS audit_results,
+audit_plan_sqls.audit_results,
+IF(audit_plan_sqls.audit_results IS NULL,'being_audited','') AS audit_status,
 audit_plan_sqls.priority
 
 FROM sql_manage_records AS audit_plan_sqls
@@ -115,7 +118,8 @@ audit_plan_sqls.sql_fingerprint,
 audit_plan_sqls.sql_text,
 audit_plan_sqls.schema_name,
 audit_plan_sqls.info,
-IF(audit_plan_sqls.audit_results IS NULL,'being_audited',audit_plan_sqls.audit_results) AS audit_results,
+audit_plan_sqls.audit_results,
+IF(audit_plan_sqls.audit_results IS NULL,'being_audited','') AS audit_status,
 audit_plan_sqls.priority
 
 FROM sql_manage_records AS audit_plan_sqls
@@ -144,7 +148,8 @@ audit_plan_sqls.sql_fingerprint,
 audit_plan_sqls.sql_text,
 audit_plan_sqls.schema_name,
 audit_plan_sqls.info,
-IF(audit_plan_sqls.audit_results IS NULL,'being_audited',audit_plan_sqls.audit_results) AS audit_results,
+audit_plan_sqls.audit_results,
+IF(audit_plan_sqls.audit_results IS NULL,'being_audited','') AS audit_status,
 audit_plan_sqls.priority
 
 FROM sql_manage_records AS audit_plan_sqls
@@ -172,7 +177,8 @@ audit_plan_sqls.sql_fingerprint,
 audit_plan_sqls.sql_text,
 audit_plan_sqls.schema_name,
 audit_plan_sqls.info,
-IF(audit_plan_sqls.audit_results IS NULL,'being_audited',audit_plan_sqls.audit_results) AS audit_results,
+audit_plan_sqls.audit_results,
+IF(audit_plan_sqls.audit_results IS NULL,'being_audited','') AS audit_status,
 audit_plan_sqls.priority
 
 FROM sql_manage_records AS audit_plan_sqls

diff --git a/sqle/server/auditplan/task_type_default.go b/sqle/server/auditplan/task_type_default.go
@@ -252,6 +252,7 @@ func (at *DefaultTaskV2) GetSQLData(ctx context.Context, ap *AuditPlan, persist
 			MetricNameCounter:              strconv.Itoa(int(info.Get(MetricNameCounter).Int())),
 			MetricNameLastReceiveTimestamp: info.Get(MetricNameLastReceiveTimestamp).String(),
 			model.AuditResultName:          sql.AuditResult.GetAuditJsonStrByLangTag(locale.Bundle.GetLangTagFromCtx(ctx)),
+			model.AuditStatus:              sql.AuditStatus,
 		})
 	}
 	return rows, count, nil

diff --git a/sqle/server/auditplan/task_type_mysql_schema_meta.go b/sqle/server/auditplan/task_type_mysql_schema_meta.go
@@ -361,6 +361,7 @@ func (at *BaseSchemaMetaTaskV2) GetSQLData(ctx context.Context, ap *AuditPlan, p
 			MetricNameMetaName:    info.Get(MetricNameMetaName).String(),
 			MetricNameMetaType:    info.Get(MetricNameMetaType).String(),
 			model.AuditResultName: sql.AuditResult.GetAuditJsonStrByLangTag(locale.Bundle.GetLangTagFromCtx(ctx)),
+			model.AuditStatus:     sql.AuditStatus,
 		})
 	}
 	return rows, count, nil

diff --git a/sqle/server/auditplan/task_type_oracle_topsql.go b/sqle/server/auditplan/task_type_oracle_topsql.go
@@ -242,6 +242,7 @@ func (at *OracleTopSQLTaskV2) GetSQLData(ctx context.Context, ap *AuditPlan, per
 			MetricNameBufferGetCounter:    strconv.Itoa(int(info.Get(MetricNameBufferGetCounter).Int())),
 			MetricNameUserIOWaitTimeTotal: fmt.Sprintf("%v", utils.Round(info.Get(MetricNameUserIOWaitTimeTotal).Float()/1000, 3)),
 			model.AuditResultName:         sql.AuditResult.GetAuditJsonStrByLangTag(locale.Bundle.GetLangTagFromCtx(ctx)),
+			model.AuditStatus:             sql.AuditStatus,
 		})
 	}
 	return rows, count, nil