diff --git a/cmd/soar/soar.go b/cmd/soar/soar.go index 31720e77bdae4c7e31e7a4f53bdee218d7598ab3..8c1f80373767736a87e3537689aaef7e69b9328a 100644 --- a/cmd/soar/soar.go +++ b/cmd/soar/soar.go @@ -106,7 +106,7 @@ func main() { mysqlSuggest := make(map[string]advisor.Rule) // MySQL 返回的 ERROR 信息 if buf == "" { - common.Log.Debug("buf: %s, sql: %s empty", buf, sql) + common.Log.Debug("Ending, buf: '%s', sql: '%s'", buf, sql) break } // 查询请求切分 diff --git a/database/mysql.go b/database/mysql.go index 050c12abf1c702460b5e93fbdca40704c2fdcd2d..df2153b6c7adfc61fd6fde443ef988cd398849b9 100644 --- a/database/mysql.go +++ b/database/mysql.go @@ -235,7 +235,7 @@ func (db *Connector) ColumnCardinality(tb, col string) float64 { // IsView 判断表是否是视图 func (db *Connector) IsView(tbName string) bool { - common.Log.Debug("IsView, ShowTableStatus check `%s` is view", tbName) + common.Log.Debug("IsView, ShowTableStatus check if `%s` is view", tbName) tbStatus, err := db.ShowTableStatus(tbName) if err != nil { common.Log.Error("(db *Connector) IsView Error: %v:", err) diff --git a/database/sampling.go b/database/sampling.go index 9cdd8258d46b51dc87fc4da2f0ef4125e12b960a..bb0daef915c3d6e06acc051d7b7cd6b996fccfe3 100644 --- a/database/sampling.go +++ b/database/sampling.go @@ -154,6 +154,12 @@ func (db *Connector) startSampling(onlineConn *sql.DB, database, table string, w valuesCount = 0 } } + if len(valuesStr) > 0 { + err = db.doSampling(table, columnsStr, strings.Join(valuesStr, `,`)) + if err != nil { + common.LogIfWarn(err, "") + } + } res.Close() return err }