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.

Sign up for GitHub

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: move base plan related output of core pkg and make it well-pkged #52529

Merged
merged 8 commits into from
Apr 15, 2024
Merged

planner: move base plan related output of core pkg and make it well-pkged #52529

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4e7a7f2
move base plan related output core pkg and encapsulate it
AilinKid Apr 12, 2024
fef9d78
mv to base pkg
AilinKid Apr 12, 2024
e91189d
.
AilinKid Apr 12, 2024
1b8dcea
make bazel
AilinKid Apr 12, 2024
d577e12
.
AilinKid Apr 12, 2024
0a44a46
.
AilinKid Apr 12, 2024
adfb302
.
AilinKid Apr 12, 2024
6351bfb
remove unnecessary import rename
AilinKid Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
remove unnecessary import rename 
Signed-off-by: AilinKid <314806019@qq.com>
  • Loading branch information
@AilinKid
AilinKid committed Apr 15, 2024
commit 6351bfbeb7e198368fc6d222a0d3287aedde7086
38 changes: 19 additions & 19 deletions pkg/planner/core/plan_to_pb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ import (
"github.com/pingcap/tidb/pkg/expression/aggregation"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/parser/model"
base2 "github.com/pingcap/tidb/pkg/planner/core/base"
"github.com/pingcap/tidb/pkg/planner/core/base"
"github.com/pingcap/tidb/pkg/table/tables"
"github.com/pingcap/tidb/pkg/util"
"github.com/pingcap/tidb/pkg/util/ranger"
"github.com/pingcap/tipb/go-tipb"
)

// ToPB implements PhysicalPlan ToPB interface.
func (p *basePhysicalPlan) ToPB(_ *base2.BuildPBContext, _ kv.StoreType) (*tipb.Executor, error) {
func (p *basePhysicalPlan) ToPB(_ *base.BuildPBContext, _ kv.StoreType) (*tipb.Executor, error) {
return nil, errors.Errorf("plan %s fails converts to PB", p.Plan.ExplainID())
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalExpand) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalExpand) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
if len(p.LevelExprs) > 0 {
return p.toPBV2(ctx, storeType)
}
Expand All @@ -57,7 +57,7 @@ func (p *PhysicalExpand) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType)
return &tipb.Executor{Tp: tipb.ExecType_TypeExpand, Expand: expand, ExecutorId: &executorID}, nil
}

func (p *PhysicalExpand) toPBV2(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalExpand) toPBV2(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
client := ctx.GetClient()
projExprsPB := make([]*tipb.ExprSlice, 0, len(p.LevelExprs))
evalCtx := ctx.GetExprCtx().GetEvalCtx()
Expand Down Expand Up @@ -85,7 +85,7 @@ func (p *PhysicalExpand) toPBV2(ctx *base2.BuildPBContext, storeType kv.StoreTyp
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalHashAgg) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalHashAgg) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
client := ctx.GetClient()
groupByExprs, err := expression.ExpressionsToPBList(ctx.GetExprCtx().GetEvalCtx(), p.GroupByItems, client)
if err != nil {
Expand Down Expand Up @@ -121,7 +121,7 @@ func (p *PhysicalHashAgg) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalStreamAgg) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalStreamAgg) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
client := ctx.GetClient()
evalCtx := ctx.GetExprCtx().GetEvalCtx()
pushDownCtx := GetPushDownCtxFromBuildPBContext(ctx)
Expand Down Expand Up @@ -152,7 +152,7 @@ func (p *PhysicalStreamAgg) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreTy
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalSelection) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalSelection) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
client := ctx.GetClient()
conditions, err := expression.ExpressionsToPBList(ctx.GetExprCtx().GetEvalCtx(), p.Conditions, client)
if err != nil {
Expand All @@ -174,7 +174,7 @@ func (p *PhysicalSelection) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreTy
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalProjection) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalProjection) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
client := ctx.GetClient()
exprs, err := expression.ExpressionsToPBList(ctx.GetExprCtx().GetEvalCtx(), p.Exprs, client)
if err != nil {
Expand All @@ -196,7 +196,7 @@ func (p *PhysicalProjection) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreT
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalTopN) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalTopN) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
client := ctx.GetClient()
topNExec := &tipb.TopN{
Limit: p.Count,
Expand All @@ -221,7 +221,7 @@ func (p *PhysicalTopN) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalLimit) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalLimit) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
client := ctx.GetClient()
limitExec := &tipb.Limit{
Limit: p.Count,
Expand All @@ -242,7 +242,7 @@ func (p *PhysicalLimit) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType)
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalTableScan) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalTableScan) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
if storeType == kv.TiFlash && p.Table.GetPartitionInfo() != nil && p.IsMPPOrBatchCop && p.SCtx().GetSessionVars().StmtCtx.UseDynamicPartitionPrune() {
return p.partitionTableScanToPBForFlash(ctx)
}
Expand Down Expand Up @@ -279,7 +279,7 @@ func (p *PhysicalTableScan) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreTy
return &tipb.Executor{Tp: tipb.ExecType_TypeTableScan, TblScan: tsExec, ExecutorId: &executorID}, err
}

