database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean useless code. (#1998)

Browse Source
This commit is contained in:
Ewan Chou
2016-11-15 14:13:36 +08:00
committed by GitHub
parent d0cb5d9187 75b21addd0
commit a636a7d446
2 changed files with 5 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plan/plan.go
View File

@ -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.

54
plan/predicate_push_down.go
View File

@ -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)
}