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

Jump to bottom

planner: move logical aggregation to logicalop pkg #55371

Merged
merged 2 commits into from
Aug 13, 2024
Merged

planner: move logical aggregation to logicalop pkg #55371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8f5031
move-logical-agg
AilinKid Aug 12, 2024
9c0c2ba
.
AilinKid Aug 12, 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
1 change: 1 addition & 0 deletions pkg/planner/cascades/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ go_test(
"//pkg/parser/model",
"//pkg/planner/core",
"//pkg/planner/core/base",
"//pkg/planner/core/operator/logicalop",
"//pkg/planner/memo",
"//pkg/planner/pattern",
"//pkg/planner/property",
Expand Down
2 changes: 1 addition & 1 deletion pkg/planner/cascades/implementation_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func (*ImplHashAgg) Match(_ *memo.GroupExpr, prop *property.PhysicalProperty) (m

// OnImplement implements ImplementationRule OnImplement interface.
func (*ImplHashAgg) OnImplement(expr *memo.GroupExpr, reqProp *property.PhysicalProperty) ([]memo.Implementation, error) {
la := expr.ExprNode.(*plannercore.LogicalAggregation)
la := expr.ExprNode.(*logicalop.LogicalAggregation)
hashAgg := plannercore.NewPhysicalHashAgg(
la,
expr.Group.Prop.Stats.ScaleByExpectCnt(reqProp.ExpectedCnt),
Expand Down
3 changes: 2 additions & 1 deletion pkg/planner/cascades/optimize_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/pingcap/tidb/pkg/parser/model"
plannercore "github.com/pingcap/tidb/pkg/planner/core"
"github.com/pingcap/tidb/pkg/planner/core/base"
"github.com/pingcap/tidb/pkg/planner/core/operator/logicalop"
"github.com/pingcap/tidb/pkg/planner/memo"
"github.com/pingcap/tidb/pkg/planner/pattern"
"github.com/pingcap/tidb/pkg/planner/property"
Expand Down Expand Up @@ -154,7 +155,7 @@ func TestPreparePossibleProperties(t *testing.T) {
require.NotNil(t, columnF)
require.NotNil(t, columnA)

agg, ok := logic.Children()[0].(*plannercore.LogicalAggregation)
agg, ok := logic.Children()[0].(*logicalop.LogicalAggregation)
require.True(t, ok)

group := memo.Convert2Group(agg)
Expand Down
38 changes: 19 additions & 19 deletions pkg/planner/cascades/transformation_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ func (r *PushAggDownGather) Match(expr *memo.ExprIter) bool {
if expr.GetExpr().HasAppliedRule(r) {
return false
}
agg := expr.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := expr.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
for _, aggFunc := range agg.AggFuncs {
if aggFunc.Mode != aggregation.CompleteMode {
return false
Expand All @@ -435,7 +435,7 @@ func (r *PushAggDownGather) Match(expr *memo.ExprIter) bool {
// OnTransform implements Transformation interface.
// It will transform `Agg->Gather` to `Agg(Final) -> Gather -> Agg(Partial1)`.
func (r *PushAggDownGather) OnTransform(old *memo.ExprIter) (newExprs []*memo.GroupExpr, eraseOld bool, eraseAll bool, err error) {
agg := old.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := old.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
aggSchema := old.GetExpr().Group.Prop.Schema
gather := old.Children[0].GetExpr().ExprNode.(*plannercore.TiKVSingleGather)
childGroup := old.Children[0].GetExpr().Children[0]
Expand All @@ -461,13 +461,13 @@ func (r *PushAggDownGather) OnTransform(old *memo.ExprIter) (newExprs []*memo.Gr
partialPref.AggFuncs =
plannercore.RemoveUnnecessaryFirstRow(agg.SCtx(), finalPref.GroupByItems, partialPref.AggFuncs, partialPref.GroupByItems, partialPref.Schema, firstRowFuncMap)

partialAgg := plannercore.LogicalAggregation{
partialAgg := logicalop.LogicalAggregation{
AggFuncs: partialPref.AggFuncs,
GroupByItems: partialPref.GroupByItems,
}.Init(agg.SCtx(), agg.QueryBlockOffset())
partialAgg.CopyAggHints(agg)

finalAgg := plannercore.LogicalAggregation{
finalAgg := logicalop.LogicalAggregation{
AggFuncs: finalPref.AggFuncs,
GroupByItems: finalPref.GroupByItems,
}.Init(agg.SCtx(), agg.QueryBlockOffset())
Expand Down Expand Up @@ -604,7 +604,7 @@ func NewRulePushSelDownAggregation() Transformation {
// or just keep the selection unchanged.
func (*PushSelDownAggregation) OnTransform(old *memo.ExprIter) (newExprs []*memo.GroupExpr, eraseOld bool, eraseAll bool, err error) {
sel := old.GetExpr().ExprNode.(*logicalop.LogicalSelection)
agg := old.Children[0].GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := old.Children[0].GetExpr().ExprNode.(*logicalop.LogicalAggregation)
aggSchema := old.Children[0].Prop.Schema
var pushedExprs []expression.Expression
var remainedExprs []expression.Expression
Expand Down Expand Up @@ -1525,7 +1525,7 @@ func (*MergeAggregationProjection) Match(old *memo.ExprIter) bool {
// OnTransform implements Transformation interface.
// It will transform `Aggregation->Projection->X` to `Aggregation->X`.
func (*MergeAggregationProjection) OnTransform(old *memo.ExprIter) (newExprs []*memo.GroupExpr, eraseOld bool, eraseAll bool, err error) {
oldAgg := old.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
oldAgg := old.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
proj := old.Children[0].GetExpr().ExprNode.(*logicalop.LogicalProjection)
projSchema := old.Children[0].GetExpr().Schema()

Expand All @@ -1545,7 +1545,7 @@ func (*MergeAggregationProjection) OnTransform(old *memo.ExprIter) (newExprs []*
aggFuncs[i].Args = newArgs
}

newAgg := plannercore.LogicalAggregation{
newAgg := logicalop.LogicalAggregation{
GroupByItems: groupByItems,
AggFuncs: aggFuncs,
}.Init(ctx, oldAgg.QueryBlockOffset())
Expand Down Expand Up @@ -1579,7 +1579,7 @@ func (r *EliminateSingleMaxMin) Match(expr *memo.ExprIter) bool {
return false
}

agg := expr.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := expr.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
// EliminateSingleMaxMin only works on the complete mode.
if !agg.IsCompleteModeAgg() {
return false
Expand All @@ -1604,7 +1604,7 @@ func (r *EliminateSingleMaxMin) Match(expr *memo.ExprIter) bool {
// OnTransform implements Transformation interface.
// It will transform `max/min->X` to `max/min->top1->sel->X`.
func (r *EliminateSingleMaxMin) OnTransform(old *memo.ExprIter) (newExprs []*memo.GroupExpr, eraseOld bool, eraseAll bool, err error) {
agg := old.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := old.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
ectx := agg.SCtx().GetExprCtx().GetEvalCtx()
childGroup := old.GetExpr().Children[0]
ctx := agg.SCtx()
Expand Down Expand Up @@ -1946,7 +1946,7 @@ func (*EliminateOuterJoinBelowAggregation) Match(expr *memo.ExprIter) bool {
// OnTransform implements Transformation interface.
// This rule tries to eliminate outer join which below aggregation.
func (r *EliminateOuterJoinBelowAggregation) OnTransform(old *memo.ExprIter) (newExprs []*memo.GroupExpr, eraseOld bool, eraseAll bool, err error) {
agg := old.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := old.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
joinExpr := old.Children[0].GetExpr()
join := joinExpr.ExprNode.(*logicalop.LogicalJoin)

Expand Down Expand Up @@ -2054,14 +2054,14 @@ func NewRuleTransformAggregateCaseToSelection() Transformation {

// Match implements Transformation interface.
func (r *TransformAggregateCaseToSelection) Match(expr *memo.ExprIter) bool {
agg := expr.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := expr.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
return agg.IsCompleteModeAgg() && len(agg.GroupByItems) == 0 && len(agg.AggFuncs) == 1 && len(agg.AggFuncs[0].Args) == 1 && r.isTwoOrThreeArgCase(agg.AggFuncs[0].Args[0])
}

// OnTransform implements Transformation interface.
// This rule tries to convert Agg(case when) to Agg->Selection.
func (r *TransformAggregateCaseToSelection) OnTransform(old *memo.ExprIter) (newExprs []*memo.GroupExpr, eraseOld bool, eraseAll bool, err error) {
agg := old.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := old.GetExpr().ExprNode.(*logicalop.LogicalAggregation)

ok, newConditions, newAggFuncs := r.transform(agg)
if !ok {
Expand All @@ -2073,7 +2073,7 @@ func (r *TransformAggregateCaseToSelection) OnTransform(old *memo.ExprIter) (new
newSelExpr.SetChildren(old.GetExpr().Children...)
newSelGroup := memo.NewGroupWithSchema(newSelExpr, old.GetExpr().Children[0].Prop.Schema)

newAgg := plannercore.LogicalAggregation{
newAgg := logicalop.LogicalAggregation{
AggFuncs: newAggFuncs,
GroupByItems: agg.GroupByItems,
}.Init(agg.SCtx(), agg.QueryBlockOffset())
Expand All @@ -2083,7 +2083,7 @@ func (r *TransformAggregateCaseToSelection) OnTransform(old *memo.ExprIter) (new
return []*memo.GroupExpr{newAggExpr}, true, false, nil
}

func (r *TransformAggregateCaseToSelection) transform(agg *plannercore.LogicalAggregation) (ok bool, newConditions []expression.Expression, newAggFuncs []*aggregation.AggFuncDesc) {
func (r *TransformAggregateCaseToSelection) transform(agg *logicalop.LogicalAggregation) (ok bool, newConditions []expression.Expression, newAggFuncs []*aggregation.AggFuncDesc) {
aggFuncDesc := agg.AggFuncs[0]
aggFuncName := aggFuncDesc.Name
ctx := agg.SCtx()
Expand Down Expand Up @@ -2174,7 +2174,7 @@ func NewRuleTransformAggToProj() Transformation {

// Match implements Transformation interface.
func (*TransformAggToProj) Match(expr *memo.ExprIter) bool {
agg := expr.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := expr.GetExpr().ExprNode.(*logicalop.LogicalAggregation)

if !agg.IsCompleteModeAgg() {
return false
Expand Down Expand Up @@ -2203,7 +2203,7 @@ func (*TransformAggToProj) Match(expr *memo.ExprIter) bool {
// OnTransform implements Transformation interface.
// This rule tries to convert agg to proj.
func (*TransformAggToProj) OnTransform(old *memo.ExprIter) (newExprs []*memo.GroupExpr, eraseOld bool, eraseAll bool, err error) {
agg := old.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := old.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
if ok, proj := plannercore.ConvertAggToProj(agg, old.GetExpr().Schema()); ok {
newProjExpr := memo.NewGroupExpr(proj)
newProjExpr.SetChildren(old.GetExpr().Children...)
Expand Down Expand Up @@ -2333,14 +2333,14 @@ func NewRuleInjectProjectionBelowAgg() Transformation {

// Match implements Transformation interface.
func (*InjectProjectionBelowAgg) Match(expr *memo.ExprIter) bool {
agg := expr.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := expr.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
return agg.IsCompleteModeAgg()
}

// OnTransform implements Transformation interface.
// It will convert `Agg -> X` to `Agg -> Proj -> X`.
func (*InjectProjectionBelowAgg) OnTransform(old *memo.ExprIter) (newExprs []*memo.GroupExpr, eraseOld bool, eraseAll bool, err error) {
agg := old.GetExpr().ExprNode.(*plannercore.LogicalAggregation)
agg := old.GetExpr().ExprNode.(*logicalop.LogicalAggregation)
ectx := agg.SCtx().GetExprCtx().GetEvalCtx()

hasScalarFunc := false
Expand Down Expand Up @@ -2417,7 +2417,7 @@ func (*InjectProjectionBelowAgg) OnTransform(old *memo.ExprIter) (newExprs []*me
projExpr.SetChildren(old.GetExpr().Children[0])
projGroup := memo.NewGroupWithSchema(projExpr, projSchema)

newAgg := plannercore.LogicalAggregation{
newAgg := logicalop.LogicalAggregation{
AggFuncs: copyFuncs,
GroupByItems: newGroupByItems,
}.Init(agg.SCtx(), agg.QueryBlockOffset())
Expand Down
1 change: 0 additions & 1 deletion pkg/planner/core/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ go_library(
"indexmerge_path.go",
"indexmerge_unfinished_path.go",
"initialize.go",
"logical_aggregation.go",
"logical_apply.go",
"logical_cte.go",
"logical_datasource.go",
Expand Down
4 changes: 2 additions & 2 deletions pkg/planner/core/casetest/stats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ func TestGroupNDVs(t *testing.T) {
lp := p.(base.LogicalPlan)
_, err = core.RecursiveDeriveStats4Test(lp)
require.NoError(t, err, comment)
var agg *core.LogicalAggregation
var agg *logicalop.LogicalAggregation
var join *logicalop.LogicalJoin
stack := make([]base.LogicalPlan, 0, 2)
traversed := false
for !traversed {
switch v := lp.(type) {
case *core.LogicalAggregation:
case *logicalop.LogicalAggregation:
agg = v
lp = lp.Children()[0]
case *logicalop.LogicalJoin:
Expand Down
2 changes: 1 addition & 1 deletion pkg/planner/core/collect_column_stats_usage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ func (c *columnStatsUsageCollector) collectFromPlan(lp base.LogicalPlan) {
// Though the conditions in LogicalSelection are complex conditions which cannot be pushed down to DataSource, we still
// regard statistics of the columns in the conditions as needed.
c.addPredicateColumnsFromExpressions(x.Conditions)
case *LogicalAggregation:
case *logicalop.LogicalAggregation:
// Just assume statistics of all the columns in GroupByItems are needed.
c.addPredicateColumnsFromExpressions(x.GroupByItems)
// Schema change from children to self.
Expand Down
5 changes: 2 additions & 3 deletions pkg/planner/core/core_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,10 @@ func init() {
// For code refactor init.
utilfuncp.AddSelection = addSelection
utilfuncp.FindBestTask = findBestTask
utilfuncp.PruneByItems = pruneByItems
utilfuncp.HasMaxOneRowUtil = HasMaxOneRow
utilfuncp.GetTaskPlanCost = getTaskPlanCost
utilfuncp.CanPushToCopImpl = canPushToCopImpl
utilfuncp.GetStreamAggs = getStreamAggs
utilfuncp.GetHashAggs = getHashAggs
utilfuncp.PruneByItems = pruneByItems
utilfuncp.PushDownTopNForBaseLogicalPlan = pushDownTopNForBaseLogicalPlan
utilfuncp.FindBestTask4LogicalShow = findBestTask4LogicalShow
utilfuncp.FindBestTask4LogicalCTETable = findBestTask4LogicalCTETable
Expand All @@ -52,6 +50,7 @@ func init() {
utilfuncp.ExhaustPhysicalPlans4LogicalMaxOneRow = exhaustPhysicalPlans4LogicalMaxOneRow
utilfuncp.ExhaustPhysicalPlans4LogicalUnionScan = exhaustPhysicalPlans4LogicalUnionScan
utilfuncp.ExhaustPhysicalPlans4LogicalProjection = exhaustPhysicalPlans4LogicalProjection
utilfuncp.ExhaustPhysicalPlans4LogicalAggregation = exhaustPhysicalPlans4LogicalAggregation

utilfuncp.GetActualProbeCntFromProbeParents = getActualProbeCntFromProbeParents
utilfuncp.GetEstimatedProbeCntFromProbeParents = getEstimatedProbeCntFromProbeParents
Expand Down
Loading