add extra flag to determine to buildPattern or not

pingcap · Jun 24, 2022 · 9778fcf · 9778fcf
1 parent b2283c1
commit 9778fcf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/planner/core/logical_plans.go b/planner/core/logical_plans.go
@@ -1838,7 +1838,8 @@ type LogicalShow struct {
 	logicalSchemaProducer
 	ShowContents
 
-	Extractor ShowPredicateExtractor
+	Extractor    ShowPredicateExtractor
+	buildPattern bool // It depends on ShowPredicateExtractor now
 }
 
 // LogicalShowDDLJobs is for showing DDL job list.

diff --git a/planner/core/planbuilder.go b/planner/core/planbuilder.go
@@ -2928,6 +2928,7 @@ func (b *PlanBuilder) buildShow(ctx context.Context, show *ast.ShowStmt) (Plan,
 			GlobalScope:           show.GlobalScope,
 			Extended:              show.Extended,
 		},
+		buildPattern: true,
 	}.Init(b.ctx)
 	isView := false
 	isSequence := false
@@ -2939,6 +2940,7 @@ func (b *PlanBuilder) buildShow(ctx context.Context, show *ast.ShowStmt) (Plan,
 		}
 		if extractor := newShowBaseExtractor(*show); extractor.Extract() {
 			p.Extractor = extractor
+			p.buildPattern = false
 		}
 	case ast.ShowCreateTable, ast.ShowCreateSequence, ast.ShowPlacementForTable, ast.ShowPlacementForPartition:
 		var err error
@@ -3010,7 +3012,7 @@ func (b *PlanBuilder) buildShow(ctx context.Context, show *ast.ShowStmt) (Plan,
 	var np LogicalPlan
 	np = p
 	// If we have ShowPredicateExtractor, we do not buildSelection with Pattern
-	if show.Pattern != nil && p.Extractor == nil {
+	if show.Pattern != nil && p.buildPattern {
 		show.Pattern.Expr = &ast.ColumnNameExpr{
 			Name: &ast.ColumnName{Name: p.OutputNames()[0].ColName},
 		}