Merge remote-tracking branch 'origin/morpheus'

miaobingjie · miaobingjie · commit cca946417c47 · 2026-03-31T17:37:10.000-06:00
Change-Id: I7a6ccfd79b1f33dffa7ef3dd2ee2afd10ab2b0ff
diff --git a/plan/group.go b/plan/group.go
@@ -28,16 +28,13 @@ type InitialGroup struct {
 }
 
 func NewInitialGroup(keys expression.Expressions, aggregates algebra.Aggregates,
-	cost, cardinality float64, size int64, frCost float64, canSpill bool, groupAs string, groupAsFields []string) *InitialGroup {
+	cost, cardinality float64, size int64, frCost float64, groupAs string, groupAsFields []string) *InitialGroup {
 	rv := &InitialGroup{
 		keys:          keys,
 		aggregates:    aggregates,
 		groupAs:       groupAs,
 		groupAsFields: groupAsFields,
 	}
-	if canSpill {
-		rv.flags |= _CAN_SPILL
-	}
 	setOptEstimate(&rv.optEstimate, cost, cardinality, size, frCost)
 	return rv
 }
@@ -66,10 +63,6 @@ func (this *InitialGroup) SetAggregates(aggregates algebra.Aggregates) {
 	this.aggregates = aggregates
 }
 
-func (this *InitialGroup) CanSpill() bool {
-	return (this.flags & _CAN_SPILL) != 0
-}
-
 func (this *InitialGroup) GroupAs() string {
 	return this.groupAs
 }
@@ -179,15 +172,12 @@ type IntermediateGroup struct {
 }
 
 func NewIntermediateGroup(keys expression.Expressions, aggregates algebra.Aggregates,
-	cost, cardinality float64, size int64, frCost float64, canSpill bool, groupAs string) *IntermediateGroup {
+	cost, cardinality float64, size int64, frCost float64, groupAs string) *IntermediateGroup {
 	rv := &IntermediateGroup{
 		keys:       keys,
 		aggregates: aggregates,
 		groupAs:    groupAs,
 	}
-	if canSpill {
-		rv.flags |= _CAN_SPILL
-	}
 	setOptEstimate(&rv.optEstimate, cost, cardinality, size, frCost)
 	return rv
 }
@@ -216,10 +206,6 @@ func (this *IntermediateGroup) SetAggregates(aggregates algebra.Aggregates) {
 	this.aggregates = aggregates
 }
 
-func (this *IntermediateGroup) CanSpill() bool {
-	return (this.flags & _CAN_SPILL) != 0
-}
-
 func (this *IntermediateGroup) GroupAs() string {
 	return this.groupAs
 }
@@ -319,14 +305,11 @@ type FinalGroup struct {
 }
 
 func NewFinalGroup(keys expression.Expressions, aggregates algebra.Aggregates,
-	cost, cardinality float64, size int64, frCost float64, canSpill bool) *FinalGroup {
+	cost, cardinality float64, size int64, frCost float64) *FinalGroup {
 	rv := &FinalGroup{
 		keys:       keys,
 		aggregates: aggregates,
 	}
-	if canSpill {
-		rv.flags |= _CAN_SPILL
-	}
 	setOptEstimate(&rv.optEstimate, cost, cardinality, size, frCost)
 	return rv
 }
@@ -355,10 +338,6 @@ func (this *FinalGroup) SetAggregates(aggregates algebra.Aggregates) {
 	this.aggregates = aggregates
 }
 
-func (this *FinalGroup) CanSpill() bool {
-	return (this.flags & _CAN_SPILL) != 0
-}
-
 func (this *FinalGroup) MarshalJSON() ([]byte, error) {
 	return json.Marshal(this.MarshalBase(nil))
 }
