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

Cleanup: Remove 'Name' field from aggregate structure #10507

Merged
merged 7 commits into from
Jun 20, 2022
Merged

Cleanup: Remove 'Name' field from aggregate structure #10507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
97bcfcc
Code clean up
rsajwani Jun 14, 2022
eaeb0fa
Merge remote-tracking branch 'upstream/main' into CleanFuncExpr
rsajwani Jun 16, 2022
006d05d
Fixing unit test case failures
rsajwani Jun 16, 2022
fac8c24
Fixing replicator planner unit tests
rsajwani Jun 17, 2022
c3f62a9
Adding unit test cases of canonical output
rsajwani Jun 17, 2022
0771c7f
Merge remote-tracking branch 'upstream/main' into CleanFuncExpr
rsajwani Jun 17, 2022
1883d58
Fix unit test
rsajwani Jun 18, 2022
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
217 changes: 99 additions & 118 deletions go/vt/sqlparser/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2328,7 +2328,6 @@ type (
FuncExpr struct {
Qualifier TableIdent
Name ColIdent
Distinct bool
Exprs SelectExprs
}

Expand Down Expand Up @@ -2657,85 +2656,69 @@ type (
Count struct {
Args Exprs
Distinct bool
Name string
}

CountStar struct {
Name string
}

Avg struct {
Arg Expr
Distinct bool
Name string
}

Max struct {
Arg Expr
Distinct bool
Name string
}

Min struct {
Arg Expr
Distinct bool
Name string
}

Sum struct {
Arg Expr
Distinct bool
Name string
}

BitAnd struct {
Arg Expr
Name string
Arg Expr
}

BitOr struct {
Arg Expr
Name string
Arg Expr
}

BitXor struct {
Arg Expr
Name string
Arg Expr
}

Std struct {
Arg Expr
Name string
Arg Expr
}

StdDev struct {
Arg Expr
Name string
Arg Expr
}

StdPop struct {
Arg Expr
Name string
Arg Expr
}

StdSamp struct {
Arg Expr
Name string
Arg Expr
}

VarPop struct {
Arg Expr
Name string
Arg Expr
}

VarSamp struct {
Arg Expr
Name string
Arg Expr
}

Variance struct {
Arg Expr
Name string
Arg Expr
}

// GroupConcatExpr represents a call to GROUP_CONCAT
Expand All @@ -2745,7 +2728,6 @@ type (
OrderBy OrderBy
Separator string
Limit *Limit
Name string
}

// RegexpInstrExpr represents REGEXP_INSTR()
Expand Down Expand Up @@ -2880,96 +2862,6 @@ type (
)

// iExpr ensures that only expressions nodes can be assigned to a Expr
func (*Sum) iExpr() {}
func (*Min) iExpr() {}
func (*Max) iExpr() {}
func (*Avg) iExpr() {}
func (*CountStar) iExpr() {}
func (*Count) iExpr() {}
func (*GroupConcatExpr) iExpr() {}
func (*BitAnd) iExpr() {}
func (*BitOr) iExpr() {}
func (*BitXor) iExpr() {}
func (*Std) iExpr() {}
func (*StdDev) iExpr() {}
func (*StdPop) iExpr() {}
func (*StdSamp) iExpr() {}
func (*VarPop) iExpr() {}
func (*VarSamp) iExpr() {}
func (*Variance) iExpr() {}

func (sum *Sum) GetArg() Expr { return sum.Arg }
func (min *Min) GetArg() Expr { return min.Arg }
func (max *Max) GetArg() Expr { return max.Arg }
func (avg *Avg) GetArg() Expr { return avg.Arg }
func (*CountStar) GetArg() Expr { return nil }
func (count *Count) GetArg() Expr { return count.Args[0] }
func (grpConcat *GroupConcatExpr) GetArg() Expr { return grpConcat.Exprs[0] }
func (bAnd *BitAnd) GetArg() Expr { return bAnd.Arg }
func (bOr *BitOr) GetArg() Expr { return bOr.Arg }
func (bXor *BitXor) GetArg() Expr { return bXor.Arg }
func (std *Std) GetArg() Expr { return std.Arg }
func (stdD *StdDev) GetArg() Expr { return stdD.Arg }
func (stdP *StdPop) GetArg() Expr { return stdP.Arg }
func (stdS *StdSamp) GetArg() Expr { return stdS.Arg }
func (varP *VarPop) GetArg() Expr { return varP.Arg }
func (varS *VarSamp) GetArg() Expr { return varS.Arg }
func (variance *Variance) GetArg() Expr { return variance.Arg }

func (sum *Sum) GetArgs() Exprs { return Exprs{sum.Arg} }
func (min *Min) GetArgs() Exprs { return Exprs{min.Arg} }
func (max *Max) GetArgs() Exprs { return Exprs{max.Arg} }
func (avg *Avg) GetArgs() Exprs { return Exprs{avg.Arg} }
func (*CountStar) GetArgs() Exprs { return nil }
func (count *Count) GetArgs() Exprs { return count.Args }
func (grpConcat *GroupConcatExpr) GetArgs() Exprs { return grpConcat.Exprs }
func (bAnd *BitAnd) GetArgs() Exprs { return Exprs{bAnd.Arg} }
func (bOr *BitOr) GetArgs() Exprs { return Exprs{bOr.Arg} }
func (bXor *BitXor) GetArgs() Exprs { return Exprs{bXor.Arg} }
func (std *Std) GetArgs() Exprs { return Exprs{std.Arg} }
func (stdD *StdDev) GetArgs() Exprs { return Exprs{stdD.Arg} }
func (stdP *StdPop) GetArgs() Exprs { return Exprs{stdP.Arg} }
func (stdS *StdSamp) GetArgs() Exprs { return Exprs{stdS.Arg} }
func (varP *VarPop) GetArgs() Exprs { return Exprs{varP.Arg} }
func (varS *VarSamp) GetArgs() Exprs { return Exprs{varS.Arg} }
func (variance *Variance) GetArgs() Exprs { return Exprs{variance.Arg} }

func (sum *Sum) IsDistinct() bool { return sum.Distinct }
func (min *Min) IsDistinct() bool { return min.Distinct }
func (max *Max) IsDistinct() bool { return max.Distinct }
func (avg *Avg) IsDistinct() bool { return avg.Distinct }
func (cStar *CountStar) IsDistinct() bool { return false }
func (count *Count) IsDistinct() bool { return count.Distinct }
func (grpConcat *GroupConcatExpr) IsDistinct() bool { return grpConcat.Distinct }
func (bAnd *BitAnd) IsDistinct() bool { return false }
func (bOr *BitOr) IsDistinct() bool { return false }
func (bXor *BitXor) IsDistinct() bool { return false }
func (std *Std) IsDistinct() bool { return false }
func (stdD *StdDev) IsDistinct() bool { return false }
func (stdP *StdPop) IsDistinct() bool { return false }
func (stdS *StdSamp) IsDistinct() bool { return false }
func (varP *VarPop) IsDistinct() bool { return false }
func (varS *VarSamp) IsDistinct() bool { return false }
func (variance *Variance) IsDistinct() bool { return false }

func (sum *Sum) AggrName() string { return sum.Name }
func (min *Min) AggrName() string { return min.Name }
func (max *Max) AggrName() string { return max.Name }
func (avg *Avg) AggrName() string { return avg.Name }
func (cStar *CountStar) AggrName() string { return cStar.Name }
func (count *Count) AggrName() string { return count.Name }
func (grpConcat *GroupConcatExpr) AggrName() string { return grpConcat.Name }
func (bAnd *BitAnd) AggrName() string { return bAnd.Name }
func (bOr *BitOr) AggrName() string { return bOr.Name }
func (bXor *BitXor) AggrName() string { return bXor.Name }
func (std *Std) AggrName() string { return std.Name }
func (stdD *StdDev) AggrName() string { return stdD.Name }
func (stdP *StdPop) AggrName() string { return stdP.Name }
func (stdS *StdSamp) AggrName() string { return stdS.Name }
func (varP *VarPop) AggrName() string { return varP.Name }
func (varS *VarSamp) AggrName() string { return varS.Name }
func (variance *Variance) AggrName() string { return variance.Name }

func (*AndExpr) iExpr() {}
func (*OrExpr) iExpr() {}
func (*XorExpr) iExpr() {}
Expand Down Expand Up @@ -3042,6 +2934,23 @@ func (*ExtractValueExpr) iExpr() {}
func (*UpdateXMLExpr) iExpr() {}
func (*LockingFunc) iExpr() {}
func (*PerformanceSchemaFuncExpr) iExpr() {}
func (*Sum) iExpr() {}
func (*Min) iExpr() {}
func (*Max) iExpr() {}
func (*Avg) iExpr() {}
func (*CountStar) iExpr() {}
func (*Count) iExpr() {}
func (*GroupConcatExpr) iExpr() {}
func (*BitAnd) iExpr() {}
func (*BitOr) iExpr() {}
func (*BitXor) iExpr() {}
func (*Std) iExpr() {}
func (*StdDev) iExpr() {}
func (*StdPop) iExpr() {}
func (*StdSamp) iExpr() {}
func (*VarPop) iExpr() {}
func (*VarSamp) iExpr() {}
func (*Variance) iExpr() {}

// iCallable marks all expressions that represent function calls
func (*FuncExpr) iCallable() {}
Expand Down Expand Up @@ -3091,6 +3000,78 @@ func (*ExtractValueExpr) iCallable() {}
func (*UpdateXMLExpr) iCallable() {}
func (*PerformanceSchemaFuncExpr) iCallable() {}

func (sum *Sum) GetArg() Expr { return sum.Arg }
func (min *Min) GetArg() Expr { return min.Arg }
func (max *Max) GetArg() Expr { return max.Arg }
func (avg *Avg) GetArg() Expr { return avg.Arg }
func (*CountStar) GetArg() Expr { return nil }
func (count *Count) GetArg() Expr { return count.Args[0] }
func (grpConcat *GroupConcatExpr) GetArg() Expr { return grpConcat.Exprs[0] }
func (bAnd *BitAnd) GetArg() Expr { return bAnd.Arg }
func (bOr *BitOr) GetArg() Expr { return bOr.Arg }
func (bXor *BitXor) GetArg() Expr { return bXor.Arg }
func (std *Std) GetArg() Expr { return std.Arg }
func (stdD *StdDev) GetArg() Expr { return stdD.Arg }
func (stdP *StdPop) GetArg() Expr { return stdP.Arg }
func (stdS *StdSamp) GetArg() Expr { return stdS.Arg }
func (varP *VarPop) GetArg() Expr { return varP.Arg }
func (varS *VarSamp) GetArg() Expr { return varS.Arg }
func (variance *Variance) GetArg() Expr { return variance.Arg }

func (sum *Sum) GetArgs() Exprs { return Exprs{sum.Arg} }
func (min *Min) GetArgs() Exprs { return Exprs{min.Arg} }
func (max *Max) GetArgs() Exprs { return Exprs{max.Arg} }
func (avg *Avg) GetArgs() Exprs { return Exprs{avg.Arg} }
func (*CountStar) GetArgs() Exprs { return nil }
func (count *Count) GetArgs() Exprs { return count.Args }
func (grpConcat *GroupConcatExpr) GetArgs() Exprs { return grpConcat.Exprs }
func (bAnd *BitAnd) GetArgs() Exprs { return Exprs{bAnd.Arg} }
func (bOr *BitOr) GetArgs() Exprs { return Exprs{bOr.Arg} }
func (bXor *BitXor) GetArgs() Exprs { return Exprs{bXor.Arg} }
func (std *Std) GetArgs() Exprs { return Exprs{std.Arg} }
func (stdD *StdDev) GetArgs() Exprs { return Exprs{stdD.Arg} }
func (stdP *StdPop) GetArgs() Exprs { return Exprs{stdP.Arg} }
func (stdS *StdSamp) GetArgs() Exprs { return Exprs{stdS.Arg} }
func (varP *VarPop) GetArgs() Exprs { return Exprs{varP.Arg} }
func (varS *VarSamp) GetArgs() Exprs { return Exprs{varS.Arg} }
func (variance *Variance) GetArgs() Exprs { return Exprs{variance.Arg} }

func (sum *Sum) IsDistinct() bool { return sum.Distinct }
func (min *Min) IsDistinct() bool { return min.Distinct }
func (max *Max) IsDistinct() bool { return max.Distinct }
func (avg *Avg) IsDistinct() bool { return avg.Distinct }
func (cStar *CountStar) IsDistinct() bool { return false }
func (count *Count) IsDistinct() bool { return count.Distinct }
func (grpConcat *GroupConcatExpr) IsDistinct() bool { return grpConcat.Distinct }
func (bAnd *BitAnd) IsDistinct() bool { return false }
func (bOr *BitOr) IsDistinct() bool { return false }
func (bXor *BitXor) IsDistinct() bool { return false }
func (std *Std) IsDistinct() bool { return false }
func (stdD *StdDev) IsDistinct() bool { return false }
func (stdP *StdPop) IsDistinct() bool { return false }
func (stdS *StdSamp) IsDistinct() bool { return false }
func (varP *VarPop) IsDistinct() bool { return false }
func (varS *VarSamp) IsDistinct() bool { return false }
func (variance *Variance) IsDistinct() bool { return false }

func (sum *Sum) AggrName() string { return "sum" }
func (min *Min) AggrName() string { return "min" }
func (max *Max) AggrName() string { return "max" }
func (avg *Avg) AggrName() string { return "avg" }
func (cStar *CountStar) AggrName() string { return "count" }
func (count *Count) AggrName() string { return "count" }
func (grpConcat *GroupConcatExpr) AggrName() string { return "group_concat" }
func (bAnd *BitAnd) AggrName() string { return "bit_and" }
func (bOr *BitOr) AggrName() string { return "bit_or" }
func (bXor *BitXor) AggrName() string { return "bit_xor" }
func (std *Std) AggrName() string { return "std" }
func (stdD *StdDev) AggrName() string { return "stddev" }
func (stdP *StdPop) AggrName() string { return "stddev_pop" }
func (stdS *StdSamp) AggrName() string { return "stddev_samp" }
func (varP *VarPop) AggrName() string { return "var_pop" }
func (varS *VarSamp) AggrName() string { return "var_samp" }
func (variance *Variance) AggrName() string { return "variance" }

// Exprs represents a list of value expressions.
// It's not a valid expression because it's not parenthesized.
type Exprs []Expr
Expand Down
Loading