func (p *PhysicalTableScan) partitionTableScanToPBForFlash(ctx *base2.BuildPBContext) (*tipb.Executor, error) {
func (p *PhysicalTableScan) partitionTableScanToPBForFlash(ctx *base.BuildPBContext) (*tipb.Executor, error) {
ptsExec := tables.BuildPartitionTableScanFromInfos(p.Table, p.Columns, ctx.TiFlashFastScan)

if len(p.LateMaterializationFilterCondition) > 0 {
Expand Down Expand Up @@ -343,7 +343,7 @@ func FindColumnInfoByID(colInfos []*model.ColumnInfo, id int64) *model.ColumnInf
}

// ToPB generates the pb structure.
func (e *PhysicalExchangeSender) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (e *PhysicalExchangeSender) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
child, err := e.Children()[0].ToPB(ctx, kv.TiFlash)
if err != nil {
return nil, errors.Trace(err)
Expand Down Expand Up @@ -418,7 +418,7 @@ func (e *PhysicalExchangeSender) ToPB(ctx *base2.BuildPBContext, storeType kv.St
}

// ToPB generates the pb structure.
func (e *PhysicalExchangeReceiver) ToPB(ctx *base2.BuildPBContext, _ kv.StoreType) (*tipb.Executor, error) {
func (e *PhysicalExchangeReceiver) ToPB(ctx *base.BuildPBContext, _ kv.StoreType) (*tipb.Executor, error) {
encodedTask := make([][]byte, 0, len(e.Tasks))

for _, task := range e.Tasks {
Expand Down Expand Up @@ -457,7 +457,7 @@ func (e *PhysicalExchangeReceiver) ToPB(ctx *base2.BuildPBContext, _ kv.StoreTyp
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalIndexScan) ToPB(_ *base2.BuildPBContext, _ kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalIndexScan) ToPB(_ *base.BuildPBContext, _ kv.StoreType) (*tipb.Executor, error) {
columns := make([]*model.ColumnInfo, 0, p.schema.Len())
tableColumns := p.Table.Cols()
for _, col := range p.schema.Columns {
Expand Down Expand Up @@ -491,7 +491,7 @@ func (p *PhysicalIndexScan) ToPB(_ *base2.BuildPBContext, _ kv.StoreType) (*tipb
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalHashJoin) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalHashJoin) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
client := ctx.GetClient()

if len(p.LeftJoinKeys) > 0 && len(p.LeftNAJoinKeys) > 0 {
Expand Down Expand Up @@ -639,7 +639,7 @@ func (p *PhysicalHashJoin) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreTyp
}

// ToPB converts FrameBound to tipb structure.
func (fb *FrameBound) ToPB(ctx *base2.BuildPBContext) (*tipb.WindowFrameBound, error) {
func (fb *FrameBound) ToPB(ctx *base.BuildPBContext) (*tipb.WindowFrameBound, error) {
pbBound := &tipb.WindowFrameBound{
Type: tipb.WindowBoundType(fb.Type),
Unbounded: fb.UnBounded,
Expand All @@ -661,7 +661,7 @@ func (fb *FrameBound) ToPB(ctx *base2.BuildPBContext) (*tipb.WindowFrameBound, e
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalWindow) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalWindow) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
client := ctx.GetClient()

windowExec := &tipb.Window{}
Expand Down Expand Up @@ -714,7 +714,7 @@ func (p *PhysicalWindow) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType)
}

// ToPB implements PhysicalPlan ToPB interface.
func (p *PhysicalSort) ToPB(ctx *base2.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
func (p *PhysicalSort) ToPB(ctx *base.BuildPBContext, storeType kv.StoreType) (*tipb.Executor, error) {
if !p.IsPartialSort {
return nil, errors.Errorf("sort %s can't convert to pb, because it isn't a partial sort", p.Plan.ExplainID())
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/planner/core/rule_join_reorder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/pingcap/tidb/pkg/expression"
"github.com/pingcap/tidb/pkg/parser/ast"
base2 "github.com/pingcap/tidb/pkg/planner/core/base"
"github.com/pingcap/tidb/pkg/planner/core/base"
"github.com/pingcap/tidb/pkg/planner/util/coreusage"
h "github.com/pingcap/tidb/pkg/util/hint"
"github.com/pingcap/tidb/pkg/util/plancodec"
Expand Down Expand Up @@ -235,7 +235,7 @@ func (s *joinReOrderSolver) optimize(_ context.Context, p LogicalPlan, opt *core
}

// optimizeRecursive recursively collects join groups and applies join reorder algorithm for each group.
func (s *joinReOrderSolver) optimizeRecursive(ctx base2.PlanContext, p LogicalPlan, tracer *joinReorderTrace) (LogicalPlan, error) {
func (s *joinReOrderSolver) optimizeRecursive(ctx base.PlanContext, p LogicalPlan, tracer *joinReorderTrace) (LogicalPlan, error) {
if _, ok := p.(*LogicalCTE); ok {
return p, nil
}
Expand Down Expand Up @@ -394,7 +394,7 @@ type joinGroupResult struct {

// nolint:structcheck
type baseSingleGroupJoinOrderSolver struct {
ctx base2.PlanContext
ctx base.PlanContext
curJoinGroup []*jrNode
leadingJoinGroup LogicalPlan
*basicJoinGroupInfo
Expand Down