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

statistics: fix a error check to prevent nil dereference (#27295) #27305

Merged
merged 5 commits into from
Sep 10, 2021
Merged

statistics: fix a error check to prevent nil dereference (#27295) #27305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
097c073
cherry pick #27295 to release-4.0
time-and-fate Aug 17, 2021
0b1fc46
resolve conflicts
time-and-fate Aug 17, 2021
cf13e70
Merge branch 'release-4.0' into release-4.0-a0de91fa06a8
ti-chi-bot Sep 10, 2021
ec31182
Merge branch 'release-4.0' into release-4.0-a0de91fa06a8
ti-chi-bot Sep 10, 2021
e53556a
Merge branch 'release-4.0' into release-4.0-a0de91fa06a8
ti-chi-bot Sep 10, 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
2 changes: 1 addition & 1 deletion statistics/selectivity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,10 @@ func getMaskAndRanges(ctx sessionctx.Context, exprs []expression.Expression, ran
}
var res *ranger.DetachRangeResult
res, err = ranger.DetachCondAndBuildRangeForIndex(ctx, exprs, cols, lengths)
ranges, accessConds, remainedConds, isDNF = res.Ranges, res.AccessConds, res.RemainedConds, res.IsDNFCond
if err != nil {
return 0, nil, false, err
}
ranges, accessConds, remainedConds, isDNF = res.Ranges, res.AccessConds, res.RemainedConds, res.IsDNFCond
default:
panic("should never be here")
}
Expand Down
10 changes: 10 additions & 0 deletions statistics/selectivity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,3 +667,13 @@ func (s *testStatsSuite) TestCollationColumnEstimate(c *C) {
tk.MustQuery(input[i]).Check(testkit.Rows(output[i]...))
}
}

func (s *testStatsSuite) TestIssue27294(c *C) {
defer cleanEnv(c, s.store, s.do)
testKit := testkit.NewTestKit(c, s.store)

testKit.MustExec("use test")
testKit.MustExec("drop table if exists tt")
testKit.MustExec("create table tt (COL1 blob DEFAULT NULL,COL2 decimal(37,4) DEFAULT NULL,COL3 timestamp NULL DEFAULT NULL,COL4 int(11) DEFAULT NULL,UNIQUE KEY U_M_COL4(COL1(10),COL2), UNIQUE KEY U_M_COL5(COL3,COL2));")
testKit.MustExec("explain select * from tt where col1 is not null or col2 not between 454623814170074.2771 and -975540642273402.9269 and col3 not between '2039-1-19 10:14:57' and '2002-3-27 14:40:23';")
}