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 err check #22991

Merged
merged 9 commits into from
Mar 3, 2021
Merged

executor: fix err check #22991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a48c82
fix err check
Tjianke Feb 28, 2021
0c916ab
remove extra
Tjianke Feb 28, 2021
8438e5a
Merge branch 'master' into fixErrCheckExecutor
Tjianke Mar 1, 2021
bf1ecdf
Update executor/aggfuncs/aggfunc_test.go
Tjianke Mar 3, 2021
81ff7fb
fix err check
Tjianke Mar 3, 2021
fc1a158
Merge branch 'master' into fixErrCheckExecutor
ti-chi-bot Mar 3, 2021
358ff6d
Merge branch 'master' into fixErrCheckExecutor
ti-chi-bot Mar 3, 2021
13f61a4
Merge branch 'master' into fixErrCheckExecutor
ti-chi-bot Mar 3, 2021
2f4c6b0
Merge branch 'master' into fixErrCheckExecutor
ti-chi-bot Mar 3, 2021
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
71 changes: 48 additions & 23 deletions executor/aggfuncs/aggfunc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,12 @@ func (s *testSuite) testMergePartialResult(c *C, p aggTest) {

// update partial result.
for row := iter.Begin(); row != iter.End(); row = iter.Next() {
partialFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, partialResult)
_, err = partialFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, partialResult)
c.Assert(err, IsNil)
}
p.messUpChunk(srcChk)
partialFunc.AppendFinalResult2Chunk(s.ctx, partialResult, resultChk)
err = partialFunc.AppendFinalResult2Chunk(s.ctx, partialResult, resultChk)
c.Assert(err, IsNil)
dt := resultChk.GetRow(0).GetDatum(0, p.dataType)
if p.funcName == ast.AggFuncApproxCountDistinct {
dt = resultChk.GetRow(0).GetDatum(0, types.NewFieldType(mysql.TypeString))
Expand All @@ -413,11 +415,13 @@ func (s *testSuite) testMergePartialResult(c *C, p aggTest) {
iter.Begin()
iter.Next()
for row := iter.Next(); row != iter.End(); row = iter.Next() {
partialFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, partialResult)
_, err = partialFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, partialResult)
c.Assert(err, IsNil)
}
p.messUpChunk(srcChk)
resultChk.Reset()
partialFunc.AppendFinalResult2Chunk(s.ctx, partialResult, resultChk)
err = partialFunc.AppendFinalResult2Chunk(s.ctx, partialResult, resultChk)
c.Assert(err, IsNil)
dt = resultChk.GetRow(0).GetDatum(0, p.dataType)
if p.funcName == ast.AggFuncApproxCountDistinct {
dt = resultChk.GetRow(0).GetDatum(0, types.NewFieldType(mysql.TypeString))
Expand Down Expand Up @@ -490,10 +494,12 @@ func (s *testSuite) testMultiArgsMergePartialResult(c *C, p multiArgsAggTest) {

// update partial result.
for row := iter.Begin(); row != iter.End(); row = iter.Next() {
partialFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, partialResult)
// FIXME: cannot assert error since there are cases of error, e.g. JSON documents may not contain NULL member
_, _ = partialFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, partialResult)
}
p.messUpChunk(srcChk)
partialFunc.AppendFinalResult2Chunk(s.ctx, partialResult, resultChk)
err = partialFunc.AppendFinalResult2Chunk(s.ctx, partialResult, resultChk)
c.Assert(err, IsNil)
dt := resultChk.GetRow(0).GetDatum(0, p.retType)
result, err := dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[0])
c.Assert(err, IsNil)
Expand All @@ -508,11 +514,13 @@ func (s *testSuite) testMultiArgsMergePartialResult(c *C, p multiArgsAggTest) {
iter.Begin()
iter.Next()
for row := iter.Next(); row != iter.End(); row = iter.Next() {
partialFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, partialResult)
// FIXME: cannot check error
_, _ = partialFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, partialResult)
}
p.messUpChunk(srcChk)
resultChk.Reset()
partialFunc.AppendFinalResult2Chunk(s.ctx, partialResult, resultChk)
err = partialFunc.AppendFinalResult2Chunk(s.ctx, partialResult, resultChk)
c.Assert(err, IsNil)
dt = resultChk.GetRow(0).GetDatum(0, p.retType)
result, err = dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[1])
c.Assert(err, IsNil)
Expand Down Expand Up @@ -614,10 +622,12 @@ func (s *testSuite) testAggFunc(c *C, p aggTest) {

iter := chunk.NewIterator4Chunk(srcChk)
for row := iter.Begin(); row != iter.End(); row = iter.Next() {
finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
_, err = finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
c.Assert(err, IsNil)
}
p.messUpChunk(srcChk)
finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
err = finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
c.Assert(err, IsNil)
dt := resultChk.GetRow(0).GetDatum(0, desc.RetTp)
result, err := dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[1])
c.Assert(err, IsNil)
Expand All @@ -626,7 +636,8 @@ func (s *testSuite) testAggFunc(c *C, p aggTest) {
// test the empty input
resultChk.Reset()
finalFunc.ResetPartialResult(finalPr)
finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
err = finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
c.Assert(err, IsNil)
dt = resultChk.GetRow(0).GetDatum(0, desc.RetTp)
result, err = dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[0])
c.Assert(err, IsNil)
Expand All @@ -647,16 +658,19 @@ func (s *testSuite) testAggFunc(c *C, p aggTest) {
srcChk = p.genSrcChk()
iter = chunk.NewIterator4Chunk(srcChk)
for row := iter.Begin(); row != iter.End(); row = iter.Next() {
finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
_, err = finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
c.Assert(err, IsNil)
}
p.messUpChunk(srcChk)
srcChk = p.genSrcChk()
iter = chunk.NewIterator4Chunk(srcChk)
for row := iter.Begin(); row != iter.End(); row = iter.Next() {
finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
_, err = finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
c.Assert(err, IsNil)
}
p.messUpChunk(srcChk)
finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
err = finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
c.Assert(err, IsNil)
dt = resultChk.GetRow(0).GetDatum(0, desc.RetTp)
result, err = dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[1])
c.Assert(err, IsNil)
Expand All @@ -665,7 +679,8 @@ func (s *testSuite) testAggFunc(c *C, p aggTest) {
// test the empty input
resultChk.Reset()
finalFunc.ResetPartialResult(finalPr)
finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
err = finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
c.Assert(err, IsNil)
dt = resultChk.GetRow(0).GetDatum(0, desc.RetTp)
result, err = dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[0])
c.Assert(err, IsNil)
Expand Down Expand Up @@ -726,10 +741,12 @@ func (s *testSuite) testMultiArgsAggFunc(c *C, p multiArgsAggTest) {

iter := chunk.NewIterator4Chunk(srcChk)
for row := iter.Begin(); row != iter.End(); row = iter.Next() {
finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
// FIXME: cannot assert error since there are cases of error, e.g. rows were cut by GROUPCONCAT
_, _ = finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
}
p.messUpChunk(srcChk)
finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
err = finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
c.Assert(err, IsNil)
dt := resultChk.GetRow(0).GetDatum(0, desc.RetTp)
result, err := dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[1])
c.Assert(err, IsNil)
Expand All @@ -738,7 +755,8 @@ func (s *testSuite) testMultiArgsAggFunc(c *C, p multiArgsAggTest) {
// test the empty input
resultChk.Reset()
finalFunc.ResetPartialResult(finalPr)
finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
err = finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
c.Assert(err, IsNil)
dt = resultChk.GetRow(0).GetDatum(0, desc.RetTp)
result, err = dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[0])
c.Assert(err, IsNil)
Expand All @@ -759,16 +777,19 @@ func (s *testSuite) testMultiArgsAggFunc(c *C, p multiArgsAggTest) {
srcChk = p.genSrcChk()
iter = chunk.NewIterator4Chunk(srcChk)
for row := iter.Begin(); row != iter.End(); row = iter.Next() {
finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
// FIXME: cannot check error
_, _ = finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
}
p.messUpChunk(srcChk)
srcChk = p.genSrcChk()
iter = chunk.NewIterator4Chunk(srcChk)
for row := iter.Begin(); row != iter.End(); row = iter.Next() {
finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
// FIXME: cannot check error
_, _ = finalFunc.UpdatePartialResult(s.ctx, []chunk.Row{row}, finalPr)
}
p.messUpChunk(srcChk)
finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
err = finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
c.Assert(err, IsNil)
dt = resultChk.GetRow(0).GetDatum(0, desc.RetTp)
result, err = dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[1])
c.Assert(err, IsNil)
Expand All @@ -777,7 +798,8 @@ func (s *testSuite) testMultiArgsAggFunc(c *C, p multiArgsAggTest) {
// test the empty input
resultChk.Reset()
finalFunc.ResetPartialResult(finalPr)
finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
err = finalFunc.AppendFinalResult2Chunk(s.ctx, finalPr, resultChk)
c.Assert(err, IsNil)
dt = resultChk.GetRow(0).GetDatum(0, desc.RetTp)
result, err = dt.CompareDatum(s.ctx.GetSessionVars().StmtCtx, &p.results[0])
c.Assert(err, IsNil)
Expand Down Expand Up @@ -925,7 +947,10 @@ func (s *testSuite) baseBenchmarkAggFunc(b *testing.B,
output.Reset()
b.ResetTimer()
for i := 0; i < b.N; i++ {
finalFunc.UpdatePartialResult(s.ctx, input, finalPr)
_, err := finalFunc.UpdatePartialResult(s.ctx, input, finalPr)
if err != nil {
b.Fatal(err)
}
b.StopTimer()
output.Reset()
b.StartTimer()
Expand Down
8 changes: 6 additions & 2 deletions executor/aggfuncs/func_group_concat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,14 @@ func (s *testSuite) TestGroupConcat(c *C) {
test2.orderBy = true
s.testMultiArgsAggFunc(c, test2)

defer variable.SetSessionSystemVar(s.ctx.GetSessionVars(), variable.GroupConcatMaxLen, types.NewStringDatum("1024"))
defer func() {
err := variable.SetSessionSystemVar(s.ctx.GetSessionVars(), variable.GroupConcatMaxLen, types.NewStringDatum("1024"))
c.Assert(err, IsNil)
}()
// minimum GroupConcatMaxLen is 4
for i := 4; i <= 7; i++ {
variable.SetSessionSystemVar(s.ctx.GetSessionVars(), variable.GroupConcatMaxLen, types.NewStringDatum(fmt.Sprint(i)))
err := variable.SetSessionSystemVar(s.ctx.GetSessionVars(), variable.GroupConcatMaxLen, types.NewStringDatum(fmt.Sprint(i)))
c.Assert(err, IsNil)
test2 = buildMultiArgsAggTester(ast.AggFuncGroupConcat, []byte{mysql.TypeString, mysql.TypeString}, mysql.TypeString, 5, nil, "44 33 22 11 00"[:i])
test2.orderBy = true
s.testMultiArgsAggFunc(c, test2)
Expand Down
20 changes: 16 additions & 4 deletions executor/analyze_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,10 @@ func (s *testSuite1) TestAnalyzeTooLongColumns(c *C) {
func (s *testSuite1) TestAnalyzeIndexExtractTopN(c *C) {
store, err := mockstore.NewMockStore()
c.Assert(err, IsNil)
defer store.Close()
defer func() {
err := store.Close()
c.Assert(err, IsNil)
}()
var dom *domain.Domain
session.DisableStats4Test()
session.SetSchemaLease(0)
Expand Down Expand Up @@ -296,7 +299,10 @@ func (s *testFastAnalyze) TestAnalyzeFastSample(c *C) {
}),
)
c.Assert(err, IsNil)
defer store.Close()
defer func() {
err := store.Close()
c.Assert(err, IsNil)
}()
var dom *domain.Domain
session.DisableStats4Test()
session.SetSchemaLease(0)
Expand Down Expand Up @@ -393,7 +399,10 @@ func (s *testFastAnalyze) TestFastAnalyze(c *C) {
}),
)
c.Assert(err, IsNil)
defer store.Close()
defer func() {
err := store.Close()
c.Assert(err, IsNil)
}()
var dom *domain.Domain
session.DisableStats4Test()
session.SetSchemaLease(0)
Expand Down Expand Up @@ -656,7 +665,10 @@ func (s *testFastAnalyze) TestFastAnalyzeRetryRowCount(c *C) {
mockstore.WithClientHijacker(hijackClient),
)
c.Assert(err, IsNil)
defer store.Close()
defer func() {
err := store.Close()
c.Assert(err, IsNil)
}()
dom, err := session.BootstrapSession(store)
c.Assert(err, IsNil)
defer dom.Close()
Expand Down
3 changes: 2 additions & 1 deletion executor/ddl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,13 +805,14 @@ func (s *testSuite8) TestShardRowIDBits(c *C) {
tblInfo.ShardRowIDBits = 5
tblInfo.MaxShardRowIDBits = 5

kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
err = kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
m := meta.NewMeta(txn)
_, err = m.GenSchemaVersion()
c.Assert(err, IsNil)
c.Assert(m.UpdateTable(db.ID, tblInfo), IsNil)
return nil
})
c.Assert(err, IsNil)
err = dom.Reload()
c.Assert(err, IsNil)

Expand Down
5 changes: 4 additions & 1 deletion executor/distsql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ import (
func checkGoroutineExists(keyword string) bool {
buf := new(bytes.Buffer)
profile := pprof.Lookup("goroutine")
profile.WriteTo(buf, 1)
err := profile.WriteTo(buf, 1)
if err != nil {
panic(err)
}
str := buf.String()
return strings.Contains(str, keyword)
}
Expand Down
Loading