Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

planner/core: simple greedy join reorder based on CBO #8394

Merged
merged 11 commits into from
Dec 7, 2018
Prev Previous commit
Next Next commit
remove old algo.
winoros committed Nov 22, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 532925024c455dc972f246ec405acd410ba5de08
238 changes: 0 additions & 238 deletions planner/core/rule_join_reorder.go

This file was deleted.

11 changes: 11 additions & 0 deletions planner/core/rule_join_reorder_dp.go
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ import (
"github.com/pingcap/parser/ast"
"github.com/pingcap/tidb/expression"
"github.com/pingcap/tidb/sessionctx"
log "github.com/sirupsen/logrus"
)

type joinReorderDPSolver struct {
@@ -179,3 +180,13 @@ func (s *joinReorderDPSolver) makeBushyJoin(cartesianJoinGroup []LogicalPlan) Lo
}
return cartesianJoinGroup[0]
}

func findNodeIndexInGroup(groups []LogicalPlan, col *expression.Column) int {
for i, plan := range groups {
if plan.Schema().Contains(col) {
return i
}
}
log.Errorf("Unknown columns %s, position %d", col, col.UniqueID)
return -1
}
9 changes: 0 additions & 9 deletions planner/core/rule_predicate_push_down.go
Original file line number Diff line number Diff line change
@@ -96,15 +96,6 @@ func (p *LogicalTableDual) PredicatePushDown(predicates []expression.Expression)
// PredicatePushDown implements LogicalPlan PredicatePushDown interface.
func (p *LogicalJoin) PredicatePushDown(predicates []expression.Expression) (ret []expression.Expression, retPlan LogicalPlan) {
simplifyOuterJoin(p, predicates)
/*
joinGroup := getCartesianJoinGroup(p)
if joinGroup != nil {
e := joinReOrderSolver{ctx: p.ctx}
e.reorderJoin(joinGroup, predicates)
newJoin := e.resultJoin
return newJoin.PredicatePushDown(predicates)
}
*/
leftPlan := p.children[0]
rightPlan := p.children[1]
var equalCond []*expression.ScalarFunction