From 70846fb43cc7c035bffd26664a75aaff6f651ac7 Mon Sep 17 00:00:00 2001 From: hanfei Date: Mon, 14 Nov 2016 18:36:57 +0800 Subject: [PATCH] clean useless code. --- plan/plan.go | 10 +++---- plan/predicate_push_down.go | 54 ------------------------------------- 2 files changed, 5 insertions(+), 59 deletions(-) diff --git a/plan/plan.go b/plan/plan.go index a4a283ca6a..7ee760a0ec 100644 --- a/plan/plan.go +++ b/plan/plan.go @@ -179,7 +179,7 @@ type PhysicalPlan interface { type baseLogicalPlan struct { basePlan planMap map[string]*physicalPlanInfo - self Plan + self LogicalPlan } func (p *baseLogicalPlan) getPlanInfo(prop *requiredProperty) (*physicalPlanInfo, error) { @@ -233,20 +233,20 @@ func newBaseLogicalPlan(tp string, a *idAllocator) baseLogicalPlan { // PredicatePushDown implements LogicalPlan PredicatePushDown interface. func (p *baseLogicalPlan) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { if len(p.GetChildren()) == 0 { - return predicates, p, nil + return predicates, p.self, nil } child := p.GetChildByIndex(0).(LogicalPlan) rest, _, err := child.PredicatePushDown(predicates) if err != nil { - return nil, p, errors.Trace(err) + return nil, nil, errors.Trace(err) } if len(rest) > 0 { err = addSelection(p, child, rest, p.allocator) if err != nil { - return nil, p, errors.Trace(err) + return nil, nil, errors.Trace(err) } } - return nil, p, nil + return nil, p.self, nil } // PruneColumnsAndResolveIndices implements LogicalPlan PruneColumnsAndResolveIndices interface. diff --git a/plan/predicate_push_down.go b/plan/predicate_push_down.go index 2435de2567..a86dec87bf 100644 --- a/plan/predicate_push_down.go +++ b/plan/predicate_push_down.go @@ -619,57 +619,3 @@ func (p *Limit) PredicatePushDown(predicates []expression.Expression) ([]express _, _, err := p.baseLogicalPlan.PredicatePushDown(nil) return predicates, p, errors.Trace(err) } - -// PredicatePushDown implements LogicalPlan PredicatePushDown interface. -func (p *Sort) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { - ret, _, err := p.baseLogicalPlan.PredicatePushDown(predicates) - return ret, p, errors.Trace(err) -} - -// PredicatePushDown implements LogicalPlan PredicatePushDown interface. -func (p *Trim) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { - ret, _, err := p.baseLogicalPlan.PredicatePushDown(predicates) - return ret, p, errors.Trace(err) -} - -// PredicatePushDown implements LogicalPlan PredicatePushDown interface. -func (p *MaxOneRow) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { - ret, _, err := p.baseLogicalPlan.PredicatePushDown(predicates) - return ret, p, errors.Trace(err) -} - -// PredicatePushDown implements LogicalPlan PredicatePushDown interface. -func (p *Exists) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { - ret, _, err := p.baseLogicalPlan.PredicatePushDown(predicates) - return ret, p, errors.Trace(err) -} - -// PredicatePushDown implements LogicalPlan PredicatePushDown interface. -func (p *Distinct) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { - ret, _, err := p.baseLogicalPlan.PredicatePushDown(predicates) - return ret, p, errors.Trace(err) -} - -// PredicatePushDown implements LogicalPlan PredicatePushDown interface. -func (p *Insert) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { - ret, _, err := p.baseLogicalPlan.PredicatePushDown(predicates) - return ret, p, errors.Trace(err) -} - -// PredicatePushDown implements LogicalPlan PredicatePushDown interface. -func (p *SelectLock) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { - ret, _, err := p.baseLogicalPlan.PredicatePushDown(predicates) - return ret, p, errors.Trace(err) -} - -// PredicatePushDown implements LogicalPlan PredicatePushDown interface. -func (p *Update) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { - ret, _, err := p.baseLogicalPlan.PredicatePushDown(predicates) - return ret, p, errors.Trace(err) -} - -// PredicatePushDown implements LogicalPlan PredicatePushDown interface. -func (p *Delete) PredicatePushDown(predicates []expression.Expression) ([]expression.Expression, LogicalPlan, error) { - ret, _, err := p.baseLogicalPlan.PredicatePushDown(predicates) - return ret, p, errors.Trace(err) -}