diff --git a/planner/build_select_sub.go b/planner/build_select_sub.go
@@ -517,12 +517,12 @@ func (this *builder) visitGroup(group *algebra.Group, aggs algebra.Aggregates) {
 		}
 
 		this.addSubChildren(plan.NewInitialGroup(group.By(), aggv,
-			costInitial, cardinalityInitial, size, costInitial, true, group.GroupAs(), allowedGroupAsFields))
+			costInitial, cardinalityInitial, size, costInitial, group.GroupAs(), allowedGroupAsFields))
 		this.addChildren(this.addSubchildrenParallel())
 		this.addChildren(plan.NewIntermediateGroup(group.By(), aggv,
-			costIntermediate, cardinalityIntermediate, size, costIntermediate, true, group.GroupAs()))
+			costIntermediate, cardinalityIntermediate, size, costIntermediate, group.GroupAs()))
 		this.addChildren(plan.NewFinalGroup(group.By(), aggv,
-			costFinal, cardinalityFinal, size, costFinal, true))
+			costFinal, cardinalityFinal, size, costFinal))
 	}
 
 	this.addLetAndPredicate(group.Letting(), group.Having())
diff --git a/test/filestore/json/default/cases/case_by_id.json b/test/filestore/json/default/cases/case_by_id.json
@@ -317,7 +317,6 @@
                                 "aggregates": [
                                     "count(*)"
                                 ],
-                                "flags": 4,
                                 "group_keys": []
                             }
                         ]
@@ -328,15 +327,13 @@
                     "aggregates": [
                         "count(*)"
                     ],
-                    "flags": 4,
                     "group_keys": []
                 },
                 {
                     "#operator": "FinalGroup",
                     "aggregates": [
                         "count(*)"
                     ],
-                    "flags": 4,
                     "group_keys": []
                 },
                 {
@@ -402,7 +399,6 @@
                                             "count(*)",
                                             "min((`game`.`score`))"
                                         ],
-                                        "flags": 4,
                                         "group_keys": []
                                     }
                                 ]
@@ -414,7 +410,6 @@
                                 "count(*)",
                                 "min((`game`.`score`))"
                             ],
-                            "flags": 4,
                             "group_keys": []
                         },
                         {
@@ -423,7 +418,6 @@
                                 "count(*)",
                                 "min((`game`.`score`))"
                             ],
-                            "flags": 4,
                             "group_keys": []
                         },
                         {
@@ -501,7 +495,6 @@
                                 "aggregates": [
                                     "count(*)"
                                 ],
-                                "flags": 4,
                                 "group_keys": []
                             }
                         ]
@@ -512,15 +505,13 @@
                     "aggregates": [
                         "count(*)"
                     ],
