fix XiaoMi#178 and add optimizer hint in SplitStatement function (Xia…

…oMi#179) * fix XiaoMi#176 JSON datatype only support utf8mb4 now * splitstatement support optimizer hint https://dev.mysql.com/doc/refman/8.0/en/optimizer-hints.html https://dev.mysql.com/doc/refman/8.0/en/comments.html * vendor daily update
jerry-00 · Jan 3, 2019 · d424298 · d424298
1 parent b0509d0
commit d424298
Show file tree

Hide file tree

Showing 22 changed files with 1,714 additions and 1,432 deletions.
diff --git a/ast/testdata/TestSplitStatement.golden b/ast/testdata/TestSplitStatement.golden
@@ -36,6 +36,8 @@ where col = 1
 tb;
 18 
 -- comment
+19 INSERT /*+ SET_VAR(foreign_key_checks=OFF) */ INTO t2 VALUES(2);
+20 select /*!50000 1,*/ 1;
 0 select * from test\Ghello
 1 select 'hello\Gworld', col from test\Ghello
 2 -- select * from test\Ghello

diff --git a/ast/token.go b/ast/token.go
@@ -898,8 +898,11 @@ func SplitStatement(buf []byte, delimiter []byte) (string, string, []byte) {
 		}
 
 		// multi line comment
+		// https://dev.mysql.com/doc/refman/8.0/en/comments.html
+		// https://dev.mysql.com/doc/refman/8.0/en/optimizer-hints.html
 		if b == '/' && i+1 < len(buf) && buf[i+1] == '*' {
-			if !multiLineComment && !singleLineComment && !quoted && buf[i+2] != '!' {
+			if !multiLineComment && !singleLineComment && !quoted &&
+				(buf[i+2] != '!' && buf[i+2] != '+') {
 				i = i + 2
 				multiLineComment = true
 				continue

diff --git a/ast/token_test.go b/ast/token_test.go
@@ -166,6 +166,8 @@ select col from tb where col = 1;`),
 select col from tb;
 select col from tb;
 `),
+		[]byte(`INSERT /*+ SET_VAR(foreign_key_checks=OFF) */ INTO t2 VALUES(2);`),
+		[]byte(`select /*!50000 1,*/ 1;`),
 	}
 	buf2s := [][]byte{
 		[]byte("select * from test\\Ghello"),

diff --git a/database/sampling.go b/database/sampling.go
@@ -137,6 +137,9 @@ func (db *Connector) startSampling(onlineConn *sql.DB, database, table string, w
 				values = append(values, "NULL")
 			} else {
 				switch columnTypes[i].DatabaseTypeName() {
+				case "JSON":
+					// https://github.com/XiaoMi/soar/issues/178
+					values = append(values, fmt.Sprintf(`convert(X'%s' using utf8mb4)`, fmt.Sprintf("%x", val)))
 				case "TIMESTAMP", "DATETIME":
 					t, err := time.Parse(time.RFC3339, string(val))
 					if err != nil {

diff --git a/vendor/github.com/pingcap/parser/ast/ast.go b/vendor/github.com/pingcap/parser/ast/ast.go
diff --git a/vendor/github.com/pingcap/parser/ast/dml.go b/vendor/github.com/pingcap/parser/ast/dml.go
diff --git a/vendor/github.com/pingcap/parser/ast/flag.go b/vendor/github.com/pingcap/parser/ast/flag.go
diff --git a/vendor/github.com/pingcap/parser/ast/functions.go b/vendor/github.com/pingcap/parser/ast/functions.go
diff --git a/vendor/github.com/pingcap/parser/ast/misc.go b/vendor/github.com/pingcap/parser/ast/misc.go