remove PreProcess: true from plan descriptions

Signed-off-by: Andres Taylor <andres@planetscale.com>
vitessio · Apr 12, 2021 · 96ff78f · 96ff78f
1 parent b8fbf73
commit 96ff78f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/go/vt/vtgate/engine/ordered_aggregate.go b/go/vt/vtgate/engine/ordered_aggregate.go
@@ -37,7 +37,7 @@ var _ Primitive = (*OrderedAggregate)(nil)
 // is that the underlying primitive is a scatter select with pre-sorted
 // rows.
 type OrderedAggregate struct {
- // PreProcess is true if one of the aggregates is distinct.
+ // PreProcess is true if one of the aggregates needs preprocessing.
  PreProcess bool `json:",omitempty"`
  // Aggregates specifies the aggregation parameters for each
  // aggregation function: function opcode and input column number.
@@ -69,7 +69,7 @@ func (ap AggregateParams) isDistinct() bool {
  return ap.Opcode == AggregateCountDistinct || ap.Opcode == AggregateSumDistinct
 }
 
-func (ap AggregateParams) changeField() bool {
+func (ap AggregateParams) preProcess() bool {
  return ap.Opcode == AggregateCountDistinct || ap.Opcode == AggregateSumDistinct || ap.Opcode == AggregateGtid
 }
 
@@ -279,7 +279,7 @@ func (oa *OrderedAggregate) convertFields(fields []*querypb.Field) []*querypb.Fi
  return fields
  }
  for _, aggr := range oa.Aggregates {
- if !aggr.changeField() {
+ if !aggr.preProcess() {
  continue
  }
  fields[aggr.Col] = &querypb.Field{
@@ -457,9 +457,6 @@ func (oa *OrderedAggregate) description() PrimitiveDescription {
  "Aggregates": aggregates,
  "GroupBy": groupBy,
  }
- if oa.PreProcess {
- other["PreProcess"] = true
- }
 
  return PrimitiveDescription{
  OperatorType: "Aggregate",

diff --git a/go/vt/vtgate/planbuilder/testdata/aggr_cases.txt b/go/vt/vtgate/planbuilder/testdata/aggr_cases.txt
@@ -701,7 +701,6 @@ Gen4 plan same as above
  "Variant": "Ordered",
  "Aggregates": "count_distinct(1) AS count(distinct col2)",
  "GroupBy": "0",
- "PreProcess": true,
  "Inputs": [
  {
  "OperatorType": "Route",
@@ -728,7 +727,6 @@ Gen4 plan same as above
  "OperatorType": "Aggregate",
  "Variant": "Ordered",
  "Aggregates": "count_distinct(0) AS count(distinct col2)",
- "PreProcess": true,
  "Inputs": [
  {
  "OperatorType": "Route",
@@ -756,7 +754,6 @@ Gen4 plan same as above
  "Variant": "Ordered",
  "Aggregates": "count_distinct(1) AS c2",
  "GroupBy": "0",
- "PreProcess": true,
  "Inputs": [
  {
  "OperatorType": "Route",
@@ -784,7 +781,6 @@ Gen4 plan same as above
  "Variant": "Ordered",
  "Aggregates": "sum_distinct(1) AS sum(distinct col2)",
  "GroupBy": "0",
- "PreProcess": true,
  "Inputs": [
  {
  "OperatorType": "Route",
@@ -844,7 +840,6 @@ Gen4 plan same as above
  "Variant": "Ordered",
  "Aggregates": "count_distinct(1) AS k",
  "GroupBy": "0",
- "PreProcess": true,
  "Inputs": [
  {
  "OperatorType": "Route",

diff --git a/go/vt/vtgate/planbuilder/testdata/show_cases.txt b/go/vt/vtgate/planbuilder/testdata/show_cases.txt
@@ -522,7 +522,6 @@
  "OperatorType": "Aggregate",
  "Variant": "Ordered",
  "Aggregates": "vgtid(1) AS global vgtid_executed",
- "PreProcess": true,
  "Inputs": [
  {
  "OperatorType": "Send",