-                    "flags": 4,
                     "group_keys": []
                 },
                 {
                     "#operator": "FinalGroup",
                     "aggregates": [
                         "count(*)"
                     ],
-                    "flags": 4,
                     "group_keys": []
                 },
                 {

Original file line number	Diff line number	Diff line change
`@@ -28,16 +28,13 @@ type InitialGroup struct {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`func NewInitialGroup(keys expression.Expressions, aggregates algebra.Aggregates,`
`31`		`- cost, cardinality float64, size int64, frCost float64, canSpill bool, groupAs string, groupAsFields []string) *InitialGroup {`
	`31`	`+ cost, cardinality float64, size int64, frCost float64, groupAs string, groupAsFields []string) *InitialGroup {`
`32`	`32`	`rv := &InitialGroup{`
`33`	`33`	`keys: keys,`
`34`	`34`	`aggregates: aggregates,`
`35`	`35`	`groupAs: groupAs,`
`36`	`36`	`groupAsFields: groupAsFields,`
`37`	`37`	`}`
`38`		`- if canSpill {`
`39`		`- rv.flags \|= _CAN_SPILL`
`40`		`- }`
`41`	`38`	`setOptEstimate(&rv.optEstimate, cost, cardinality, size, frCost)`
`42`	`39`	`return rv`
`43`	`40`	`}`
`@@ -66,10 +63,6 @@ func (this *InitialGroup) SetAggregates(aggregates algebra.Aggregates) {`
`66`	`63`	`this.aggregates = aggregates`
`67`	`64`	`}`
`68`	`65`
`69`		`-func (this *InitialGroup) CanSpill() bool {`
`70`		`- return (this.flags & _CAN_SPILL) != 0`
`71`		`-}`
`72`		`-`
`73`	`66`	`func (this *InitialGroup) GroupAs() string {`
`74`	`67`	`return this.groupAs`
`75`	`68`	`}`
`@@ -179,15 +172,12 @@ type IntermediateGroup struct {`
`179`	`172`	`}`
`180`	`173`
`181`	`174`	`func NewIntermediateGroup(keys expression.Expressions, aggregates algebra.Aggregates,`
`182`		`- cost, cardinality float64, size int64, frCost float64, canSpill bool, groupAs string) *IntermediateGroup {`
	`175`	`+ cost, cardinality float64, size int64, frCost float64, groupAs string) *IntermediateGroup {`
`183`	`176`	`rv := &IntermediateGroup{`
`184`	`177`	`keys: keys,`
`185`	`178`	`aggregates: aggregates,`
`186`	`179`	`groupAs: groupAs,`
`187`	`180`	`}`
`188`		`- if canSpill {`
`189`		`- rv.flags \|= _CAN_SPILL`
`190`		`- }`
`191`	`181`	`setOptEstimate(&rv.optEstimate, cost, cardinality, size, frCost)`
`192`	`182`	`return rv`
`193`	`183`	`}`
`@@ -216,10 +206,6 @@ func (this *IntermediateGroup) SetAggregates(aggregates algebra.Aggregates) {`
`216`	`206`	`this.aggregates = aggregates`
`217`	`207`	`}`
`218`	`208`
`219`		`-func (this *IntermediateGroup) CanSpill() bool {`
`220`		`- return (this.flags & _CAN_SPILL) != 0`
`221`		`-}`
`222`		`-`
`223`	`209`	`func (this *IntermediateGroup) GroupAs() string {`
`224`	`210`	`return this.groupAs`
`225`	`211`	`}`
`@@ -319,14 +305,11 @@ type FinalGroup struct {`
`319`	`305`	`}`
`320`	`306`
`321`	`307`	`func NewFinalGroup(keys expression.Expressions, aggregates algebra.Aggregates,`
`322`		`- cost, cardinality float64, size int64, frCost float64, canSpill bool) *FinalGroup {`
	`308`	`+ cost, cardinality float64, size int64, frCost float64) *FinalGroup {`
`323`	`309`	`rv := &FinalGroup{`
`324`	`310`	`keys: keys,`
`325`	`311`	`aggregates: aggregates,`
`326`	`312`	`}`
`327`		`- if canSpill {`
`328`		`- rv.flags \|= _CAN_SPILL`
`329`		`- }`
`330`	`313`	`setOptEstimate(&rv.optEstimate, cost, cardinality, size, frCost)`
`331`	`314`	`return rv`
`332`	`315`	`}`
`@@ -355,10 +338,6 @@ func (this *FinalGroup) SetAggregates(aggregates algebra.Aggregates) {`
`355`	`338`	`this.aggregates = aggregates`
`356`	`339`	`}`
`357`	`340`
`358`		`-func (this *FinalGroup) CanSpill() bool {`
`359`		`- return (this.flags & _CAN_SPILL) != 0`
`360`		`-}`
`361`		`-`
`362`	`341`	`func (this *FinalGroup) MarshalJSON() ([]byte, error) {`
`363`	`342`	`return json.Marshal(this.MarshalBase(nil))`
`364`	`343`	`}`
Original file line number	Diff line number	Diff line change
`@@ -517,12 +517,12 @@ func (this builder) visitGroup(group algebra.Group, aggs algebra.Aggregates) {`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`this.addSubChildren(plan.NewInitialGroup(group.By(), aggv,`
`520`		`- costInitial, cardinalityInitial, size, costInitial, true, group.GroupAs(), allowedGroupAsFields))`
	`520`	`+ costInitial, cardinalityInitial, size, costInitial, group.GroupAs(), allowedGroupAsFields))`
`521`	`521`	`this.addChildren(this.addSubchildrenParallel())`
`522`	`522`	`this.addChildren(plan.NewIntermediateGroup(group.By(), aggv,`
`523`		`- costIntermediate, cardinalityIntermediate, size, costIntermediate, true, group.GroupAs()))`
	`523`	`+ costIntermediate, cardinalityIntermediate, size, costIntermediate, group.GroupAs()))`
`524`	`524`	`this.addChildren(plan.NewFinalGroup(group.By(), aggv,`
`525`		`- costFinal, cardinalityFinal, size, costFinal, true))`
	`525`	`+ costFinal, cardinalityFinal, size, costFinal))`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`this.addLetAndPredicate(group.Letting(), group.Having())`