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.

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

planner: fix AccessPath.TableFilters got modified unexpectedly #30966

Merged
merged 5 commits into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
12 changes: 6 additions & 6 deletions planner/core/find_best_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -1409,15 +1409,15 @@ func (is *PhysicalIndexScan) addPushedDownSelection(copTask *copTask, p *DataSou
}

// SplitSelCondsWithVirtualColumn filter the select conditions which contain virtual column
func SplitSelCondsWithVirtualColumn(conds []expression.Expression) ([]expression.Expression, []expression.Expression) {
var filterConds []expression.Expression
for i := len(conds) - 1; i >= 0; i-- {
func SplitSelCondsWithVirtualColumn(conds []expression.Expression) (withoutVirt []expression.Expression, withVirt []expression.Expression) {
for i := range conds {
if expression.ContainVirtualColumn(conds[i : i+1]) {
filterConds = append(filterConds, conds[i])
conds = append(conds[:i], conds[i+1:]...)
withVirt = append(withVirt, conds[i])
} else {
withoutVirt = append(withoutVirt, conds[i])
}
}
return conds, filterConds
return withoutVirt, withVirt
}

func matchIndicesProp(idxCols []*expression.Column, colLens []int, propItems []property.SortItem) bool {
Expand Down
23 changes: 23 additions & 0 deletions planner/core/physical_plan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2016,3 +2016,26 @@ func (s *testPlanSuite) TestIssue28316(c *C) {
tk.MustQuery("explain format='brief' " + ts).Check(testkit.Rows(output[i].Plan...))
}
}

func (s *testPlanSuite) TestIssue30965(c *C) {
store, dom, err := newStoreWithBootstrap()
c.Assert(err, IsNil)
defer func() {
dom.Close()
store.Close()
}()
tk := testkit.NewTestKit(c, store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t30965")
tk.MustExec("CREATE TABLE `t30965` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, `d` int(11) GENERATED ALWAYS AS (`a` + 1) VIRTUAL, KEY `ib` (`b`));")
tk.MustExec("insert into t30965 (a,b,c) value(3,4,5);")
tk.MustQuery("select count(*) from t30965 where d = 2 and b = 4 and a = 3 and c = 5;").Check(testkit.Rows("0"))
tk.MustQuery("explain select count(*) from t30965 where d = 2 and b = 4 and a = 3 and c = 5;").Check(
time-and-fate marked this conversation as resolved.
Show resolved Hide resolved
testkit.Rows(
"StreamAgg_10 1.00 root funcs:count(1)->Column#6",
"└─Selection_28 0.00 root eq(test.t30965.d, 2)",
" └─IndexLookUp_27 0.00 root ",
" ├─IndexRangeScan_24(Build) 10.00 cop[tikv] table:t30965, index:ib(b) range:[4,4], keep order:false, stats:pseudo",
" └─Selection_26(Probe) 0.00 cop[tikv] eq(test.t30965.a, 3), eq(test.t30965.c, 5)",
" └─TableRowIDScan_25 10.00 cop[tikv] table:t30965 keep order:false, stats:pseudo"))
}