infoschema: print line number in parser slow log error for locating t…

…he wrong line (#12781)
pingcap · Nov 13, 2019 · f7067ea · f7067ea
1 parent 7f63a80
commit f7067ea
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/infoschema/slow_log.go b/infoschema/slow_log.go
@@ -104,7 +104,9 @@ func ParseSlowLog(tz *time.Location, reader *bufio.Reader) ([][]types.Datum, err
 	var rows [][]types.Datum
 	startFlag := false
 	var st *slowQueryTuple
+	lineNum := 0
 	for {
+		lineNum++
 		lineByte, err := getOneLine(reader)
 		if err != nil {
 			if err == io.EOF {
@@ -116,7 +118,7 @@ func ParseSlowLog(tz *time.Location, reader *bufio.Reader) ([][]types.Datum, err
 		// Check slow log entry start flag.
 		if !startFlag && strings.HasPrefix(line, variable.SlowLogStartPrefixStr) {
 			st = &slowQueryTuple{}
-			err = st.setFieldValue(tz, variable.SlowLogTimeStr, line[len(variable.SlowLogStartPrefixStr):])
+			err = st.setFieldValue(tz, variable.SlowLogTimeStr, line[len(variable.SlowLogStartPrefixStr):], lineNum)
 			if err != nil {
 				return rows, err
 			}
@@ -137,15 +139,15 @@ func ParseSlowLog(tz *time.Location, reader *bufio.Reader) ([][]types.Datum, err
 						if strings.HasSuffix(field, ":") {
 							field = field[:len(field)-1]
 						}
-						err = st.setFieldValue(tz, field, fieldValues[i+1])
+						err = st.setFieldValue(tz, field, fieldValues[i+1], lineNum)
 						if err != nil {
 							return rows, err
 						}
 					}
 				}
 			} else if strings.HasSuffix(line, variable.SlowLogSQLSuffixStr) {
 				// Get the sql string, and mark the start flag to false.
-				err = st.setFieldValue(tz, variable.SlowLogQuerySQLStr, string(hack.Slice(line)))
+				err = st.setFieldValue(tz, variable.SlowLogQuerySQLStr, string(hack.Slice(line)), lineNum)
 				if err != nil {
 					return rows, err
 				}
@@ -235,7 +237,7 @@ type slowQueryTuple struct {
 	plan               string
 }
 
-func (st *slowQueryTuple) setFieldValue(tz *time.Location, field, value string) error {
+func (st *slowQueryTuple) setFieldValue(tz *time.Location, field, value string, lineNum int) error {
 	var err error
 	switch field {
 	case variable.SlowLogTimeStr:
@@ -334,7 +336,7 @@ func (st *slowQueryTuple) setFieldValue(tz *time.Location, field, value string)
 		st.sql = value
 	}
 	if err != nil {
-		return errors.Wrap(err, "parse slow log failed `"+field+"` error")
+		return errors.Wrap(err, "Parse slow log at line "+strconv.FormatInt(int64(lineNum), 10)+" failed. Field: `"+field+"`, error")
 	}
 	return nil
 }

diff --git a/infoschema/slow_log_test.go b/infoschema/slow_log_test.go
@@ -123,7 +123,7 @@ select * from t;
 	reader = bufio.NewReader(slowLog)
 	_, err = infoschema.ParseSlowLog(loc, reader)
 	c.Assert(err, NotNil)
-	c.Assert(err.Error(), Equals, "parse slow log failed `Succ` error: strconv.ParseBool: parsing \"abc\": invalid syntax")
+	c.Assert(err.Error(), Equals, "Parse slow log at line 2 failed. Field: `Succ`, error: strconv.ParseBool: parsing \"abc\": invalid syntax")
 }
 
 func (s *testSuite) TestSlowLogParseTime(c *C) {
@@ -172,4 +172,16 @@ select * from t;`)
 	c.Assert(err, IsNil)
 	_, err = infoschema.ParseSlowLog(loc, scanner)
 	c.Assert(err, IsNil)
+
+	// Test parser error.
+	slowLog = bytes.NewBufferString(
+		`# Time: 2019-05-12-11:23:29.614327491 +0800
+# Txn_start_ts: 405888132465033227#
+`)
+
+	scanner = bufio.NewReader(slowLog)
+	_, err = infoschema.ParseSlowLog(loc, scanner)
+	c.Assert(err, NotNil)
+	c.Assert(err.Error(), Equals, "Parse slow log at line 2 failed. Field: `Txn_start_ts`, error: strconv.ParseUint: parsing \"405888132465033227#\": invalid syntax")
+
 }