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

planner: fix inconsistent schema between UnionAll and child operator #30231

Merged
merged 11 commits into from
Dec 1, 2021
Merged

planner: fix inconsistent schema between UnionAll and child operator #30231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
195186d
fix
time-and-fate Nov 29, 2021
63ada95
add test
time-and-fate Nov 29, 2021
807bf1e
fix test
time-and-fate Nov 29, 2021
39eaa42
fix test
time-and-fate Nov 29, 2021
476d4b8
fix fmt
time-and-fate Nov 29, 2021
70144e7
switch to another method
time-and-fate Nov 30, 2021
39c7182
Merge branch 'master' into issue29705
time-and-fate Nov 30, 2021
b83fad7
make proj.schema and proj.exprs share the same slice of columns
time-and-fate Dec 1, 2021
139229c
Merge remote-tracking branch 'origin/issue29705' into issue29705
time-and-fate Dec 1, 2021
f2a35a7
Merge remote-tracking branch 'upstream/master' into issue29705
time-and-fate Dec 1, 2021
8cc4964
Merge branch 'master' into issue29705
ti-chi-bot Dec 1, 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
22 changes: 22 additions & 0 deletions planner/core/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4713,6 +4713,12 @@ func (s *testIntegrationSerialSuite) TestPushDownGroupConcatToTiFlash(c *C) {

func (s *testIntegrationSuite) TestIssue27797(c *C) {
tk := testkit.NewTestKit(c, s.store)
origin := tk.MustQuery("SELECT @@session.tidb_partition_prune_mode")
originStr := origin.Rows()[0][0].(string)
defer func() {
tk.MustExec("set @@session.tidb_partition_prune_mode = '" + originStr + "'")
}()
tk.MustExec("set @@session.tidb_partition_prune_mode = 'static'")
tk.MustExec("use test")
tk.MustExec("drop table if exists t27797")
tk.MustExec("create table t27797(a int, b int, c int, d int) " +
Expand Down Expand Up @@ -4948,6 +4954,22 @@ func (s *testIntegrationSuite) TestIssue30094(c *C) {
))
}

func (s *testIntegrationSuite) TestIssue29705(c *C) {
tk := testkit.NewTestKit(c, s.store)
origin := tk.MustQuery("SELECT @@session.tidb_partition_prune_mode")
originStr := origin.Rows()[0][0].(string)
defer func() {
tk.MustExec("set @@session.tidb_partition_prune_mode = '" + originStr + "'")
}()
tk.MustExec("set @@session.tidb_partition_prune_mode = 'static'")
tk.MustExec("use test")
tk.MustExec("drop table if exists t;")
tk.MustExec("create table t(id int) partition by hash(id) partitions 4;")
tk.MustExec("insert into t values(1);")
result := tk.MustQuery("SELECT COUNT(1) FROM ( SELECT COUNT(1) FROM t b GROUP BY id) a;")
result.Check(testkit.Rows("1"))
}

func (s *testIntegrationSerialSuite) TestIssue30271(c *C) {
defer collate.SetNewCollationEnabledForTest(false)
collate.SetNewCollationEnabledForTest(true)
Expand Down
17 changes: 17 additions & 0 deletions planner/core/rule_column_pruning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,23 @@ func (p *LogicalUnionAll) PruneColumns(parentUsedCols []*expression.Column) erro
p.schema.Columns = append(p.schema.Columns[:i], p.schema.Columns[i+1:]...)
}
}
// It's possible that the child operator adds extra columns to the schema.
time-and-fate marked this conversation as resolved.
Show resolved Hide resolved
// Currently, (*LogicalAggregation).PruneColumns() might do this.
// But we don't need such columns, so we add an extra Projection to prune this column when this happened.
for i, child := range p.Children() {
if p.schema.Len() < child.Schema().Len() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p.schema is adjusted with child[0] . Will it happens that p.schema.Len() > child[1].Schema().Len() ?

schema := p.schema.Clone()
exprs := make([]expression.Expression, len(p.schema.Columns))
for j, col := range schema.Columns {
exprs[j] = col
}
proj := LogicalProjection{Exprs: exprs, AvoidColumnEvaluator: true}.Init(p.ctx, p.blockOffset)
proj.SetSchema(schema)

proj.SetChildren(child)
p.children[i] = proj
}
}
}
return nil
}
Expand Down