@@ -387,12 +387,12 @@ func (p *PhysicalHashJoin) attach2TaskForMpp(tasks ...base.Task) base.Task {
387
387
lTask , lok := tasks [0 ].(* MppTask )
388
388
rTask , rok := tasks [1 ].(* MppTask )
389
389
if ! lok || ! rok {
390
- return invalidTask
390
+ return base . InvalidTask
391
391
}
392
392
if p .mppShuffleJoin {
393
393
// protection check is case of some bugs
394
394
if len (lTask .hashCols ) != len (rTask .hashCols ) || len (lTask .hashCols ) == 0 {
395
- return invalidTask
395
+ return base . InvalidTask
396
396
}
397
397
lTask , rTask = p .convertPartitionKeysIfNeed (lTask , rTask )
398
398
}
@@ -1017,7 +1017,7 @@ func (p *PhysicalExpand) Attach2Task(tasks ...base.Task) base.Task {
1017
1017
mpp .p = p
1018
1018
return mpp
1019
1019
}
1020
- return invalidTask
1020
+ return base . InvalidTask
1021
1021
}
1022
1022
1023
1023
// Attach2Task implements PhysicalPlan interface.
@@ -1052,11 +1052,11 @@ func (p *PhysicalUnionAll) attach2MppTasks(tasks ...base.Task) base.Task {
1052
1052
} else if root , ok := tk .(* RootTask ); ok && root .IsEmpty () {
1053
1053
continue
1054
1054
} else {
1055
- return invalidTask
1055
+ return base . InvalidTask
1056
1056
}
1057
1057
}
1058
1058
if len (childPlans ) == 0 {
1059
- return invalidTask
1059
+ return base . InvalidTask
1060
1060
}
1061
1061
p .SetChildren (childPlans ... )
1062
1062
return t
@@ -1069,8 +1069,8 @@ func (p *PhysicalUnionAll) Attach2Task(tasks ...base.Task) base.Task {
1069
1069
if p .TP () == plancodec .TypePartitionUnion {
1070
1070
// In attach2MppTasks(), will attach PhysicalUnion to mppTask directly.
1071
1071
// But PartitionUnion cannot pushdown to tiflash, so here disable PartitionUnion pushdown to tiflash explicitly.
1072
- // For now, return invalidTask immediately, we can refine this by letting childTask of PartitionUnion convert to rootTask.
1073
- return invalidTask
1072
+ // For now, return base.InvalidTask immediately, we can refine this by letting childTask of PartitionUnion convert to rootTask.
1073
+ return base . InvalidTask
1074
1074
}
1075
1075
return p .attach2MppTasks (tasks ... )
1076
1076
}
@@ -1758,7 +1758,7 @@ func (p *PhysicalStreamAgg) Attach2Task(tasks ...base.Task) base.Task {
1758
1758
storeType := cop .getStoreType ()
1759
1759
// TiFlash doesn't support Stream Aggregation
1760
1760
if storeType == kv .TiFlash && len (p .GroupByItems ) > 0 {
1761
- return invalidTask
1761
+ return base . InvalidTask
1762
1762
}
1763
1763
partialAgg , finalAgg := p .newPartialAggregate (storeType , false )
1764
1764
if partialAgg != nil {
@@ -2122,7 +2122,7 @@ func (p *PhysicalHashAgg) attach2TaskForMpp(tasks ...base.Task) base.Task {
2122
2122
t := tasks [0 ].Copy ()
2123
2123
mpp , ok := t .(* MppTask )
2124
2124
if ! ok {
2125
- return invalidTask
2125
+ return base . InvalidTask
2126
2126
}
2127
2127
switch p .MppRunMode {
2128
2128
case Mpp1Phase :
@@ -2139,7 +2139,7 @@ func (p *PhysicalHashAgg) attach2TaskForMpp(tasks ...base.Task) base.Task {
2139
2139
proj := p .convertAvgForMPP ()
2140
2140
partialAgg , finalAgg := p .newPartialAggregate (kv .TiFlash , true )
2141
2141
if partialAgg == nil {
2142
- return invalidTask
2142
+ return base . InvalidTask
2143
2143
}
2144
2144
attachPlan2Task (partialAgg , mpp )
2145
2145
partitionCols := p .MppPartitionCols
@@ -2149,7 +2149,7 @@ func (p *PhysicalHashAgg) attach2TaskForMpp(tasks ...base.Task) base.Task {
2149
2149
for _ , expr := range items {
2150
2150
col , ok := expr .(* expression.Column )
2151
2151
if ! ok {
2152
- return invalidTask
2152
+ return base . InvalidTask
2153
2153
}
2154
2154
partitionCols = append (partitionCols , & property.MPPPartitionColumn {
2155
2155
Col : col ,
@@ -2188,12 +2188,12 @@ func (p *PhysicalHashAgg) attach2TaskForMpp(tasks ...base.Task) base.Task {
2188
2188
proj := p .convertAvgForMPP ()
2189
2189
partialAgg , finalAgg := p .newPartialAggregate (kv .TiFlash , true )
2190
2190
if finalAgg == nil {
2191
- return invalidTask
2191
+ return base . InvalidTask
2192
2192
}
2193
2193
2194
2194
final , middle , partial , proj4Partial , err := p .adjust3StagePhaseAgg (partialAgg , finalAgg , canUse3StageAgg , groupingSets , mpp )
2195
2195
if err != nil {
2196
- return invalidTask
2196
+ return base . InvalidTask
2197
2197
}
2198
2198
2199
2199
// partial agg proj would be null if one scalar agg cannot run in two-phase mode
@@ -2241,7 +2241,7 @@ func (p *PhysicalHashAgg) attach2TaskForMpp(tasks ...base.Task) base.Task {
2241
2241
attachPlan2Task (proj , newMpp )
2242
2242
return newMpp
2243
2243
default :
2244
- return invalidTask
2244
+ return base . InvalidTask
2245
2245
}
2246
2246
}
2247
2247
0 commit comments