From f6422684947af5ac62734a300ce57b5f84e83505 Mon Sep 17 00:00:00 2001 From: yisaer Date: Wed, 15 Dec 2021 18:21:42 +0800 Subject: [PATCH] address the comment Signed-off-by: yisaer --- planner/core/logical_plan_trace_test.go | 14 +++++++------- planner/core/rule_partition_processor.go | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/planner/core/logical_plan_trace_test.go b/planner/core/logical_plan_trace_test.go index 8cdc2176ade04..58348bd7712de 100644 --- a/planner/core/logical_plan_trace_test.go +++ b/planner/core/logical_plan_trace_test.go @@ -92,7 +92,7 @@ func (s *testPlanSuite) TestSingleRuleTraceStep(c *C) { assertRuleName: "partition_processor", assertRuleSteps: []assertTraceStep{ { - assertReason: "Datasource[1] have multi available partition tables[p1,p2] after partition pruning", + assertReason: "Datasource[1] has multiple needed partitions[p1,p2] after pruning", assertAction: "Datasource[1] becomes PartitionUnion[6] with children[TableScan[1],TableScan[1]]", }, }, @@ -103,7 +103,7 @@ func (s *testPlanSuite) TestSingleRuleTraceStep(c *C) { assertRuleName: "partition_processor", assertRuleSteps: []assertTraceStep{ { - assertReason: "Datasource[1] has one available partiton table[p1] after partition pruning", + assertReason: "Datasource[1] has one needed partition[p1] after pruning", assertAction: "Datasource[1] becomes TableScan[1]", }, }, @@ -114,7 +114,7 @@ func (s *testPlanSuite) TestSingleRuleTraceStep(c *C) { assertRuleName: "partition_processor", assertRuleSteps: []assertTraceStep{ { - assertReason: "Datasource[1] have multi available partition tables[p1,p2] after partition pruning", + assertReason: "Datasource[1] has multiple needed partitions[p1,p2] after pruning", assertAction: "Datasource[1] becomes PartitionUnion[7] with children[TableScan[1],TableScan[1]]", }, }, @@ -125,7 +125,7 @@ func (s *testPlanSuite) TestSingleRuleTraceStep(c *C) { assertRuleName: "partition_processor", assertRuleSteps: []assertTraceStep{ { - assertReason: "Datasource[1] has one available partiton table[p2] after partition pruning", + assertReason: "Datasource[1] has one needed partition[p2] after pruning", assertAction: "Datasource[1] becomes TableScan[1]", }, }, @@ -136,7 +136,7 @@ func (s *testPlanSuite) TestSingleRuleTraceStep(c *C) { assertRuleName: "partition_processor", assertRuleSteps: []assertTraceStep{ { - assertReason: "Datasource[1] has no available partition table after partition pruning", + assertReason: "Datasource[1] doesn't have needed partition table after pruning", assertAction: "Datasource[1] becomes TableDual[5]", }, }, @@ -147,7 +147,7 @@ func (s *testPlanSuite) TestSingleRuleTraceStep(c *C) { assertRuleName: "partition_processor", assertRuleSteps: []assertTraceStep{ { - assertReason: "Datasource[1] have multi available partition tables[p1,p2] after partition pruning", + assertReason: "Datasource[1] has multiple needed partitions[p1,p2] after pruning", assertAction: "Datasource[1] becomes PartitionUnion[7] with children[TableScan[1],TableScan[1]]", }, }, @@ -158,7 +158,7 @@ func (s *testPlanSuite) TestSingleRuleTraceStep(c *C) { assertRuleName: "partition_processor", assertRuleSteps: []assertTraceStep{ { - assertReason: "Datasource[1] has one available partiton table[p1] after partition pruning", + assertReason: "Datasource[1] has one needed partition[p1] after pruning", assertAction: "Datasource[1] becomes TableScan[1]", }, }, diff --git a/planner/core/rule_partition_processor.go b/planner/core/rule_partition_processor.go index d9fdd841fcba2..58e32d31220e9 100644 --- a/planner/core/rule_partition_processor.go +++ b/planner/core/rule_partition_processor.go @@ -850,7 +850,7 @@ func (s *partitionProcessor) pruneRangePartition(ctx sessionctx.Context, pi *mod if condsToBePruned == nil { return result, nil, nil } - // remove useless predicates after partition pruning + // remove useless predicates after pruning newConds := make([]expression.Expression, 0, len(*condsToBePruned)) for _, cond := range *condsToBePruned { if dataForPrune, ok := pruner.extractDataForPrune(ctx, cond); ok { @@ -1594,7 +1594,7 @@ func appendMakeUnionAllChildrenTranceStep(ds *DataSource, usedMap map[int64]mode }) if len(children) == 1 { action = fmt.Sprintf("Datasource[%v] becomes %s[%v]", ds.ID(), plan.TP(), plan.ID()) - reason = fmt.Sprintf("Datasource[%v] has one available partiton table[%s] after partition pruning", ds.ID(), used[0].Name) + reason = fmt.Sprintf("Datasource[%v] has one needed partition[%s] after pruning", ds.ID(), used[0].Name) } else { action = func() string { buffer := bytes.NewBufferString(fmt.Sprintf("Datasource[%v] becomes %s[%v] with children[", ds.ID(), plan.TP(), plan.ID())) @@ -1608,14 +1608,14 @@ func appendMakeUnionAllChildrenTranceStep(ds *DataSource, usedMap map[int64]mode return buffer.String() }() reason = func() string { - buffer := bytes.NewBufferString(fmt.Sprintf("Datasource[%v] have multi available partition tables[", ds.ID())) + buffer := bytes.NewBufferString(fmt.Sprintf("Datasource[%v] has multiple needed partitions[", ds.ID())) for i, u := range used { if i > 0 { buffer.WriteString(",") } buffer.WriteString(u.Name.String()) } - buffer.WriteString("] after partition pruning") + buffer.WriteString("] after pruning") return buffer.String() }() } @@ -1624,6 +1624,6 @@ func appendMakeUnionAllChildrenTranceStep(ds *DataSource, usedMap map[int64]mode func appendNoPartitionChildTraceStep(ds *DataSource, dual LogicalPlan, opt *logicalOptimizeOp) { action := fmt.Sprintf("Datasource[%v] becomes %v[%v]", ds.ID(), dual.TP(), dual.ID()) - reason := fmt.Sprintf("Datasource[%v] has no available partition table after partition pruning", ds.ID()) + reason := fmt.Sprintf("Datasource[%v] doesn't have needed partition table after pruning", ds.ID()) opt.appendStepToCurrent(dual.ID(), dual.TP(), reason, action) }