elegant fix drop view panic

pingcap · Oct 16, 2018 · 81cf95f · 81cf95f
1 parent 4c1615d
commit 81cf95f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/planner/core/logical_plan_test.go b/planner/core/logical_plan_test.go
@@ -1224,6 +1224,13 @@ func (s *testPlanSuite) TestColumnPruning(c *C) {
 				3: {"a"},
 			},
 		},
+		//issue 78333
+		{
+			sql: "drop view if exists v",
+			ans: map[int][]string{
+				1: {},
+			},
+		},
 	}
 	for _, tt := range tests {
 		comment := Commentf("for %s", tt.sql)

diff --git a/planner/core/planbuilder.go b/planner/core/planbuilder.go
@@ -227,8 +227,9 @@ func (b *PlanBuilder) buildDo(v *ast.DoStmt) (Plan, error) {
 			RetType:  expr.GetType(),
 		})
 	}
-	//make dual schema if not
-	var _ = dual.Schema()
+	if dual.schema == nil {
+		dual.schema = expression.NewSchema()
+	}
 	p.SetChildren(dual)
 	p.self = p
 	p.SetSchema(schema)

diff --git a/planner/core/preprocess_test.go b/planner/core/preprocess_test.go
@@ -194,9 +194,6 @@ func (s *testValidatorSuite) TestValidator(c *C) {
 		{"select * from ( select 1 ) a, (select 2) b;", true, nil},
 		{"select * from (select * from ( select 1 ) a join (select 2) b) b join (select 3) a;", false, nil},
 		{"select * from (select 1 ) a , (select 2) b, (select * from (select 3) a join (select 4) b) c;", false, nil},
-
-		//issue 7833
-		{"drop view if exists v;", true, nil},
 	}
 
 	store, dom, err := newStoreWithBootstrap()

diff --git a/planner/core/rule_column_pruning.go b/planner/core/rule_column_pruning.go
@@ -167,7 +167,7 @@ func (ds *DataSource) PruneColumns(parentUsedCols []*expression.Column) {
 
 // PruneColumns implements LogicalPlan interface.
 func (p *LogicalTableDual) PruneColumns(parentUsedCols []*expression.Column) {
-	used := getUsedList(parentUsedCols, p.schema)
+	used := getUsedList(parentUsedCols, p.Schema())
 	for i := len(used) - 1; i >= 0; i-- {
 		if !used[i] {
 			p.schema.Columns = append(p.schema.Columns[:i], p.schema.Columns[i+1:]...)