Skip to content

Commit

Permalink
*: rename some objects radondb#480
Browse files Browse the repository at this point in the history 
[summary]
rename some objects.
  • Loading branch information
@zhyass @BohuTANG
zhyass authored and BohuTANG committed Oct 31, 2019
1 parent c10ca2c commit d8578f8
Show file tree
Hide file tree
Showing 15 changed files with 149 additions and 149 deletions.
2 changes: 1 addition & 1 deletion src/executor/engine/join_engine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (j *JoinEngine) Execute(ctx *xcontext.ResultContext) error {
}

maxrow := j.txn.MaxJoinRows()
if j.node.Strategy == planner.NestedLoop {
if j.node.Strategy == planner.NestLoop {
joinVars := make(map[string]*querypb.BindVariable)
if err := j.execBindVars(ctx, joinVars, true); err != nil {
return err
Expand Down
10 changes: 5 additions & 5 deletions src/planner/aggregate_plan_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func TestAggregatePlan(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, canPush, aggTyp)
_, ok := p.(*MergeNode)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferredTables(), ok)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferTables(), ok)
assert.Nil(t, err)
plan := NewAggregatePlan(log, node.SelectExprs, tuples, groups, true)
// plan build
Expand Down Expand Up @@ -285,7 +285,7 @@ func TestAggregatePlanUpperCase(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, canPush, aggTyp)
_, ok := p.(*MergeNode)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferredTables(), ok)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferTables(), ok)
assert.Nil(t, err)
plan := NewAggregatePlan(log, node.SelectExprs, tuples, groups, true)
// plan build
Expand Down Expand Up @@ -344,7 +344,7 @@ func TestAggregatePlanHaving(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, canPush, aggTyp)
_, ok := p.(*MergeNode)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferredTables(), ok)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferTables(), ok)
assert.Nil(t, err)
plan := NewAggregatePlan(log, node.SelectExprs, tuples, groups, true)
// plan build
Expand Down Expand Up @@ -388,7 +388,7 @@ func TestAggregatePlanUnsupported(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, canPush, aggTyp)
_, ok := p.(*MergeNode)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferredTables(), ok)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferTables(), ok)
if err == nil {
plan := NewAggregatePlan(log, node.SelectExprs, tuples, groups, aggTyp != notPush)
err := plan.Build()
Expand Down Expand Up @@ -483,7 +483,7 @@ func TestAggregatePlans(t *testing.T) {
assert.Nil(t, err)
//assert.Equal(t, canPush, aggTyp)
_, ok := p.(*MergeNode)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferredTables(), ok)
groups, err := checkGroupBy(node.GroupBy, tuples, route, p.getReferTables(), ok)
assert.Nil(t, err)
plan := NewAggregatePlan(log, node.SelectExprs, tuples, groups, aggTyp != notPush)
// plan build
Expand Down
28 changes: 14 additions & 14 deletions src/planner/expr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func hasSubquery(node sqlparser.SQLNode) bool {
return has
}

func checkTbName(tbInfos map[string]*TableInfo, node sqlparser.SQLNode) error {
func checkTbName(tbInfos map[string]*tableInfo, node sqlparser.SQLNode) error {
return sqlparser.Walk(func(node sqlparser.SQLNode) (kontinue bool, err error) {
if col, ok := node.(*sqlparser.ColName); ok {
tableName := col.Qualifier.Name.String()
Expand Down Expand Up @@ -241,7 +241,7 @@ type selectTuple struct {
}

// parserSelectExpr parses the AliasedExpr to select tuple.
func parserSelectExpr(expr *sqlparser.AliasedExpr, tbInfos map[string]*TableInfo) (*selectTuple, bool, error) {
func parserSelectExpr(expr *sqlparser.AliasedExpr, tbInfos map[string]*tableInfo) (*selectTuple, bool, error) {
funcName := ""
field := ""
aggrField := ""
Expand Down Expand Up @@ -318,7 +318,7 @@ func parserSelectExprs(exprs sqlparser.SelectExprs, root SelectNode) ([]selectTu
hasAggs := false
hasDist := false
aggType := nullAgg
tbInfos := root.getReferredTables()
tbInfos := root.getReferTables()
_, isMergeNode := root.(*MergeNode)
for _, expr := range exprs {
switch exp := expr.(type) {
Expand Down Expand Up @@ -378,7 +378,7 @@ func setAggregatorType(hasAggr, hasDist, isMergeNode bool) aggrType {
}

// checkTbInNode used to check whether the filter's referTables in the tbInfos.
func checkTbInNode(referTables []string, tbInfos map[string]*TableInfo) bool {
func checkTbInNode(referTables []string, tbInfos map[string]*tableInfo) bool {
if len(referTables) == 0 {
return true
}
Expand Down Expand Up @@ -510,7 +510,7 @@ type joinTuple struct {
// eg: 't1.a=t2.a and t1.b=2'.
// t1.a=t2.a paser in joinTuple.
// t1.b=2 paser in filterTuple, t1.b col, 2 val.
func parserWhereOrJoinExprs(exprs sqlparser.Expr, tbInfos map[string]*TableInfo) ([]joinTuple, []filterTuple, error) {
func parserWhereOrJoinExprs(exprs sqlparser.Expr, tbInfos map[string]*tableInfo) ([]joinTuple, []filterTuple, error) {
filters := splitAndExpression(nil, exprs)
var joins []joinTuple
var wheres []filterTuple
Expand Down Expand Up @@ -610,12 +610,12 @@ func parserWhereOrJoinExprs(exprs sqlparser.Expr, tbInfos map[string]*TableInfo)
func checkJoinOn(lpn, rpn SelectNode, join joinTuple) (joinTuple, error) {
lt := join.left.Qualifier.Name.String()
rt := join.right.Qualifier.Name.String()
if _, ok := lpn.getReferredTables()[lt]; ok {
if _, ok := rpn.getReferredTables()[rt]; !ok {
if _, ok := lpn.getReferTables()[lt]; ok {
if _, ok := rpn.getReferTables()[rt]; !ok {
return join, errors.New("unsupported: join.on.condition.should.cross.left-right.tables")
}
} else {
if _, ok := lpn.getReferredTables()[rt]; !ok {
if _, ok := lpn.getReferTables()[rt]; !ok {
return join, errors.New("unsupported: join.on.condition.should.cross.left-right.tables")
}
join.left, join.right = join.right, join.left
Expand All @@ -624,7 +624,7 @@ func checkJoinOn(lpn, rpn SelectNode, join joinTuple) (joinTuple, error) {
}

// checkGroupBy used to check groupby.
func checkGroupBy(exprs sqlparser.GroupBy, fields []selectTuple, router *router.Router, tbInfos map[string]*TableInfo, canOpt bool) ([]selectTuple, error) {
func checkGroupBy(exprs sqlparser.GroupBy, fields []selectTuple, router *router.Router, tbInfos map[string]*tableInfo, canOpt bool) ([]selectTuple, error) {
var groupTuples []selectTuple
hasShard := false
for _, expr := range exprs {
Expand Down Expand Up @@ -686,7 +686,7 @@ func checkGroupBy(exprs sqlparser.GroupBy, fields []selectTuple, router *router.
}

// checkDistinct used to check the distinct, and convert distinct to groupby.
func checkDistinct(node *sqlparser.Select, groups, fields []selectTuple, router *router.Router, tbInfos map[string]*TableInfo, canOpt bool) ([]selectTuple, error) {
func checkDistinct(node *sqlparser.Select, groups, fields []selectTuple, router *router.Router, tbInfos map[string]*tableInfo, canOpt bool) ([]selectTuple, error) {
// field in grouby must be contained in the select exprs, that mains groups is a subset of fields.
// if has groupby, neednot process distinct again.
if node.Distinct == "" || len(node.GroupBy) > 0 {
Expand Down Expand Up @@ -737,7 +737,7 @@ func checkDistinct(node *sqlparser.Select, groups, fields []selectTuple, router

// parserHaving used to check the having exprs and parser into tuples.
// unsupport: `select t2.id as tmp, t1.id from t2,t1 having tmp=1`.
func parserHaving(exprs sqlparser.Expr, tbInfos map[string]*TableInfo) ([]filterTuple, error) {
func parserHaving(exprs sqlparser.Expr, tbInfos map[string]*tableInfo) ([]filterTuple, error) {
filters := splitAndExpression(nil, exprs)
var tuples []filterTuple

Expand Down Expand Up @@ -792,7 +792,7 @@ type nullExpr struct {
}

// checkIsWithNull used to check whether `tb.col is null` or `tb.col<=> null`.
func checkIsWithNull(filter filterTuple, tbInfos map[string]*TableInfo) (bool, nullExpr) {
func checkIsWithNull(filter filterTuple, tbInfos map[string]*tableInfo) (bool, nullExpr) {
if !checkTbInNode(filter.referTables, tbInfos) {
return false, nullExpr{}
}
Expand All @@ -818,7 +818,7 @@ func checkIsWithNull(filter filterTuple, tbInfos map[string]*TableInfo) (bool, n
}

// checkShard used to check whether the col is shardkey.
func checkShard(table, col string, tbInfos map[string]*TableInfo, router *router.Router) (bool, error) {
func checkShard(table, col string, tbInfos map[string]*tableInfo, router *router.Router) (bool, error) {
tbInfo, ok := tbInfos[table]
if !ok {
return false, errors.Errorf("unsupported: unknown.column.'%s.%s'.in.field.list", table, col)
Expand All @@ -835,7 +835,7 @@ func checkShard(table, col string, tbInfos map[string]*TableInfo, router *router
}

// getIndex used to get index from router.
func getIndex(router *router.Router, tbInfo *TableInfo, val *sqlparser.SQLVal) error {
func getIndex(router *router.Router, tbInfo *tableInfo, val *sqlparser.SQLVal) error {
idx, err := router.GetIndex(tbInfo.database, tbInfo.tableName, val)
if err != nil {
return err
Expand Down
22 changes: 11 additions & 11 deletions src/planner/expr_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func TestParserWhereOrJoinExprs(t *testing.T) {
p, err := scanTableExprs(log, route, database, sel.From)
assert.Nil(t, err)

_, _, err = parserWhereOrJoinExprs(sel.Where.Expr, p.getReferredTables())
_, _, err = parserWhereOrJoinExprs(sel.Where.Expr, p.getReferTables())
assert.Nil(t, err)
}
}
Expand Down Expand Up @@ -127,7 +127,7 @@ func TestWhereFilters(t *testing.T) {
p, err := scanTableExprs(log, route, database, sel.From)
assert.Nil(t, err)

joins, filters, err := parserWhereOrJoinExprs(sel.Where.Expr, p.getReferredTables())
joins, filters, err := parserWhereOrJoinExprs(sel.Where.Expr, p.getReferTables())
assert.Nil(t, err)

err = p.pushFilter(filters)
Expand Down Expand Up @@ -168,7 +168,7 @@ func TestWhereFiltersError(t *testing.T) {
p, err := scanTableExprs(log, route, database, sel.From)
assert.Nil(t, err)

joins, filters, err := parserWhereOrJoinExprs(sel.Where.Expr, p.getReferredTables())
joins, filters, err := parserWhereOrJoinExprs(sel.Where.Expr, p.getReferTables())
assert.Nil(t, err)

err = p.pushFilter(filters)
Expand Down Expand Up @@ -227,7 +227,7 @@ func TestCheckGroupBy(t *testing.T) {
assert.Nil(t, err)

_, ok := p.(*MergeNode)
groups, err := checkGroupBy(sel.GroupBy, fields, route, p.getReferredTables(), ok)
groups, err := checkGroupBy(sel.GroupBy, fields, route, p.getReferTables(), ok)
assert.Nil(t, err)
assert.Equal(t, wants[i], len(groups))
}
Expand Down Expand Up @@ -266,7 +266,7 @@ func TestCheckGroupByError(t *testing.T) {
assert.Nil(t, err)

_, ok := p.(*MergeNode)
_, err = checkGroupBy(sel.GroupBy, fields, route, p.getReferredTables(), ok)
_, err = checkGroupBy(sel.GroupBy, fields, route, p.getReferTables(), ok)
got := err.Error()
assert.Equal(t, wants[i], got)
}
Expand Down Expand Up @@ -305,7 +305,7 @@ func TestCheckDistinct(t *testing.T) {
assert.Nil(t, err)

_, ok := p.(*MergeNode)
_, err = checkDistinct(sel, nil, fields, route, p.getReferredTables(), ok)
_, err = checkDistinct(sel, nil, fields, route, p.getReferTables(), ok)
assert.Nil(t, err)
assert.Equal(t, wants[i], len(sel.GroupBy))
}
Expand Down Expand Up @@ -342,7 +342,7 @@ func TestCheckDistinctError(t *testing.T) {
assert.Nil(t, err)

_, ok := p.(*MergeNode)
_, err = checkDistinct(sel, nil, fields, route, p.getReferredTables(), ok)
_, err = checkDistinct(sel, nil, fields, route, p.getReferTables(), ok)
got := err.Error()
assert.Equal(t, wants[i], got)
}
Expand Down Expand Up @@ -377,7 +377,7 @@ func TestSelectExprs(t *testing.T) {
assert.Nil(t, err)

_, ok := p.(*MergeNode)
groups, err := checkGroupBy(sel.GroupBy, fields, route, p.getReferredTables(), ok)
groups, err := checkGroupBy(sel.GroupBy, fields, route, p.getReferTables(), ok)
assert.Nil(t, err)

err = p.pushSelectExprs(fields, groups, sel, aggTyp)
Expand Down Expand Up @@ -420,7 +420,7 @@ func TestSelectExprsError(t *testing.T) {
assert.Nil(t, err)

_, ok := p.(*MergeNode)
groups, err := checkGroupBy(sel.GroupBy, fields, route, p.getReferredTables(), ok)
groups, err := checkGroupBy(sel.GroupBy, fields, route, p.getReferTables(), ok)
assert.Nil(t, err)

err = p.pushSelectExprs(fields, groups, sel, aggTyp)
Expand Down Expand Up @@ -453,7 +453,7 @@ func TestParserHaving(t *testing.T) {
p, err := scanTableExprs(log, route, database, sel.From)
assert.Nil(t, err)

havings, err := parserHaving(sel.Having.Expr, p.getReferredTables())
havings, err := parserHaving(sel.Having.Expr, p.getReferTables())
assert.Nil(t, err)

err = p.pushHaving(havings)
Expand Down Expand Up @@ -491,7 +491,7 @@ func TestParserHavingError(t *testing.T) {
p, err := scanTableExprs(log, route, database, sel.From)
assert.Nil(t, err)

havings, err := parserHaving(sel.Having.Expr, p.getReferredTables())
havings, err := parserHaving(sel.Having.Expr, p.getReferTables())
if err != nil {
got := err.Error()
assert.Equal(t, wants[i], got)
Expand Down
36 changes: 18 additions & 18 deletions src/planner/from.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/xelabs/go-mysqlstack/xlog"
)

// TableInfo represents one table information.
type TableInfo struct {
// tableInfo represents one table information.
type tableInfo struct {
// database.
database string
// table's name.
Expand Down Expand Up @@ -82,7 +82,7 @@ func scanTableExpr(log *xlog.Log, router *router.Router, database string, tableE
return p, err
}

// scanAliasedTableExpr produces the table's TableInfo by the AliasedTableExpr, and build a MergeNode subtree.
// scanAliasedTableExpr produces the table's tableInfo by the AliasedTableExpr, and build a MergeNode subtree.
func scanAliasedTableExpr(log *xlog.Log, r *router.Router, database string, tableExpr *sqlparser.AliasedTableExpr) (SelectNode, error) {
var err error
mn := newMergeNode(log, r)
Expand All @@ -91,7 +91,7 @@ func scanAliasedTableExpr(log *xlog.Log, r *router.Router, database string, tabl
if expr.Qualifier.IsEmpty() {
expr.Qualifier = sqlparser.NewTableIdent(database)
}
tn := &TableInfo{
tn := &tableInfo{
database: expr.Qualifier.String(),
Segments: make([]router.Segment, 0, 16),
}
Expand Down Expand Up @@ -125,9 +125,9 @@ func scanAliasedTableExpr(log *xlog.Log, r *router.Router, database string, tabl
tn.parent = mn
tn.alias = tableExpr.As.String()
if tn.alias != "" {
mn.referredTables[tn.alias] = tn
mn.referTables[tn.alias] = tn
} else {
mn.referredTables[tn.tableName] = tn
mn.referTables[tn.tableName] = tn
}
case *sqlparser.Subquery:
err = errors.New("unsupported: subquery.in.select")
Expand Down Expand Up @@ -165,21 +165,21 @@ func join(log *xlog.Log, lpn, rpn SelectNode, joinExpr *sqlparser.JoinTableExpr,
var otherJoinOn []filterTuple
var err error

referredTables := make(map[string]*TableInfo)
for k, v := range lpn.getReferredTables() {
referredTables[k] = v
referTables := make(map[string]*tableInfo)
for k, v := range lpn.getReferTables() {
referTables[k] = v
}
for k, v := range rpn.getReferredTables() {
if _, ok := referredTables[k]; ok {
for k, v := range rpn.getReferTables() {
if _, ok := referTables[k]; ok {
return nil, errors.Errorf("unsupported: not.unique.table.or.alias:'%s'", k)
}
referredTables[k] = v
referTables[k] = v
}
if joinExpr != nil {
if joinExpr.On == nil {
joinExpr = nil
} else {
if joinOn, otherJoinOn, err = parserWhereOrJoinExprs(joinExpr.On, referredTables); err != nil {
if joinOn, otherJoinOn, err = parserWhereOrJoinExprs(joinExpr.On, referTables); err != nil {
return nil, err
}
for i, jt := range joinOn {
Expand Down Expand Up @@ -217,13 +217,13 @@ func join(log *xlog.Log, lpn, rpn SelectNode, joinExpr *sqlparser.JoinTableExpr,
}
// if join on condition's cols are both shardkey, and the tables have same shards.
for _, jt := range joinOn {
if isSameShard(lmn.referredTables, rmn.referredTables, jt.left, jt.right) {
if isSameShard(lmn.referTables, rmn.referTables, jt.left, jt.right) {
return mergeRoutes(lmn, rmn, joinExpr, otherJoinOn)
}
}
}
}
jn := newJoinNode(log, lpn, rpn, router, joinExpr, joinOn, referredTables)
jn := newJoinNode(log, lpn, rpn, router, joinExpr, joinOn, referTables)
lpn.setParent(jn)
rpn.setParent(jn)
if jn.IsLeftJoin {
Expand Down Expand Up @@ -251,9 +251,9 @@ func mergeRoutes(lmn, rmn *MergeNode, joinExpr *sqlparser.JoinTableExpr, otherJo
lSel.From = sqlparser.TableExprs{joinExpr}
}

for k, v := range rmn.getReferredTables() {
for k, v := range rmn.getReferTables() {
v.parent = lmn
lmn.referredTables[k] = v
lmn.referTables[k] = v
}
if rSel.Where != nil {
lSel.AddWhere(rSel.Where.Expr)
Expand All @@ -267,7 +267,7 @@ func mergeRoutes(lmn, rmn *MergeNode, joinExpr *sqlparser.JoinTableExpr, otherJo
}

// isSameShard used to judge lcn|rcn contain shardkey and have same shards.
func isSameShard(ltb, rtb map[string]*TableInfo, lcn, rcn *sqlparser.ColName) bool {
func isSameShard(ltb, rtb map[string]*tableInfo, lcn, rcn *sqlparser.ColName) bool {
lt := ltb[lcn.Qualifier.Name.String()]
if lt.shardKey == "" || lt.shardKey != lcn.Name.String() {
return false
Expand Down
Loading

0 comments on commit d8578f8

Please sign in to comment.