Skip to content

Commit

Permalink
Remove JSON annotations (vitessio#16437)
Browse files Browse the repository at this point in the history
Signed-off-by: Andres Taylor <andres@planetscale.com>
  • Loading branch information
systay authored Jul 22, 2024
1 parent 485d736 commit 3186413
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion go/vt/vtgate/engine/aggregations.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type AggregateParams struct {
WCol int
Type evalengine.Type

Alias string `json:",omitempty"`
Alias string
Func sqlparser.AggrFunc
Original *sqlparser.AliasedExpr

Expand Down
4 changes: 2 additions & 2 deletions go/vt/vtgate/engine/hash_join.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ type (

// Left and Right are the LHS and RHS primitives
// of the Join. They can be any primitive.
Left, Right Primitive `json:",omitempty"`
Left, Right Primitive

// Cols defines which columns from the left
// or right results should be used to build the
Expand All @@ -53,7 +53,7 @@ type (
// For the right query, they're 1, 2, etc.
// If Cols is {-1, -2, 1, 2}, it means that
// the returned result will be {Left0, Left1, Right0, Right1}.
Cols []int `json:",omitempty"`
Cols []int

// The keys correspond to the column offset in the inputs where
// the join columns can be found
Expand Down
6 changes: 3 additions & 3 deletions go/vt/vtgate/engine/join.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type Join struct {
Opcode JoinOpcode
// Left and Right are the LHS and RHS primitives
// of the Join. They can be any primitive.
Left, Right Primitive `json:",omitempty"`
Left, Right Primitive

// Cols defines which columns from the left
// or right results should be used to build the
Expand All @@ -44,12 +44,12 @@ type Join struct {
// For the right query, they're 1, 2, etc.
// If Cols is {-1, -2, 1, 2}, it means that
// the returned result will be {Left0, Left1, Right0, Right1}.
Cols []int `json:",omitempty"`
Cols []int

// Vars defines the list of joinVars that need to
// be built from the LHS result before invoking
// the RHS subqquery.
Vars map[string]int `json:",omitempty"`
Vars map[string]int
}

// TryExecute performs a non-streaming exec.
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/engine/memory_sort.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type MemorySort struct {
// TruncateColumnCount specifies the number of columns to return
// in the final result. Rest of the columns are truncated
// from the result received. If 0, no truncation happens.
TruncateColumnCount int `json:",omitempty"`
TruncateColumnCount int
}

// RouteType returns a description of the query routing type used by the primitive.
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/engine/ordered_aggregate.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type OrderedAggregate struct {
// TruncateColumnCount specifies the number of columns to return
// in the final result. Rest of the columns are truncated
// from the result received. If 0, no truncation happens.
TruncateColumnCount int `json:",omitempty"`
TruncateColumnCount int

// Input is the primitive that will feed into this Primitive.
Input Primitive
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/engine/scalar_aggregation.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type ScalarAggregate struct {
// TruncateColumnCount specifies the number of columns to return
// in the final result. Rest of the columns are truncated
// from the result received. If 0, no truncation happens.
TruncateColumnCount int `json:",omitempty"`
TruncateColumnCount int

// Input is the primitive that will feed into this Primitive.
Input Primitive
Expand Down
4 changes: 2 additions & 2 deletions go/vt/vtgate/engine/semi_join.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ var _ Primitive = (*SemiJoin)(nil)
type SemiJoin struct {
// Left and Right are the LHS and RHS primitives
// of the SemiJoin. They can be any primitive.
Left, Right Primitive `json:",omitempty"`
Left, Right Primitive

// Vars defines the list of SemiJoinVars that need to
// be built from the LHS result before invoking
// the RHS subquery.
Vars map[string]int `json:",omitempty"`
Vars map[string]int
}

// TryExecute performs a non-streaming exec.
Expand Down

0 comments on commit 3186413

Please sign in to comment.