Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

executor: fix bug when parsing the slow logs if the logNum is small (#20959) #21211

Merged
merged 8 commits into from
Nov 27, 2020
Merged

executor: fix bug when parsing the slow logs if the logNum is small (#20959) #21211

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c819e7
cherry pick #20959 to release-4.0
TszKitLo40 Nov 23, 2020
e186f85
Merge branch 'release-4.0' into release-4.0-ea3e4fa5194f
crazycs520 Nov 24, 2020
ef2bf64
fix test
crazycs520 Nov 26, 2020
99794a9
Merge branch 'release-4.0' into release-4.0-ea3e4fa5194f
crazycs520 Nov 26, 2020
974b41d
Merge branch 'release-4.0' into release-4.0-ea3e4fa5194f
crazycs520 Nov 26, 2020
a0aaed5
Merge branch 'release-4.0' into release-4.0-ea3e4fa5194f
crazycs520 Nov 26, 2020
898d673
Merge branch 'release-4.0' into release-4.0-ea3e4fa5194f
ti-srebot Nov 26, 2020
537cf92
Merge branch 'release-4.0' into release-4.0-ea3e4fa5194f
crazycs520 Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion executor/slow_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func (e *slowQueryRetriever) getBatchLog(reader *bufio.Reader, offset *offset, n
line = string(hack.String(lineByte))
log = append(log, line)
if strings.HasSuffix(line, variable.SlowLogSQLSuffixStr) {
if strings.HasPrefix(line, "use") {
if strings.HasPrefix(line, "use") || strings.HasPrefix(line, variable.SlowLogRowPrefixStr) {
continue
}
break
Expand Down
44 changes: 30 additions & 14 deletions executor/slow_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
"github.com/pingcap/tidb/util/mock"
)

func parseLog(retriever *slowQueryRetriever, sctx sessionctx.Context, reader *bufio.Reader) ([][]types.Datum, error) {
func parseLog(retriever *slowQueryRetriever, sctx sessionctx.Context, reader *bufio.Reader, logNum int) ([][]types.Datum, error) {
retriever.parsedSlowLogCh = make(chan parsedSlowLog, 100)
ctx := context.Background()
retriever.parseSlowLog(ctx, sctx, reader, 64)
retriever.parseSlowLog(ctx, sctx, reader, logNum)
slowLog := <-retriever.parsedSlowLogCh
rows, err := slowLog.rows, slowLog.err
if err == io.EOF {
Expand All @@ -45,11 +45,11 @@ func parseLog(retriever *slowQueryRetriever, sctx sessionctx.Context, reader *bu
return rows, err
}

func parseSlowLog(sctx sessionctx.Context, reader *bufio.Reader) ([][]types.Datum, error) {
func parseSlowLog(sctx sessionctx.Context, reader *bufio.Reader, logNum int) ([][]types.Datum, error) {
retriever := &slowQueryRetriever{}
// Ignore the error is ok for test.
terror.Log(retriever.initialize(sctx))
rows, err := parseLog(retriever, sctx, reader)
rows, err := parseLog(retriever, sctx, reader, logNum)
return rows, err
}

Expand Down Expand Up @@ -82,7 +82,7 @@ select * from t;`
c.Assert(err, IsNil)
sctx := mock.NewContext()
sctx.GetSessionVars().TimeZone = loc
_, err = parseSlowLog(sctx, reader)
_, err = parseSlowLog(sctx, reader, 64)
c.Assert(err, NotNil)
c.Assert(err.Error(), Equals, "panic test")
}
Expand Down Expand Up @@ -116,7 +116,7 @@ select * from t;`
c.Assert(err, IsNil)
ctx := mock.NewContext()
ctx.GetSessionVars().TimeZone = loc
rows, err := parseSlowLog(ctx, reader)
rows, err := parseSlowLog(ctx, reader, 64)
c.Assert(err, IsNil)
c.Assert(len(rows), Equals, 1)
recordString := ""
Expand All @@ -137,6 +137,22 @@ select * from t;`
`update t set i = 1;,select * from t;`
c.Assert(recordString, Equals, expectRecordString)

// Issue 20928
reader = bufio.NewReader(bytes.NewBufferString(slowLogStr))
rows, err = parseSlowLog(ctx, reader, 1)
c.Assert(err, IsNil)
c.Assert(len(rows), Equals, 1)
recordString = ""
for i, value := range rows[0] {
str, err := value.ToString()
c.Assert(err, IsNil)
if i > 0 {
recordString += ","
}
recordString += str
}
c.Assert(expectRecordString, Equals, recordString)

// fix sql contain '# ' bug
slowLog := bytes.NewBufferString(
`# Time: 2019-04-28T15:24:04.309074+08:00
Expand All @@ -152,7 +168,7 @@ select a# from t;
select * from t;
`)
reader = bufio.NewReader(slowLog)
_, err = parseSlowLog(ctx, reader)
_, err = parseSlowLog(ctx, reader, 64)
c.Assert(err, IsNil)

// test for time format compatibility.
Expand All @@ -163,7 +179,7 @@ select * from t;
select * from t;
`)
reader = bufio.NewReader(slowLog)
rows, err = parseSlowLog(ctx, reader)
rows, err = parseSlowLog(ctx, reader, 64)
c.Assert(err, IsNil)
c.Assert(len(rows) == 2, IsTrue)
t0Str, err := rows[0][0].ToString()
Expand All @@ -180,7 +196,7 @@ select * from t;
select * from t;
`)
reader = bufio.NewReader(slowLog)
_, err = parseSlowLog(ctx, reader)
_, err = parseSlowLog(ctx, reader, 64)
c.Assert(err, IsNil)
warnings := ctx.GetSessionVars().StmtCtx.GetWarnings()
c.Assert(warnings, HasLen, 1)
Expand All @@ -204,13 +220,13 @@ select * from t;
sql := strings.Repeat("x", int(variable.MaxOfMaxAllowedPacket+1))
slowLog.WriteString(sql)
reader := bufio.NewReader(slowLog)
_, err = parseSlowLog(ctx, reader)
_, err = parseSlowLog(ctx, reader, 64)
c.Assert(err, NotNil)
c.Assert(err.Error(), Equals, "single line length exceeds limit: 65536")

variable.MaxOfMaxAllowedPacket = originValue
reader = bufio.NewReader(slowLog)
_, err = parseSlowLog(ctx, reader)
_, err = parseSlowLog(ctx, reader, 64)
c.Assert(err, IsNil)
}

Expand Down Expand Up @@ -261,7 +277,7 @@ select * from t;`)
c.Assert(err, IsNil)
ctx := mock.NewContext()
ctx.GetSessionVars().TimeZone = loc
_, err = parseSlowLog(ctx, scanner)
_, err = parseSlowLog(ctx, scanner, 64)
c.Assert(err, IsNil)

// Test parser error.
Expand All @@ -271,7 +287,7 @@ select * from t;`)
`)

scanner = bufio.NewReader(slowLog)
_, err = parseSlowLog(ctx, scanner)
_, err = parseSlowLog(ctx, scanner, 64)
c.Assert(err, IsNil)
warnings := ctx.GetSessionVars().StmtCtx.GetWarnings()
c.Assert(warnings, HasLen, 1)
Expand Down Expand Up @@ -430,7 +446,7 @@ select 7;`
c.Assert(retriever.files, HasLen, len(cas.files), comment)
if len(retriever.files) > 0 {
reader := bufio.NewReader(retriever.files[0].file)
rows, err := parseLog(retriever, sctx, reader)
rows, err := parseLog(retriever, sctx, reader, 64)
c.Assert(err, IsNil)
c.Assert(len(rows), Equals, len(cas.querys), comment)
for i, row := range rows {
Expand Down