fix XiaoMi#58

we change mymysql to go-sql-driver and use insert unhex() for any dangerous data type.
jerry-00 · Dec 26, 2018 · 1fece19 · 1fece19
1 parent a583e9d
commit 1fece19
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
 }