提交 3fd8c8a0 编写于 作者: martianzhang's avatar martianzhang

vendor daily update

上级 b76eaf45
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
package ast package ast
import ( import (
"github.com/pingcap/parser/auth"
"github.com/pingcap/parser/model" "github.com/pingcap/parser/model"
"github.com/pingcap/parser/types" "github.com/pingcap/parser/types"
) )
...@@ -552,16 +553,34 @@ func (n *TableToTable) Accept(v Visitor) (Node, bool) { ...@@ -552,16 +553,34 @@ func (n *TableToTable) Accept(v Visitor) (Node, bool) {
type CreateViewStmt struct { type CreateViewStmt struct {
ddlNode ddlNode
OrReplace bool OrReplace bool
ViewName *TableName ViewName *TableName
Cols []model.CIStr Cols []model.CIStr
Select StmtNode Select StmtNode
Algorithm model.ViewAlgorithm
Definer *auth.UserIdentity
Security model.ViewSecurity
CheckOption model.ViewCheckOption
} }
// Accept implements Node Accept interface. // Accept implements Node Accept interface.
func (n *CreateViewStmt) Accept(v Visitor) (Node, bool) { func (n *CreateViewStmt) Accept(v Visitor) (Node, bool) {
// TODO: implement the details. newNode, skipChildren := v.Enter(n)
return n, true if skipChildren {
return v.Leave(newNode)
}
n = newNode.(*CreateViewStmt)
node, ok := n.ViewName.Accept(v)
if !ok {
return n, false
}
n.ViewName = node.(*TableName)
selnode, ok := n.Select.Accept(v)
if !ok {
return n, false
}
n.Select = selnode.(*SelectStmt)
return v.Leave(n)
} }
// CreateIndexStmt is a statement to create an index. // CreateIndexStmt is a statement to create an index.
......
...@@ -484,6 +484,10 @@ const ( ...@@ -484,6 +484,10 @@ const (
AggFuncBitXor = "bit_xor" AggFuncBitXor = "bit_xor"
// AggFuncBitAnd is the name of bit_and function. // AggFuncBitAnd is the name of bit_and function.
AggFuncBitAnd = "bit_and" AggFuncBitAnd = "bit_and"
// AggFuncVarPop is the name of var_pop function
AggFuncVarPop = "var_pop"
// AggFuncVarSamp is the name of var_samp function
AggFuncVarSamp = "var_samp"
// AggFuncStddevPop is the name of stddev_pop function // AggFuncStddevPop is the name of stddev_pop function
AggFuncStddevPop = "stddev_pop" AggFuncStddevPop = "stddev_pop"
// AggFuncStddevSamp is the name of stddev_samp function // AggFuncStddevSamp is the name of stddev_samp function
......
#!/bin/bash
# This script is used to checkout a Parser PR branch in a forked repo.
if test -z $1; then
echo -e "Usage:\n"
echo -e "\tcheckout-pr-branch.sh [github-username]:[pr-branch]\n"
echo -e "The argument can be copied directly from github PR page."
echo -e "The local branch name would be [github-username]/[pr-branch]."
exit 0;
fi
username=$(echo $1 | cut -d':' -f1)
branch=$(echo $1 | cut -d':' -f2)
local_branch=$username/$branch
fork="https://github.com/$username/parser"
exists=`git show-ref refs/heads/$local_branch`
if [ -n "$exists" ]; then
git checkout $local_branch
git pull $fork $branch:$local_branch
else
git fetch $fork $branch:$local_branch
git checkout $local_branch
fi
...@@ -516,6 +516,9 @@ var tokenMap = map[string]int{ ...@@ -516,6 +516,9 @@ var tokenMap = map[string]int{
"VARBINARY": varbinaryType, "VARBINARY": varbinaryType,
"VARCHAR": varcharType, "VARCHAR": varcharType,
"VARIABLES": variables, "VARIABLES": variables,
"VARIANCE": varPop,
"VAR_POP": varPop,
"VAR_SAMP": varSamp,
"VIEW": view, "VIEW": view,
"VIRTUAL": virtual, "VIRTUAL": virtual,
"WARNINGS": warnings, "WARNINGS": warnings,
......
...@@ -50,6 +50,7 @@ const ( ...@@ -50,6 +50,7 @@ const (
ActionRenameIndex ActionType = 18 ActionRenameIndex ActionType = 18
ActionAddTablePartition ActionType = 19 ActionAddTablePartition ActionType = 19
ActionDropTablePartition ActionType = 20 ActionDropTablePartition ActionType = 20
ActionCreateView ActionType = 21
) )
// AddIndexStr is a string related to the operation of "add index". // AddIndexStr is a string related to the operation of "add index".
...@@ -76,6 +77,7 @@ var actionMap = map[ActionType]string{ ...@@ -76,6 +77,7 @@ var actionMap = map[ActionType]string{
ActionRenameIndex: "rename index", ActionRenameIndex: "rename index",
ActionAddTablePartition: "add partition", ActionAddTablePartition: "add partition",
ActionDropTablePartition: "drop table partition", ActionDropTablePartition: "drop table partition",
ActionCreateView: "create view",
} }
// String return current ddl action in string // String return current ddl action in string
......
...@@ -19,6 +19,7 @@ import ( ...@@ -19,6 +19,7 @@ import (
"time" "time"
"github.com/pingcap/errors" "github.com/pingcap/errors"
"github.com/pingcap/parser/auth"
"github.com/pingcap/parser/mysql" "github.com/pingcap/parser/mysql"
"github.com/pingcap/parser/types" "github.com/pingcap/parser/types"
"github.com/pingcap/tipb/go-tipb" "github.com/pingcap/tipb/go-tipb"
...@@ -169,6 +170,8 @@ type TableInfo struct { ...@@ -169,6 +170,8 @@ type TableInfo struct {
Partition *PartitionInfo `json:"partition"` Partition *PartitionInfo `json:"partition"`
Compression string `json:"compression"` Compression string `json:"compression"`
View *ViewInfo `json:"view"`
} }
// GetPartitionInfo returns the partition information. // GetPartitionInfo returns the partition information.
...@@ -287,6 +290,84 @@ func (t *TableInfo) ColumnIsInIndex(c *ColumnInfo) bool { ...@@ -287,6 +290,84 @@ func (t *TableInfo) ColumnIsInIndex(c *ColumnInfo) bool {
return false return false
} }
// IsView checks if tableinfo is a view
func (t *TableInfo) IsView() bool {
return t.View != nil
}
// ViewAlgorithm is VIEW's SQL AlGORITHM characteristic.
// See https://dev.mysql.com/doc/refman/5.7/en/view-algorithms.html
type ViewAlgorithm int
const (
AlgorithmUndefined ViewAlgorithm = iota
AlgorithmMerge
AlgorithmTemptable
)
func (v *ViewAlgorithm) String() string {
switch *v {
case AlgorithmMerge:
return "MERGE"
case AlgorithmTemptable:
return "TEMPTABLE"
case AlgorithmUndefined:
return "UNDEFINED"
default:
return "UNDEFINED"
}
}
// ViewSecurity is VIEW's SQL SECURITY characteristic.
// See https://dev.mysql.com/doc/refman/5.7/en/create-view.html
type ViewSecurity int
const (
SecurityDefiner ViewSecurity = iota
SecurityInvoker
)
func (v *ViewSecurity) String() string {
switch *v {
case SecurityInvoker:
return "INVOKER"
case SecurityDefiner:
return "DEFINER"
default:
return "DEFINER"
}
}
// ViewCheckOption is VIEW's WITH CHECK OPTION clause part.
// See https://dev.mysql.com/doc/refman/5.7/en/view-check-option.html
type ViewCheckOption int
const (
CheckOptionLocal ViewCheckOption = iota
CheckOptionCascaded
)
func (v *ViewCheckOption) String() string {
switch *v {
case CheckOptionLocal:
return "LOCAL"
case CheckOptionCascaded:
return "CASCADED"
default:
return "CASCADED"
}
}
// ViewInfo provides meta data describing a DB view.
type ViewInfo struct {
Algorithm ViewAlgorithm `json:"view_algorithm"`
Definer *auth.UserIdentity `json:"view_definer"`
Security ViewSecurity `json:"view_security"`
SelectStmt string `json:"view_select"`
CheckOption ViewCheckOption `json:"view_checkoption"`
Cols []CIStr `json:"view_cols"`
}
// PartitionType is the type for PartitionInfo // PartitionType is the type for PartitionInfo
type PartitionType int type PartitionType int
......
因为 它太大了无法显示 source diff 。你可以改为 查看blob
...@@ -462,6 +462,9 @@ import ( ...@@ -462,6 +462,9 @@ import (
timestampDiff "TIMESTAMPDIFF" timestampDiff "TIMESTAMPDIFF"
top "TOP" top "TOP"
trim "TRIM" trim "TRIM"
variance "VARIANCE"
varPop "VAR_POP"
varSamp "VAR_SAMP"
/* The following tokens belong to TiDBKeyword. */ /* The following tokens belong to TiDBKeyword. */
admin "ADMIN" admin "ADMIN"
...@@ -2132,15 +2135,25 @@ CreateViewStmt: ...@@ -2132,15 +2135,25 @@ CreateViewStmt:
{ {
startOffset := parser.startOffset(&yyS[yypt-1]) startOffset := parser.startOffset(&yyS[yypt-1])
selStmt := $10.(*ast.SelectStmt) selStmt := $10.(*ast.SelectStmt)
selStmt.SetText(string(parser.src[startOffset:])) selStmt.SetText(strings.TrimSpace(parser.src[startOffset:]))
x := &ast.CreateViewStmt { x := &ast.CreateViewStmt {
OrReplace: $2.(bool), OrReplace: $2.(bool),
ViewName: $7.(*ast.TableName), ViewName: $7.(*ast.TableName),
Select: selStmt, Select: selStmt,
Algorithm: $3.(model.ViewAlgorithm),
Definer: $4.(*auth.UserIdentity),
Security: $5.(model.ViewSecurity),
} }
if $8 != nil{ if $8 != nil{
x.Cols = $8.([]model.CIStr) x.Cols = $8.([]model.CIStr)
} }
if $11 !=nil {
x.CheckOption = $11.(model.ViewCheckOption)
endOffset := parser.startOffset(&yyS[yypt])
selStmt.SetText(strings.TrimSpace(parser.src[startOffset:endOffset]))
} else {
x.CheckOption = model.CheckOptionCascaded
}
$$ = x $$ = x
} }
...@@ -2156,25 +2169,25 @@ OrReplace: ...@@ -2156,25 +2169,25 @@ OrReplace:
ViewAlgorithm: ViewAlgorithm:
/* EMPTY */ /* EMPTY */
{ {
$$ = "UNDEFINED" $$ = model.AlgorithmUndefined
} }
| "ALGORITHM" "=" "UNDEFINED" | "ALGORITHM" "=" "UNDEFINED"
{ {
$$ = strings.ToUpper($3) $$ = model.AlgorithmUndefined
} }
| "ALGORITHM" "=" "MERGE" | "ALGORITHM" "=" "MERGE"
{ {
$$ = strings.ToUpper($3) $$ = model.AlgorithmMerge
} }
| "ALGORITHM" "=" "TEMPTABLE" | "ALGORITHM" "=" "TEMPTABLE"
{ {
$$ = strings.ToUpper($3) $$ = model.AlgorithmTemptable
} }
ViewDefiner: ViewDefiner:
/* EMPTY */ /* EMPTY */
{ {
$$ = nil $$ = &auth.UserIdentity{CurrentUser: true}
} }
| "DEFINER" "=" Username | "DEFINER" "=" Username
{ {
...@@ -2184,15 +2197,15 @@ ViewDefiner: ...@@ -2184,15 +2197,15 @@ ViewDefiner:
ViewSQLSecurity: ViewSQLSecurity:
/* EMPTY */ /* EMPTY */
{ {
$$ = "DEFINER" $$ = model.SecurityDefiner
} }
| "SQL" "SECURITY" "DEFINER" | "SQL" "SECURITY" "DEFINER"
{ {
$$ = $3 $$ = model.SecurityDefiner
} }
| "SQL" "SECURITY" "INVOKER" | "SQL" "SECURITY" "INVOKER"
{ {
$$ = $3 $$ = model.SecurityInvoker
} }
ViewName: ViewName:
...@@ -2228,11 +2241,11 @@ ViewCheckOption: ...@@ -2228,11 +2241,11 @@ ViewCheckOption:
} }
| "WITH" "CASCADED" "CHECK" "OPTION" | "WITH" "CASCADED" "CHECK" "OPTION"
{ {
$$ = $2 $$ = model.CheckOptionCascaded
} }
| "WITH" "LOCAL" "CHECK" "OPTION" | "WITH" "LOCAL" "CHECK" "OPTION"
{ {
$$ = $2 $$ = model.CheckOptionLocal
} }
/****************************************************************** /******************************************************************
...@@ -2973,7 +2986,8 @@ TiDBKeyword: ...@@ -2973,7 +2986,8 @@ TiDBKeyword:
NotKeywordToken: NotKeywordToken:
"ADDDATE" | "BIT_AND" | "BIT_OR" | "BIT_XOR" | "CAST" | "COPY" | "COUNT" | "CURTIME" | "DATE_ADD" | "DATE_SUB" | "EXTRACT" | "GET_FORMAT" | "GROUP_CONCAT" "ADDDATE" | "BIT_AND" | "BIT_OR" | "BIT_XOR" | "CAST" | "COPY" | "COUNT" | "CURTIME" | "DATE_ADD" | "DATE_SUB" | "EXTRACT" | "GET_FORMAT" | "GROUP_CONCAT"
| "INPLACE" | "INTERNAL" |"MIN" | "MAX" | "MAX_EXECUTION_TIME" | "NOW" | "RECENT" | "POSITION" | "SUBDATE" | "SUBSTRING" | "SUM" | "STD" | "STDDEV" | "STDDEV_POP" | "STDDEV_SAMP" | "INPLACE" | "INTERNAL" |"MIN" | "MAX" | "MAX_EXECUTION_TIME" | "NOW" | "RECENT" | "POSITION" | "SUBDATE" | "SUBSTRING" | "SUM"
| "STD" | "STDDEV" | "STDDEV_POP" | "STDDEV_SAMP" | "VARIANCE" | "VAR_POP" | "VAR_SAMP"
| "TIMESTAMPADD" | "TIMESTAMPDIFF" | "TOP" | "TRIM" | "NEXT_ROW_ID" | "TIMESTAMPADD" | "TIMESTAMPDIFF" | "TOP" | "TRIM" | "NEXT_ROW_ID"
/************************************************************************************ /************************************************************************************
...@@ -4010,6 +4024,14 @@ SumExpr: ...@@ -4010,6 +4024,14 @@ SumExpr:
$$ = &ast.AggregateFuncExpr{F: $1, Args: []ast.ExprNode{$4}, Distinct: $3.(bool)} $$ = &ast.AggregateFuncExpr{F: $1, Args: []ast.ExprNode{$4}, Distinct: $3.(bool)}
} }
} }
| builtinVarPop '(' BuggyDefaultFalseDistinctOpt Expression ')' OptWindowingClause
{
$$ = &ast.AggregateFuncExpr{F: ast.AggFuncVarPop, Args: []ast.ExprNode{$4}, Distinct: $3.(bool)}
}
| builtinVarSamp '(' BuggyDefaultFalseDistinctOpt Expression ')' OptWindowingClause
{
$$ = &ast.AggregateFuncExpr{F: $1, Args: []ast.ExprNode{$4}, Distinct: $3.(bool)}
}
OptGConcatSeparator: OptGConcatSeparator:
{ {
......
...@@ -17,7 +17,9 @@ import ( ...@@ -17,7 +17,9 @@ import (
"fmt" "fmt"
"io" "io"
"strconv" "strconv"
"strings"
"github.com/pingcap/errors"
"github.com/pingcap/parser/ast" "github.com/pingcap/parser/ast"
"github.com/pingcap/parser/mysql" "github.com/pingcap/parser/mysql"
"github.com/pingcap/tidb/types" "github.com/pingcap/tidb/types"
...@@ -67,13 +69,22 @@ type ValueExpr struct { ...@@ -67,13 +69,22 @@ type ValueExpr struct {
projectionOffset int projectionOffset int
} }
// Restore implements Recoverable interface.
func (n *ValueExpr) Restore(sb *strings.Builder) error {
err := n.format(sb)
if err != nil {
return errors.Trace(err)
}
return nil
}
// GetDatumString implements the ast.ValueExpr interface. // GetDatumString implements the ast.ValueExpr interface.
func (n *ValueExpr) GetDatumString() string { func (n *ValueExpr) GetDatumString() string {
return n.GetString() return n.GetString()
} }
// Format the ExprNode into a Writer. // Format the ExprNode into a Writer.
func (n *ValueExpr) Format(w io.Writer) { func (n *ValueExpr) format(w io.Writer) error {
var s string var s string
switch n.Kind() { switch n.Kind() {
case types.KindNull: case types.KindNull:
...@@ -105,9 +116,18 @@ func (n *ValueExpr) Format(w io.Writer) { ...@@ -105,9 +116,18 @@ func (n *ValueExpr) Format(w io.Writer) {
s = n.GetBinaryLiteral().ToBitLiteralString(true) s = n.GetBinaryLiteral().ToBitLiteralString(true)
} }
default: default:
panic("Can't format to string") return errors.New("can't format to string")
} }
fmt.Fprint(w, s) fmt.Fprint(w, s)
return nil
}
// Format the ExprNode into a Writer.
func (n *ValueExpr) Format(w io.Writer) {
err := n.format(w)
if err != nil {
panic("Can't format to string")
}
} }
// newValueExpr creates a ValueExpr with value, and sets default field type. // newValueExpr creates a ValueExpr with value, and sets default field type.
...@@ -150,6 +170,12 @@ type ParamMarkerExpr struct { ...@@ -150,6 +170,12 @@ type ParamMarkerExpr struct {
Order int Order int
} }
// Restore implements Recoverable interface.
func (n *ParamMarkerExpr) Restore(sb *strings.Builder) error {
sb.WriteString("?")
return nil
}
func newParamMarkerExpr(offset int) ast.ParamMarkerExpr { func newParamMarkerExpr(offset int) ast.ParamMarkerExpr {
return &ParamMarkerExpr{ return &ParamMarkerExpr{
Offset: offset, Offset: offset,
......
...@@ -105,106 +105,106 @@ ...@@ -105,106 +105,106 @@
"revisionTime": "2018-10-24T15:10:47Z" "revisionTime": "2018-10-24T15:10:47Z"
}, },
{ {
"checksumSHA1": "oFNBj222ad7LvyQ9TMUPienQZOI=", "checksumSHA1": "jBf42FXXePd8z/qP4g5n1K0H2vQ=",
"path": "github.com/pingcap/parser", "path": "github.com/pingcap/parser",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "s7hZrsoenMYJ2An3wl4EbvJSZJY=", "checksumSHA1": "xuDucshl6h8s/D6FVXIiWcgdu9I=",
"path": "github.com/pingcap/parser/ast", "path": "github.com/pingcap/parser/ast",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "skWGV4FNvD3vr+5olepaPPnylUw=", "checksumSHA1": "skWGV4FNvD3vr+5olepaPPnylUw=",
"path": "github.com/pingcap/parser/auth", "path": "github.com/pingcap/parser/auth",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "grkBf/zf8cTJRtI64P1jV6B+p/4=", "checksumSHA1": "grkBf/zf8cTJRtI64P1jV6B+p/4=",
"path": "github.com/pingcap/parser/charset", "path": "github.com/pingcap/parser/charset",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "SInoXbsRe0tnBwmatmtZYfSFbdk=", "checksumSHA1": "SInoXbsRe0tnBwmatmtZYfSFbdk=",
"path": "github.com/pingcap/parser/format", "path": "github.com/pingcap/parser/format",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "2bdcxM8NQIArMyIIf4Q8tsNzyuw=", "checksumSHA1": "+rJd1MX+3A1gwbrFZHFWbC8l8ao=",
"path": "github.com/pingcap/parser/model", "path": "github.com/pingcap/parser/model",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "QBa9yiMDQNl2cLLwqlRoNTpCPNg=", "checksumSHA1": "QBa9yiMDQNl2cLLwqlRoNTpCPNg=",
"path": "github.com/pingcap/parser/mysql", "path": "github.com/pingcap/parser/mysql",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "oNBCSwJRykKuzIKgPCttatB9hAo=", "checksumSHA1": "oNBCSwJRykKuzIKgPCttatB9hAo=",
"path": "github.com/pingcap/parser/opcode", "path": "github.com/pingcap/parser/opcode",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "XvnUllvwMYd6HrMvMiKnn4cGN2M=", "checksumSHA1": "XvnUllvwMYd6HrMvMiKnn4cGN2M=",
"path": "github.com/pingcap/parser/terror", "path": "github.com/pingcap/parser/terror",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "s96v2EoeGKcWHO3mpMOQk/z2iaI=", "checksumSHA1": "s96v2EoeGKcWHO3mpMOQk/z2iaI=",
"path": "github.com/pingcap/parser/types", "path": "github.com/pingcap/parser/types",
"revision": "a38036a60de70cf02a30eb0b5496537bffffb6d0", "revision": "83f31aa7980adf30ef67a744d599804c4ca67faa",
"revisionTime": "2018-11-26T11:16:51Z" "revisionTime": "2018-12-04T02:04:44Z"
}, },
{ {
"checksumSHA1": "kO63T5plq+V7HWnkzB9WlOnp9Iw=", "checksumSHA1": "kO63T5plq+V7HWnkzB9WlOnp9Iw=",
"path": "github.com/pingcap/tidb/sessionctx/stmtctx", "path": "github.com/pingcap/tidb/sessionctx/stmtctx",
"revision": "36bcf5db4ab610aff7287081da04e2893760a45a", "revision": "8ddeeea939747e2d4634beb792d9d3281c49129d",
"revisionTime": "2018-11-30T06:30:31Z" "revisionTime": "2018-12-03T15:37:39Z"
}, },
{ {
"checksumSHA1": "U/Wz15G+PgX5yjPBvxRpTywvvCw=", "checksumSHA1": "U/Wz15G+PgX5yjPBvxRpTywvvCw=",
"path": "github.com/pingcap/tidb/types", "path": "github.com/pingcap/tidb/types",
"revision": "36bcf5db4ab610aff7287081da04e2893760a45a", "revision": "8ddeeea939747e2d4634beb792d9d3281c49129d",
"revisionTime": "2018-11-30T06:30:31Z" "revisionTime": "2018-12-03T15:37:39Z"
}, },
{ {
"checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=", "checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=",
"path": "github.com/pingcap/tidb/types/json", "path": "github.com/pingcap/tidb/types/json",
"revision": "36bcf5db4ab610aff7287081da04e2893760a45a", "revision": "8ddeeea939747e2d4634beb792d9d3281c49129d",
"revisionTime": "2018-11-30T06:30:31Z" "revisionTime": "2018-12-03T15:37:39Z"
}, },
{ {
"checksumSHA1": "78GI/0/9CTFg5FMZc1WcB9EcIp4=", "checksumSHA1": "Zp5ME8OXNTmHnYTwJJUZlydN4/U=",
"path": "github.com/pingcap/tidb/types/parser_driver", "path": "github.com/pingcap/tidb/types/parser_driver",
"revision": "36bcf5db4ab610aff7287081da04e2893760a45a", "revision": "8ddeeea939747e2d4634beb792d9d3281c49129d",
"revisionTime": "2018-11-30T06:30:31Z" "revisionTime": "2018-12-03T15:37:39Z"
}, },
{ {
"checksumSHA1": "s709bhSrG2Ec35406mGtrySid4s=", "checksumSHA1": "s709bhSrG2Ec35406mGtrySid4s=",
"path": "github.com/pingcap/tidb/util/execdetails", "path": "github.com/pingcap/tidb/util/execdetails",
"revision": "36bcf5db4ab610aff7287081da04e2893760a45a", "revision": "8ddeeea939747e2d4634beb792d9d3281c49129d",
"revisionTime": "2018-11-30T06:30:31Z" "revisionTime": "2018-12-03T15:37:39Z"
}, },
{ {
"checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=", "checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=",
"path": "github.com/pingcap/tidb/util/hack", "path": "github.com/pingcap/tidb/util/hack",
"revision": "36bcf5db4ab610aff7287081da04e2893760a45a", "revision": "8ddeeea939747e2d4634beb792d9d3281c49129d",
"revisionTime": "2018-11-30T06:30:31Z" "revisionTime": "2018-12-03T15:37:39Z"
}, },
{ {
"checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=", "checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=",
"path": "github.com/pingcap/tidb/util/memory", "path": "github.com/pingcap/tidb/util/memory",
"revision": "36bcf5db4ab610aff7287081da04e2893760a45a", "revision": "8ddeeea939747e2d4634beb792d9d3281c49129d",
"revisionTime": "2018-11-30T06:30:31Z" "revisionTime": "2018-12-03T15:37:39Z"
}, },
{ {
"checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=", "checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=",
...@@ -401,62 +401,62 @@ ...@@ -401,62 +401,62 @@
{ {
"checksumSHA1": "aKn1oKcY74N8TRLm3Ayt7Q4bbI4=", "checksumSHA1": "aKn1oKcY74N8TRLm3Ayt7Q4bbI4=",
"path": "vitess.io/vitess/go/bytes2", "path": "vitess.io/vitess/go/bytes2",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
}, },
{ {
"checksumSHA1": "JVCEN4UGRmg3TofIBdzZMZ3G0Ww=", "checksumSHA1": "JVCEN4UGRmg3TofIBdzZMZ3G0Ww=",
"path": "vitess.io/vitess/go/hack", "path": "vitess.io/vitess/go/hack",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
}, },
{ {
"checksumSHA1": "e1WJ7vCnVrlQQQlc6n/FewCDMso=", "checksumSHA1": "e1WJ7vCnVrlQQQlc6n/FewCDMso=",
"path": "vitess.io/vitess/go/sqltypes", "path": "vitess.io/vitess/go/sqltypes",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
}, },
{ {
"checksumSHA1": "ntFIQYkBS51G6y+FEkjFW40+HOU=", "checksumSHA1": "ntFIQYkBS51G6y+FEkjFW40+HOU=",
"path": "vitess.io/vitess/go/vt/log", "path": "vitess.io/vitess/go/vt/log",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
}, },
{ {
"checksumSHA1": "XozR8bmeSR5KTe/nlUJkpJY2HKI=", "checksumSHA1": "tPQFPwbMdjuX0qjNl4Zl8zc37JQ=",
"path": "vitess.io/vitess/go/vt/proto/query", "path": "vitess.io/vitess/go/vt/proto/query",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
}, },
{ {
"checksumSHA1": "OnWsUHLDKcO3spwH0jD55SvKD24=", "checksumSHA1": "o0tR/c7lgr0pLkxk7CdvjiNDAKU=",
"path": "vitess.io/vitess/go/vt/proto/topodata", "path": "vitess.io/vitess/go/vt/proto/topodata",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
}, },
{ {
"checksumSHA1": "sBAuZ/itMR8U8qbK4yLHxkP6Cpc=", "checksumSHA1": "77UojBqi0yyeQvR70j7C3kcKclQ=",
"path": "vitess.io/vitess/go/vt/proto/vtgate", "path": "vitess.io/vitess/go/vt/proto/vtgate",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
}, },
{ {
"checksumSHA1": "pLWM+SPGZs3k+IhjktE/cGUlpM0=", "checksumSHA1": "QpWGhoVDwM+8+sgYLI/YU+95iGU=",
"path": "vitess.io/vitess/go/vt/proto/vtrpc", "path": "vitess.io/vitess/go/vt/proto/vtrpc",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
}, },
{ {
"checksumSHA1": "2ZBC/pPjs13cocUf8PoMSvAO5u4=", "checksumSHA1": "CZ0WbR7TBTgF9HoY+aRxzOzVlSs=",
"path": "vitess.io/vitess/go/vt/sqlparser", "path": "vitess.io/vitess/go/vt/sqlparser",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
}, },
{ {
"checksumSHA1": "oF4XzuOzwvj1iduX/lYqNSyY/HM=", "checksumSHA1": "oF4XzuOzwvj1iduX/lYqNSyY/HM=",
"path": "vitess.io/vitess/go/vt/vterrors", "path": "vitess.io/vitess/go/vt/vterrors",
"revision": "2e2214a2660f9e52e6a1366470fc80849a9ef9ec", "revision": "63d2180c9442f64cec8f5cc6e5eb43947034e8ef",
"revisionTime": "2018-11-30T04:16:32Z" "revisionTime": "2018-12-03T23:57:47Z"
} }
], ],
"rootPath": "github.com/XiaoMi/soar" "rootPath": "github.com/XiaoMi/soar"
......
...@@ -488,12 +488,12 @@ func (SplitQueryRequest_Algorithm) EnumDescriptor() ([]byte, []int) { ...@@ -488,12 +488,12 @@ func (SplitQueryRequest_Algorithm) EnumDescriptor() ([]byte, []int) {
// Target describes what the client expects the tablet is. // Target describes what the client expects the tablet is.
// If the tablet does not match, an error is returned. // If the tablet does not match, an error is returned.
type Target struct { type Target struct {
Keyspace string `protobuf:"bytes,1,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
Shard string `protobuf:"bytes,2,opt,name=shard" json:"shard,omitempty"` Shard string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// cell is used for routing queries between vtgate and vttablets. It // cell is used for routing queries between vtgate and vttablets. It
// is not used when Target is part of the Session sent by the client. // is not used when Target is part of the Session sent by the client.
Cell string `protobuf:"bytes,4,opt,name=cell" json:"cell,omitempty"` Cell string `protobuf:"bytes,4,opt,name=cell,proto3" json:"cell,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -560,8 +560,8 @@ func (m *Target) GetCell() string { ...@@ -560,8 +560,8 @@ func (m *Target) GetCell() string {
// structure, which is not secure at all, because it is provided // structure, which is not secure at all, because it is provided
// by the Vitess client. // by the Vitess client.
type VTGateCallerID struct { type VTGateCallerID struct {
Username string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"` Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
Groups []string `protobuf:"bytes,2,rep,name=groups" json:"groups,omitempty"` Groups []string `protobuf:"bytes,2,rep,name=groups,proto3" json:"groups,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -611,13 +611,13 @@ func (m *VTGateCallerID) GetGroups() []string { ...@@ -611,13 +611,13 @@ func (m *VTGateCallerID) GetGroups() []string {
// is also sent with the replication streams from the binlog service. // is also sent with the replication streams from the binlog service.
type EventToken struct { type EventToken struct {
// timestamp is the MySQL timestamp of the statements. Seconds since Epoch. // timestamp is the MySQL timestamp of the statements. Seconds since Epoch.
Timestamp int64 `protobuf:"varint,1,opt,name=timestamp" json:"timestamp,omitempty"` Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
// The shard name that applied the statements. Note this is not set when // The shard name that applied the statements. Note this is not set when
// streaming from a vttablet. It is only used on the client -> vtgate link. // streaming from a vttablet. It is only used on the client -> vtgate link.
Shard string `protobuf:"bytes,2,opt,name=shard" json:"shard,omitempty"` Shard string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
// The position on the replication stream after this statement was applied. // The position on the replication stream after this statement was applied.
// It is not the transaction ID / GTID, but the position / GTIDSet. // It is not the transaction ID / GTID, but the position / GTIDSet.
Position string `protobuf:"bytes,3,opt,name=position" json:"position,omitempty"` Position string `protobuf:"bytes,3,opt,name=position,proto3" json:"position,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -670,7 +670,7 @@ func (m *EventToken) GetPosition() string { ...@@ -670,7 +670,7 @@ func (m *EventToken) GetPosition() string {
// Value represents a typed value. // Value represents a typed value.
type Value struct { type Value struct {
Type Type `protobuf:"varint,1,opt,name=type,enum=query.Type" json:"type,omitempty"` Type Type `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
...@@ -717,10 +717,10 @@ func (m *Value) GetValue() []byte { ...@@ -717,10 +717,10 @@ func (m *Value) GetValue() []byte {
// BindVariable represents a single bind variable in a Query. // BindVariable represents a single bind variable in a Query.
type BindVariable struct { type BindVariable struct {
Type Type `protobuf:"varint,1,opt,name=type,enum=query.Type" json:"type,omitempty"` Type Type `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
// values are set if type is TUPLE. // values are set if type is TUPLE.
Values []*Value `protobuf:"bytes,3,rep,name=values" json:"values,omitempty"` Values []*Value `protobuf:"bytes,3,rep,name=values,proto3" json:"values,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -774,10 +774,10 @@ func (m *BindVariable) GetValues() []*Value { ...@@ -774,10 +774,10 @@ func (m *BindVariable) GetValues() []*Value {
// BoundQuery is a query with its bind variables // BoundQuery is a query with its bind variables
type BoundQuery struct { type BoundQuery struct {
// sql is the SQL query to execute // sql is the SQL query to execute
Sql string `protobuf:"bytes,1,opt,name=sql" json:"sql,omitempty"` Sql string `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty"`
// bind_variables is a map of all bind variables to expand in the query. // bind_variables is a map of all bind variables to expand in the query.
// nil values are not allowed. Use NULL_TYPE to express a NULL value. // nil values are not allowed. Use NULL_TYPE to express a NULL value.
BindVariables map[string]*BindVariable `protobuf:"bytes,2,rep,name=bind_variables,json=bindVariables" json:"bind_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` BindVariables map[string]*BindVariable `protobuf:"bytes,2,rep,name=bind_variables,json=bindVariables,proto3" json:"bind_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -824,19 +824,19 @@ func (m *BoundQuery) GetBindVariables() map[string]*BindVariable { ...@@ -824,19 +824,19 @@ func (m *BoundQuery) GetBindVariables() map[string]*BindVariable {
// ExecuteOptions is passed around for all Execute calls. // ExecuteOptions is passed around for all Execute calls.
type ExecuteOptions struct { type ExecuteOptions struct {
// If set, we will try to include an EventToken with the responses. // If set, we will try to include an EventToken with the responses.
IncludeEventToken bool `protobuf:"varint,2,opt,name=include_event_token,json=includeEventToken" json:"include_event_token,omitempty"` IncludeEventToken bool `protobuf:"varint,2,opt,name=include_event_token,json=includeEventToken,proto3" json:"include_event_token,omitempty"`
// If set, the fresher field may be set as a result comparison to this token. // If set, the fresher field may be set as a result comparison to this token.
// This is a shortcut so the application doesn't need to care about // This is a shortcut so the application doesn't need to care about
// comparing EventTokens. // comparing EventTokens.
CompareEventToken *EventToken `protobuf:"bytes,3,opt,name=compare_event_token,json=compareEventToken" json:"compare_event_token,omitempty"` CompareEventToken *EventToken `protobuf:"bytes,3,opt,name=compare_event_token,json=compareEventToken,proto3" json:"compare_event_token,omitempty"`
// Controls what fields are returned in Field message responses from mysql, i.e. // Controls what fields are returned in Field message responses from mysql, i.e.
// field name, table name, etc. This is an optimization for high-QPS queries where // field name, table name, etc. This is an optimization for high-QPS queries where
// the client knows what it's getting // the client knows what it's getting
IncludedFields ExecuteOptions_IncludedFields `protobuf:"varint,4,opt,name=included_fields,json=includedFields,enum=query.ExecuteOptions_IncludedFields" json:"included_fields,omitempty"` IncludedFields ExecuteOptions_IncludedFields `protobuf:"varint,4,opt,name=included_fields,json=includedFields,proto3,enum=query.ExecuteOptions_IncludedFields" json:"included_fields,omitempty"`
// client_rows_found specifies if rows_affected should return // client_rows_found specifies if rows_affected should return
// rows found instead of rows affected. Behavior is defined // rows found instead of rows affected. Behavior is defined
// by MySQL's CLIENT_FOUND_ROWS flag. // by MySQL's CLIENT_FOUND_ROWS flag.
ClientFoundRows bool `protobuf:"varint,5,opt,name=client_found_rows,json=clientFoundRows" json:"client_found_rows,omitempty"` ClientFoundRows bool `protobuf:"varint,5,opt,name=client_found_rows,json=clientFoundRows,proto3" json:"client_found_rows,omitempty"`
// workload specifies the type of workload: // workload specifies the type of workload:
// OLTP: DMLs allowed, results have row count limit, and // OLTP: DMLs allowed, results have row count limit, and
// query timeouts are shorter. // query timeouts are shorter.
...@@ -844,14 +844,14 @@ type ExecuteOptions struct { ...@@ -844,14 +844,14 @@ type ExecuteOptions struct {
// can be as high as desired. // can be as high as desired.
// DBA: no limit on rowcount or timeout, all queries allowed // DBA: no limit on rowcount or timeout, all queries allowed
// but intended for long DMLs and DDLs. // but intended for long DMLs and DDLs.
Workload ExecuteOptions_Workload `protobuf:"varint,6,opt,name=workload,enum=query.ExecuteOptions_Workload" json:"workload,omitempty"` Workload ExecuteOptions_Workload `protobuf:"varint,6,opt,name=workload,proto3,enum=query.ExecuteOptions_Workload" json:"workload,omitempty"`
// sql_select_limit sets an implicit limit on all select statements. Since // sql_select_limit sets an implicit limit on all select statements. Since
// vitess also sets a rowcount limit on queries, the smallest value wins. // vitess also sets a rowcount limit on queries, the smallest value wins.
SqlSelectLimit int64 `protobuf:"varint,8,opt,name=sql_select_limit,json=sqlSelectLimit" json:"sql_select_limit,omitempty"` SqlSelectLimit int64 `protobuf:"varint,8,opt,name=sql_select_limit,json=sqlSelectLimit,proto3" json:"sql_select_limit,omitempty"`
TransactionIsolation ExecuteOptions_TransactionIsolation `protobuf:"varint,9,opt,name=transaction_isolation,json=transactionIsolation,enum=query.ExecuteOptions_TransactionIsolation" json:"transaction_isolation,omitempty"` TransactionIsolation ExecuteOptions_TransactionIsolation `protobuf:"varint,9,opt,name=transaction_isolation,json=transactionIsolation,proto3,enum=query.ExecuteOptions_TransactionIsolation" json:"transaction_isolation,omitempty"`
// skip_query_plan_cache specifies if the query plan shoud be cached by vitess. // skip_query_plan_cache specifies if the query plan shoud be cached by vitess.
// By default all query plans are cached. // By default all query plans are cached.
SkipQueryPlanCache bool `protobuf:"varint,10,opt,name=skip_query_plan_cache,json=skipQueryPlanCache" json:"skip_query_plan_cache,omitempty"` SkipQueryPlanCache bool `protobuf:"varint,10,opt,name=skip_query_plan_cache,json=skipQueryPlanCache,proto3" json:"skip_query_plan_cache,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -940,24 +940,24 @@ func (m *ExecuteOptions) GetSkipQueryPlanCache() bool { ...@@ -940,24 +940,24 @@ func (m *ExecuteOptions) GetSkipQueryPlanCache() bool {
// Field describes a single column returned by a query // Field describes a single column returned by a query
type Field struct { type Field struct {
// name of the field as returned by mysql C API // name of the field as returned by mysql C API
Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
// vitess-defined type. Conversion function is in sqltypes package. // vitess-defined type. Conversion function is in sqltypes package.
Type Type `protobuf:"varint,2,opt,name=type,enum=query.Type" json:"type,omitempty"` Type Type `protobuf:"varint,2,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
// Remaining fields from mysql C API. // Remaining fields from mysql C API.
// These fields are only populated when ExecuteOptions.included_fields // These fields are only populated when ExecuteOptions.included_fields
// is set to IncludedFields.ALL. // is set to IncludedFields.ALL.
Table string `protobuf:"bytes,3,opt,name=table" json:"table,omitempty"` Table string `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`
OrgTable string `protobuf:"bytes,4,opt,name=org_table,json=orgTable" json:"org_table,omitempty"` OrgTable string `protobuf:"bytes,4,opt,name=org_table,json=orgTable,proto3" json:"org_table,omitempty"`
Database string `protobuf:"bytes,5,opt,name=database" json:"database,omitempty"` Database string `protobuf:"bytes,5,opt,name=database,proto3" json:"database,omitempty"`
OrgName string `protobuf:"bytes,6,opt,name=org_name,json=orgName" json:"org_name,omitempty"` OrgName string `protobuf:"bytes,6,opt,name=org_name,json=orgName,proto3" json:"org_name,omitempty"`
// column_length is really a uint32. All 32 bits can be used. // column_length is really a uint32. All 32 bits can be used.
ColumnLength uint32 `protobuf:"varint,7,opt,name=column_length,json=columnLength" json:"column_length,omitempty"` ColumnLength uint32 `protobuf:"varint,7,opt,name=column_length,json=columnLength,proto3" json:"column_length,omitempty"`
// charset is actually a uint16. Only the lower 16 bits are used. // charset is actually a uint16. Only the lower 16 bits are used.
Charset uint32 `protobuf:"varint,8,opt,name=charset" json:"charset,omitempty"` Charset uint32 `protobuf:"varint,8,opt,name=charset,proto3" json:"charset,omitempty"`
// decimals is actualy a uint8. Only the lower 8 bits are used. // decimals is actualy a uint8. Only the lower 8 bits are used.
Decimals uint32 `protobuf:"varint,9,opt,name=decimals" json:"decimals,omitempty"` Decimals uint32 `protobuf:"varint,9,opt,name=decimals,proto3" json:"decimals,omitempty"`
// flags is actually a uint16. Only the lower 16 bits are used. // flags is actually a uint16. Only the lower 16 bits are used.
Flags uint32 `protobuf:"varint,10,opt,name=flags" json:"flags,omitempty"` Flags uint32 `protobuf:"varint,10,opt,name=flags,proto3" json:"flags,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1063,7 +1063,7 @@ type Row struct { ...@@ -1063,7 +1063,7 @@ type Row struct {
// A length of -1 means that the field is NULL. While // A length of -1 means that the field is NULL. While
// reading values, you have to accummulate the length // reading values, you have to accummulate the length
// to know the offset where the next value begins in values. // to know the offset where the next value begins in values.
Lengths []int64 `protobuf:"zigzag64,1,rep,packed,name=lengths" json:"lengths,omitempty"` Lengths []int64 `protobuf:"zigzag64,1,rep,packed,name=lengths,proto3" json:"lengths,omitempty"`
// values contains a concatenation of all values in the row. // values contains a concatenation of all values in the row.
Values []byte `protobuf:"bytes,2,opt,name=values,proto3" json:"values,omitempty"` Values []byte `protobuf:"bytes,2,opt,name=values,proto3" json:"values,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
...@@ -1114,10 +1114,10 @@ func (m *Row) GetValues() []byte { ...@@ -1114,10 +1114,10 @@ func (m *Row) GetValues() []byte {
type ResultExtras struct { type ResultExtras struct {
// event_token is populated if the include_event_token flag is set // event_token is populated if the include_event_token flag is set
// in ExecuteOptions. // in ExecuteOptions.
EventToken *EventToken `protobuf:"bytes,1,opt,name=event_token,json=eventToken" json:"event_token,omitempty"` EventToken *EventToken `protobuf:"bytes,1,opt,name=event_token,json=eventToken,proto3" json:"event_token,omitempty"`
// If set, it means the data returned with this result is fresher // If set, it means the data returned with this result is fresher
// than the compare_token passed in the ExecuteOptions. // than the compare_token passed in the ExecuteOptions.
Fresher bool `protobuf:"varint,2,opt,name=fresher" json:"fresher,omitempty"` Fresher bool `protobuf:"varint,2,opt,name=fresher,proto3" json:"fresher,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1171,11 +1171,11 @@ func (m *ResultExtras) GetFresher() bool { ...@@ -1171,11 +1171,11 @@ func (m *ResultExtras) GetFresher() bool {
// len(QueryResult[0].fields) is always equal to len(row) (for each // len(QueryResult[0].fields) is always equal to len(row) (for each
// row in rows for each QueryResult in QueryResult[1:]). // row in rows for each QueryResult in QueryResult[1:]).
type QueryResult struct { type QueryResult struct {
Fields []*Field `protobuf:"bytes,1,rep,name=fields" json:"fields,omitempty"` Fields []*Field `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
RowsAffected uint64 `protobuf:"varint,2,opt,name=rows_affected,json=rowsAffected" json:"rows_affected,omitempty"` RowsAffected uint64 `protobuf:"varint,2,opt,name=rows_affected,json=rowsAffected,proto3" json:"rows_affected,omitempty"`
InsertId uint64 `protobuf:"varint,3,opt,name=insert_id,json=insertId" json:"insert_id,omitempty"` InsertId uint64 `protobuf:"varint,3,opt,name=insert_id,json=insertId,proto3" json:"insert_id,omitempty"`
Rows []*Row `protobuf:"bytes,4,rep,name=rows" json:"rows,omitempty"` Rows []*Row `protobuf:"bytes,4,rep,name=rows,proto3" json:"rows,omitempty"`
Extras *ResultExtras `protobuf:"bytes,5,opt,name=extras" json:"extras,omitempty"` Extras *ResultExtras `protobuf:"bytes,5,opt,name=extras,proto3" json:"extras,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1243,8 +1243,8 @@ func (m *QueryResult) GetExtras() *ResultExtras { ...@@ -1243,8 +1243,8 @@ func (m *QueryResult) GetExtras() *ResultExtras {
// QueryWarning is used to convey out of band query execution warnings // QueryWarning is used to convey out of band query execution warnings
// by storing in the vtgate.Session // by storing in the vtgate.Session
type QueryWarning struct { type QueryWarning struct {
Code uint32 `protobuf:"varint,1,opt,name=code" json:"code,omitempty"` Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"` Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1293,9 +1293,9 @@ func (m *QueryWarning) GetMessage() string { ...@@ -1293,9 +1293,9 @@ func (m *QueryWarning) GetMessage() string {
// Update Stream calls. // Update Stream calls.
type StreamEvent struct { type StreamEvent struct {
// The statements in this transaction. // The statements in this transaction.
Statements []*StreamEvent_Statement `protobuf:"bytes,1,rep,name=statements" json:"statements,omitempty"` Statements []*StreamEvent_Statement `protobuf:"bytes,1,rep,name=statements,proto3" json:"statements,omitempty"`
// The Event Token for this event. // The Event Token for this event.
EventToken *EventToken `protobuf:"bytes,2,opt,name=event_token,json=eventToken" json:"event_token,omitempty"` EventToken *EventToken `protobuf:"bytes,2,opt,name=event_token,json=eventToken,proto3" json:"event_token,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1341,11 +1341,11 @@ func (m *StreamEvent) GetEventToken() *EventToken { ...@@ -1341,11 +1341,11 @@ func (m *StreamEvent) GetEventToken() *EventToken {
// One individual Statement in a transaction. // One individual Statement in a transaction.
type StreamEvent_Statement struct { type StreamEvent_Statement struct {
Category StreamEvent_Statement_Category `protobuf:"varint,1,opt,name=category,enum=query.StreamEvent_Statement_Category" json:"category,omitempty"` Category StreamEvent_Statement_Category `protobuf:"varint,1,opt,name=category,proto3,enum=query.StreamEvent_Statement_Category" json:"category,omitempty"`
// table_name, primary_key_fields and primary_key_values are set for DML. // table_name, primary_key_fields and primary_key_values are set for DML.
TableName string `protobuf:"bytes,2,opt,name=table_name,json=tableName" json:"table_name,omitempty"` TableName string `protobuf:"bytes,2,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
PrimaryKeyFields []*Field `protobuf:"bytes,3,rep,name=primary_key_fields,json=primaryKeyFields" json:"primary_key_fields,omitempty"` PrimaryKeyFields []*Field `protobuf:"bytes,3,rep,name=primary_key_fields,json=primaryKeyFields,proto3" json:"primary_key_fields,omitempty"`
PrimaryKeyValues []*Row `protobuf:"bytes,4,rep,name=primary_key_values,json=primaryKeyValues" json:"primary_key_values,omitempty"` PrimaryKeyValues []*Row `protobuf:"bytes,4,rep,name=primary_key_values,json=primaryKeyValues,proto3" json:"primary_key_values,omitempty"`
// sql is set for all queries. // sql is set for all queries.
// FIXME(alainjobart) we may not need it for DMLs. // FIXME(alainjobart) we may not need it for DMLs.
Sql []byte `protobuf:"bytes,5,opt,name=sql,proto3" json:"sql,omitempty"` Sql []byte `protobuf:"bytes,5,opt,name=sql,proto3" json:"sql,omitempty"`
...@@ -1415,12 +1415,12 @@ func (m *StreamEvent_Statement) GetSql() []byte { ...@@ -1415,12 +1415,12 @@ func (m *StreamEvent_Statement) GetSql() []byte {
// ExecuteRequest is the payload to Execute // ExecuteRequest is the payload to Execute
type ExecuteRequest struct { type ExecuteRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Query *BoundQuery `protobuf:"bytes,4,opt,name=query" json:"query,omitempty"` Query *BoundQuery `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
TransactionId int64 `protobuf:"varint,5,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,5,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
Options *ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"` Options *ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1494,7 +1494,7 @@ func (m *ExecuteRequest) GetOptions() *ExecuteOptions { ...@@ -1494,7 +1494,7 @@ func (m *ExecuteRequest) GetOptions() *ExecuteOptions {
// ExecuteResponse is the returned value from Execute // ExecuteResponse is the returned value from Execute
type ExecuteResponse struct { type ExecuteResponse struct {
Result *QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1536,9 +1536,9 @@ func (m *ExecuteResponse) GetResult() *QueryResult { ...@@ -1536,9 +1536,9 @@ func (m *ExecuteResponse) GetResult() *QueryResult {
// TODO: To be used in ExecuteBatchResponse and BeginExecuteBatchResponse. // TODO: To be used in ExecuteBatchResponse and BeginExecuteBatchResponse.
type ResultWithError struct { type ResultWithError struct {
// error contains an query level error, only set if result is unset. // error contains an query level error, only set if result is unset.
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
// result contains the query result, only set if error is unset. // result contains the query result, only set if error is unset.
Result *QueryResult `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"` Result *QueryResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1584,13 +1584,13 @@ func (m *ResultWithError) GetResult() *QueryResult { ...@@ -1584,13 +1584,13 @@ func (m *ResultWithError) GetResult() *QueryResult {
// ExecuteBatchRequest is the payload to ExecuteBatch // ExecuteBatchRequest is the payload to ExecuteBatch
type ExecuteBatchRequest struct { type ExecuteBatchRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Queries []*BoundQuery `protobuf:"bytes,4,rep,name=queries" json:"queries,omitempty"` Queries []*BoundQuery `protobuf:"bytes,4,rep,name=queries,proto3" json:"queries,omitempty"`
AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"` AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
TransactionId int64 `protobuf:"varint,6,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,6,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
Options *ExecuteOptions `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"` Options *ExecuteOptions `protobuf:"bytes,7,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1671,7 +1671,7 @@ func (m *ExecuteBatchRequest) GetOptions() *ExecuteOptions { ...@@ -1671,7 +1671,7 @@ func (m *ExecuteBatchRequest) GetOptions() *ExecuteOptions {
// ExecuteBatchResponse is the returned value from ExecuteBatch // ExecuteBatchResponse is the returned value from ExecuteBatch
type ExecuteBatchResponse struct { type ExecuteBatchResponse struct {
Results []*QueryResult `protobuf:"bytes,1,rep,name=results" json:"results,omitempty"` Results []*QueryResult `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1710,11 +1710,11 @@ func (m *ExecuteBatchResponse) GetResults() []*QueryResult { ...@@ -1710,11 +1710,11 @@ func (m *ExecuteBatchResponse) GetResults() []*QueryResult {
// StreamExecuteRequest is the payload to StreamExecute // StreamExecuteRequest is the payload to StreamExecute
type StreamExecuteRequest struct { type StreamExecuteRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Query *BoundQuery `protobuf:"bytes,4,opt,name=query" json:"query,omitempty"` Query *BoundQuery `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
Options *ExecuteOptions `protobuf:"bytes,5,opt,name=options" json:"options,omitempty"` Options *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1781,7 +1781,7 @@ func (m *StreamExecuteRequest) GetOptions() *ExecuteOptions { ...@@ -1781,7 +1781,7 @@ func (m *StreamExecuteRequest) GetOptions() *ExecuteOptions {
// StreamExecuteResponse is the returned value from StreamExecute // StreamExecuteResponse is the returned value from StreamExecute
type StreamExecuteResponse struct { type StreamExecuteResponse struct {
Result *QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1820,10 +1820,10 @@ func (m *StreamExecuteResponse) GetResult() *QueryResult { ...@@ -1820,10 +1820,10 @@ func (m *StreamExecuteResponse) GetResult() *QueryResult {
// BeginRequest is the payload to Begin // BeginRequest is the payload to Begin
type BeginRequest struct { type BeginRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Options *ExecuteOptions `protobuf:"bytes,4,opt,name=options" json:"options,omitempty"` Options *ExecuteOptions `protobuf:"bytes,4,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1883,7 +1883,7 @@ func (m *BeginRequest) GetOptions() *ExecuteOptions { ...@@ -1883,7 +1883,7 @@ func (m *BeginRequest) GetOptions() *ExecuteOptions {
// BeginResponse is the returned value from Begin // BeginResponse is the returned value from Begin
type BeginResponse struct { type BeginResponse struct {
TransactionId int64 `protobuf:"varint,1,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,1,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1922,10 +1922,10 @@ func (m *BeginResponse) GetTransactionId() int64 { ...@@ -1922,10 +1922,10 @@ func (m *BeginResponse) GetTransactionId() int64 {
// CommitRequest is the payload to Commit // CommitRequest is the payload to Commit
type CommitRequest struct { type CommitRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2016,10 +2016,10 @@ var xxx_messageInfo_CommitResponse proto.InternalMessageInfo ...@@ -2016,10 +2016,10 @@ var xxx_messageInfo_CommitResponse proto.InternalMessageInfo
// RollbackRequest is the payload to Rollback // RollbackRequest is the payload to Rollback
type RollbackRequest struct { type RollbackRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2110,11 +2110,11 @@ var xxx_messageInfo_RollbackResponse proto.InternalMessageInfo ...@@ -2110,11 +2110,11 @@ var xxx_messageInfo_RollbackResponse proto.InternalMessageInfo
// PrepareRequest is the payload to Prepare // PrepareRequest is the payload to Prepare
type PrepareRequest struct { type PrepareRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
Dtid string `protobuf:"bytes,5,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2212,10 +2212,10 @@ var xxx_messageInfo_PrepareResponse proto.InternalMessageInfo ...@@ -2212,10 +2212,10 @@ var xxx_messageInfo_PrepareResponse proto.InternalMessageInfo
// CommitPreparedRequest is the payload to CommitPrepared // CommitPreparedRequest is the payload to CommitPrepared
type CommitPreparedRequest struct { type CommitPreparedRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Dtid string `protobuf:"bytes,4,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2306,11 +2306,11 @@ var xxx_messageInfo_CommitPreparedResponse proto.InternalMessageInfo ...@@ -2306,11 +2306,11 @@ var xxx_messageInfo_CommitPreparedResponse proto.InternalMessageInfo
// RollbackPreparedRequest is the payload to RollbackPrepared // RollbackPreparedRequest is the payload to RollbackPrepared
type RollbackPreparedRequest struct { type RollbackPreparedRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
Dtid string `protobuf:"bytes,5,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2408,11 +2408,11 @@ var xxx_messageInfo_RollbackPreparedResponse proto.InternalMessageInfo ...@@ -2408,11 +2408,11 @@ var xxx_messageInfo_RollbackPreparedResponse proto.InternalMessageInfo
// CreateTransactionRequest is the payload to CreateTransaction // CreateTransactionRequest is the payload to CreateTransaction
type CreateTransactionRequest struct { type CreateTransactionRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Dtid string `protobuf:"bytes,4,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
Participants []*Target `protobuf:"bytes,5,rep,name=participants" json:"participants,omitempty"` Participants []*Target `protobuf:"bytes,5,rep,name=participants,proto3" json:"participants,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2510,11 +2510,11 @@ var xxx_messageInfo_CreateTransactionResponse proto.InternalMessageInfo ...@@ -2510,11 +2510,11 @@ var xxx_messageInfo_CreateTransactionResponse proto.InternalMessageInfo
// StartCommitRequest is the payload to StartCommit // StartCommitRequest is the payload to StartCommit
type StartCommitRequest struct { type StartCommitRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
Dtid string `protobuf:"bytes,5,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2612,11 +2612,11 @@ var xxx_messageInfo_StartCommitResponse proto.InternalMessageInfo ...@@ -2612,11 +2612,11 @@ var xxx_messageInfo_StartCommitResponse proto.InternalMessageInfo
// SetRollbackRequest is the payload to SetRollback // SetRollbackRequest is the payload to SetRollback
type SetRollbackRequest struct { type SetRollbackRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
Dtid string `protobuf:"bytes,5,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2714,10 +2714,10 @@ var xxx_messageInfo_SetRollbackResponse proto.InternalMessageInfo ...@@ -2714,10 +2714,10 @@ var xxx_messageInfo_SetRollbackResponse proto.InternalMessageInfo
// ConcludeTransactionRequest is the payload to ConcludeTransaction // ConcludeTransactionRequest is the payload to ConcludeTransaction
type ConcludeTransactionRequest struct { type ConcludeTransactionRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Dtid string `protobuf:"bytes,4,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2808,10 +2808,10 @@ var xxx_messageInfo_ConcludeTransactionResponse proto.InternalMessageInfo ...@@ -2808,10 +2808,10 @@ var xxx_messageInfo_ConcludeTransactionResponse proto.InternalMessageInfo
// ReadTransactionRequest is the payload to ReadTransaction // ReadTransactionRequest is the payload to ReadTransaction
type ReadTransactionRequest struct { type ReadTransactionRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Dtid string `protobuf:"bytes,4,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2871,7 +2871,7 @@ func (m *ReadTransactionRequest) GetDtid() string { ...@@ -2871,7 +2871,7 @@ func (m *ReadTransactionRequest) GetDtid() string {
// ReadTransactionResponse is the returned value from ReadTransaction // ReadTransactionResponse is the returned value from ReadTransaction
type ReadTransactionResponse struct { type ReadTransactionResponse struct {
Metadata *TransactionMetadata `protobuf:"bytes,1,opt,name=metadata" json:"metadata,omitempty"` Metadata *TransactionMetadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2910,11 +2910,11 @@ func (m *ReadTransactionResponse) GetMetadata() *TransactionMetadata { ...@@ -2910,11 +2910,11 @@ func (m *ReadTransactionResponse) GetMetadata() *TransactionMetadata {
// BeginExecuteRequest is the payload to BeginExecute // BeginExecuteRequest is the payload to BeginExecute
type BeginExecuteRequest struct { type BeginExecuteRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Query *BoundQuery `protobuf:"bytes,4,opt,name=query" json:"query,omitempty"` Query *BoundQuery `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
Options *ExecuteOptions `protobuf:"bytes,5,opt,name=options" json:"options,omitempty"` Options *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2984,10 +2984,10 @@ type BeginExecuteResponse struct { ...@@ -2984,10 +2984,10 @@ type BeginExecuteResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// transaction_id may be set, even when an error is returned, if the begin // transaction_id may be set, even when an error is returned, if the begin
// worked but the execute failed. // worked but the execute failed.
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
Result *QueryResult `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"` Result *QueryResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
// transaction_id might be non-zero even if an error is present. // transaction_id might be non-zero even if an error is present.
TransactionId int64 `protobuf:"varint,3,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,3,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3040,12 +3040,12 @@ func (m *BeginExecuteResponse) GetTransactionId() int64 { ...@@ -3040,12 +3040,12 @@ func (m *BeginExecuteResponse) GetTransactionId() int64 {
// BeginExecuteBatchRequest is the payload to BeginExecuteBatch // BeginExecuteBatchRequest is the payload to BeginExecuteBatch
type BeginExecuteBatchRequest struct { type BeginExecuteBatchRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Queries []*BoundQuery `protobuf:"bytes,4,rep,name=queries" json:"queries,omitempty"` Queries []*BoundQuery `protobuf:"bytes,4,rep,name=queries,proto3" json:"queries,omitempty"`
AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"` AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
Options *ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"` Options *ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3122,10 +3122,10 @@ type BeginExecuteBatchResponse struct { ...@@ -3122,10 +3122,10 @@ type BeginExecuteBatchResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// transaction_id may be set, even when an error is returned, if the begin // transaction_id may be set, even when an error is returned, if the begin
// worked but the execute failed. // worked but the execute failed.
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
Results []*QueryResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"` Results []*QueryResult `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
// transaction_id might be non-zero even if an error is present. // transaction_id might be non-zero even if an error is present.
TransactionId int64 `protobuf:"varint,3,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,3,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3178,11 +3178,11 @@ func (m *BeginExecuteBatchResponse) GetTransactionId() int64 { ...@@ -3178,11 +3178,11 @@ func (m *BeginExecuteBatchResponse) GetTransactionId() int64 {
// MessageStreamRequest is the request payload for MessageStream. // MessageStreamRequest is the request payload for MessageStream.
type MessageStreamRequest struct { type MessageStreamRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
// name is the message table name. // name is the message table name.
Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"` Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3242,7 +3242,7 @@ func (m *MessageStreamRequest) GetName() string { ...@@ -3242,7 +3242,7 @@ func (m *MessageStreamRequest) GetName() string {
// MessageStreamResponse is a response for MessageStream. // MessageStreamResponse is a response for MessageStream.
type MessageStreamResponse struct { type MessageStreamResponse struct {
Result *QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3281,12 +3281,12 @@ func (m *MessageStreamResponse) GetResult() *QueryResult { ...@@ -3281,12 +3281,12 @@ func (m *MessageStreamResponse) GetResult() *QueryResult {
// MessageAckRequest is the request payload for MessageAck. // MessageAckRequest is the request payload for MessageAck.
type MessageAckRequest struct { type MessageAckRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
// name is the message table name. // name is the message table name.
Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"` Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
Ids []*Value `protobuf:"bytes,5,rep,name=ids" json:"ids,omitempty"` Ids []*Value `protobuf:"bytes,5,rep,name=ids,proto3" json:"ids,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3356,7 +3356,7 @@ type MessageAckResponse struct { ...@@ -3356,7 +3356,7 @@ type MessageAckResponse struct {
// result contains the result of the ack operation. // result contains the result of the ack operation.
// Since this acts like a DML, only // Since this acts like a DML, only
// RowsAffected is returned in the result. // RowsAffected is returned in the result.
Result *QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3396,15 +3396,15 @@ func (m *MessageAckResponse) GetResult() *QueryResult { ...@@ -3396,15 +3396,15 @@ func (m *MessageAckResponse) GetResult() *QueryResult {
// SplitQueryRequest is the payload for SplitQuery sent by VTGate to a VTTablet. // SplitQueryRequest is the payload for SplitQuery sent by VTGate to a VTTablet.
// See vtgate.SplitQueryRequest for more details. // See vtgate.SplitQueryRequest for more details.
type SplitQueryRequest struct { type SplitQueryRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
Query *BoundQuery `protobuf:"bytes,4,opt,name=query" json:"query,omitempty"` Query *BoundQuery `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
SplitColumn []string `protobuf:"bytes,5,rep,name=split_column,json=splitColumn" json:"split_column,omitempty"` SplitColumn []string `protobuf:"bytes,5,rep,name=split_column,json=splitColumn,proto3" json:"split_column,omitempty"`
// Exactly one of the following must be nonzero. // Exactly one of the following must be nonzero.
SplitCount int64 `protobuf:"varint,6,opt,name=split_count,json=splitCount" json:"split_count,omitempty"` SplitCount int64 `protobuf:"varint,6,opt,name=split_count,json=splitCount,proto3" json:"split_count,omitempty"`
NumRowsPerQueryPart int64 `protobuf:"varint,8,opt,name=num_rows_per_query_part,json=numRowsPerQueryPart" json:"num_rows_per_query_part,omitempty"` NumRowsPerQueryPart int64 `protobuf:"varint,8,opt,name=num_rows_per_query_part,json=numRowsPerQueryPart,proto3" json:"num_rows_per_query_part,omitempty"`
Algorithm SplitQueryRequest_Algorithm `protobuf:"varint,9,opt,name=algorithm,enum=query.SplitQueryRequest_Algorithm" json:"algorithm,omitempty"` Algorithm SplitQueryRequest_Algorithm `protobuf:"varint,9,opt,name=algorithm,proto3,enum=query.SplitQueryRequest_Algorithm" json:"algorithm,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3493,9 +3493,9 @@ func (m *SplitQueryRequest) GetAlgorithm() SplitQueryRequest_Algorithm { ...@@ -3493,9 +3493,9 @@ func (m *SplitQueryRequest) GetAlgorithm() SplitQueryRequest_Algorithm {
// QuerySplit represents one query to execute on the tablet // QuerySplit represents one query to execute on the tablet
type QuerySplit struct { type QuerySplit struct {
// query is the query to execute // query is the query to execute
Query *BoundQuery `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"` Query *BoundQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
// row_count is the approximate row count the query will return // row_count is the approximate row count the query will return
RowCount int64 `protobuf:"varint,2,opt,name=row_count,json=rowCount" json:"row_count,omitempty"` RowCount int64 `protobuf:"varint,2,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3542,7 +3542,7 @@ func (m *QuerySplit) GetRowCount() int64 { ...@@ -3542,7 +3542,7 @@ func (m *QuerySplit) GetRowCount() int64 {
// SplitQueryResponse is returned by SplitQuery and represents all the queries // SplitQueryResponse is returned by SplitQuery and represents all the queries
// to execute in order to get the entire data set. // to execute in order to get the entire data set.
type SplitQueryResponse struct { type SplitQueryResponse struct {
Queries []*QuerySplit `protobuf:"bytes,1,rep,name=queries" json:"queries,omitempty"` Queries []*QuerySplit `protobuf:"bytes,1,rep,name=queries,proto3" json:"queries,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3616,30 +3616,30 @@ type RealtimeStats struct { ...@@ -3616,30 +3616,30 @@ type RealtimeStats struct {
// health_error is the last error we got from health check, // health_error is the last error we got from health check,
// or empty is the server is healthy. This is used for subset selection, // or empty is the server is healthy. This is used for subset selection,
// we do not send queries to servers that are not healthy. // we do not send queries to servers that are not healthy.
HealthError string `protobuf:"bytes,1,opt,name=health_error,json=healthError" json:"health_error,omitempty"` HealthError string `protobuf:"bytes,1,opt,name=health_error,json=healthError,proto3" json:"health_error,omitempty"`
// seconds_behind_master is populated for slaves only. It indicates // seconds_behind_master is populated for slaves only. It indicates
// how far behind on (MySQL) replication a slave currently is. It is used // how far behind on (MySQL) replication a slave currently is. It is used
// by clients for subset selection (so we don't try to send traffic // by clients for subset selection (so we don't try to send traffic
// to tablets that are too far behind). // to tablets that are too far behind).
// NOTE: This field must not be evaluated if "health_error" is not empty. // NOTE: This field must not be evaluated if "health_error" is not empty.
// TODO(mberlin): Let's switch it to int64 instead? // TODO(mberlin): Let's switch it to int64 instead?
SecondsBehindMaster uint32 `protobuf:"varint,2,opt,name=seconds_behind_master,json=secondsBehindMaster" json:"seconds_behind_master,omitempty"` SecondsBehindMaster uint32 `protobuf:"varint,2,opt,name=seconds_behind_master,json=secondsBehindMaster,proto3" json:"seconds_behind_master,omitempty"`
// bin_log_players_count is the number of currently running binlog players. // bin_log_players_count is the number of currently running binlog players.
// if the value is 0, it means that filtered replication is currently not // if the value is 0, it means that filtered replication is currently not
// running on the tablet. If >0, filtered replication is running. // running on the tablet. If >0, filtered replication is running.
// NOTE: This field must not be evaluated if "health_error" is not empty. // NOTE: This field must not be evaluated if "health_error" is not empty.
BinlogPlayersCount int32 `protobuf:"varint,3,opt,name=binlog_players_count,json=binlogPlayersCount" json:"binlog_players_count,omitempty"` BinlogPlayersCount int32 `protobuf:"varint,3,opt,name=binlog_players_count,json=binlogPlayersCount,proto3" json:"binlog_players_count,omitempty"`
// seconds_behind_master_filtered_replication is populated for the receiving // seconds_behind_master_filtered_replication is populated for the receiving
// master of an ongoing filtered replication only. // master of an ongoing filtered replication only.
// It specifies how far the receiving master lags behind the sending master. // It specifies how far the receiving master lags behind the sending master.
// NOTE: This field must not be evaluated if "health_error" is not empty. // NOTE: This field must not be evaluated if "health_error" is not empty.
// NOTE: This field must not be evaluated if "bin_log_players_count" is 0. // NOTE: This field must not be evaluated if "bin_log_players_count" is 0.
SecondsBehindMasterFilteredReplication int64 `protobuf:"varint,4,opt,name=seconds_behind_master_filtered_replication,json=secondsBehindMasterFilteredReplication" json:"seconds_behind_master_filtered_replication,omitempty"` SecondsBehindMasterFilteredReplication int64 `protobuf:"varint,4,opt,name=seconds_behind_master_filtered_replication,json=secondsBehindMasterFilteredReplication,proto3" json:"seconds_behind_master_filtered_replication,omitempty"`
// cpu_usage is used for load-based balancing // cpu_usage is used for load-based balancing
CpuUsage float64 `protobuf:"fixed64,5,opt,name=cpu_usage,json=cpuUsage" json:"cpu_usage,omitempty"` CpuUsage float64 `protobuf:"fixed64,5,opt,name=cpu_usage,json=cpuUsage,proto3" json:"cpu_usage,omitempty"`
// qps is the average QPS (queries per second) rate in the last XX seconds // qps is the average QPS (queries per second) rate in the last XX seconds
// where XX is usually 60 (See query_service_stats.go). // where XX is usually 60 (See query_service_stats.go).
Qps float64 `protobuf:"fixed64,6,opt,name=qps" json:"qps,omitempty"` Qps float64 `protobuf:"fixed64,6,opt,name=qps,proto3" json:"qps,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3717,17 +3717,17 @@ func (m *RealtimeStats) GetQps() float64 { ...@@ -3717,17 +3717,17 @@ func (m *RealtimeStats) GetQps() float64 {
// layer. // layer.
type AggregateStats struct { type AggregateStats struct {
// healthy_tablet_count is the number of healthy tablets in the group. // healthy_tablet_count is the number of healthy tablets in the group.
HealthyTabletCount int32 `protobuf:"varint,1,opt,name=healthy_tablet_count,json=healthyTabletCount" json:"healthy_tablet_count,omitempty"` HealthyTabletCount int32 `protobuf:"varint,1,opt,name=healthy_tablet_count,json=healthyTabletCount,proto3" json:"healthy_tablet_count,omitempty"`
// unhealthy_tablet_count is the number of unhealthy tablets in the group. // unhealthy_tablet_count is the number of unhealthy tablets in the group.
UnhealthyTabletCount int32 `protobuf:"varint,2,opt,name=unhealthy_tablet_count,json=unhealthyTabletCount" json:"unhealthy_tablet_count,omitempty"` UnhealthyTabletCount int32 `protobuf:"varint,2,opt,name=unhealthy_tablet_count,json=unhealthyTabletCount,proto3" json:"unhealthy_tablet_count,omitempty"`
// seconds_behind_master_min is the minimum of the // seconds_behind_master_min is the minimum of the
// seconds_behind_master values of the healthy tablets. It is unset // seconds_behind_master values of the healthy tablets. It is unset
// if the tablet type is master. // if the tablet type is master.
SecondsBehindMasterMin uint32 `protobuf:"varint,3,opt,name=seconds_behind_master_min,json=secondsBehindMasterMin" json:"seconds_behind_master_min,omitempty"` SecondsBehindMasterMin uint32 `protobuf:"varint,3,opt,name=seconds_behind_master_min,json=secondsBehindMasterMin,proto3" json:"seconds_behind_master_min,omitempty"`
// seconds_behind_master_max is the maximum of the // seconds_behind_master_max is the maximum of the
// seconds_behind_master values of the healthy tablets. It is unset // seconds_behind_master values of the healthy tablets. It is unset
// if the tablet type is master. // if the tablet type is master.
SecondsBehindMasterMax uint32 `protobuf:"varint,4,opt,name=seconds_behind_master_max,json=secondsBehindMasterMax" json:"seconds_behind_master_max,omitempty"` SecondsBehindMasterMax uint32 `protobuf:"varint,4,opt,name=seconds_behind_master_max,json=secondsBehindMasterMax,proto3" json:"seconds_behind_master_max,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3797,11 +3797,11 @@ func (m *AggregateStats) GetSecondsBehindMasterMax() uint32 { ...@@ -3797,11 +3797,11 @@ func (m *AggregateStats) GetSecondsBehindMasterMax() uint32 {
type StreamHealthResponse struct { type StreamHealthResponse struct {
// target is the current server type. Only queries with that exact Target // target is the current server type. Only queries with that exact Target
// record will be accepted (the cell may not match, however). // record will be accepted (the cell may not match, however).
Target *Target `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
// serving is true iff the tablet is serving. A tablet may not be serving // serving is true iff the tablet is serving. A tablet may not be serving
// if filtered replication is enabled on a master for instance, // if filtered replication is enabled on a master for instance,
// or if a replica should not be used because the keyspace is being resharded. // or if a replica should not be used because the keyspace is being resharded.
Serving bool `protobuf:"varint,2,opt,name=serving" json:"serving,omitempty"` Serving bool `protobuf:"varint,2,opt,name=serving,proto3" json:"serving,omitempty"`
// tablet_externally_reparented_timestamp can be interpreted as the // tablet_externally_reparented_timestamp can be interpreted as the
// last time we knew that this tablet was the MASTER of this shard // last time we knew that this tablet was the MASTER of this shard
// (if StreamHealthResponse describes a group of tablets, between // (if StreamHealthResponse describes a group of tablets, between
...@@ -3828,18 +3828,18 @@ type StreamHealthResponse struct { ...@@ -3828,18 +3828,18 @@ type StreamHealthResponse struct {
// topology (see go/vt/vttablet/tabletmanager/init_tablet.go) // topology (see go/vt/vttablet/tabletmanager/init_tablet.go)
// OR // OR
// d) 0 if the vttablet was never a MASTER. // d) 0 if the vttablet was never a MASTER.
TabletExternallyReparentedTimestamp int64 `protobuf:"varint,3,opt,name=tablet_externally_reparented_timestamp,json=tabletExternallyReparentedTimestamp" json:"tablet_externally_reparented_timestamp,omitempty"` TabletExternallyReparentedTimestamp int64 `protobuf:"varint,3,opt,name=tablet_externally_reparented_timestamp,json=tabletExternallyReparentedTimestamp,proto3" json:"tablet_externally_reparented_timestamp,omitempty"`
// realtime_stats contains information about the tablet status. // realtime_stats contains information about the tablet status.
// It is only filled in if the information is about a tablet. // It is only filled in if the information is about a tablet.
RealtimeStats *RealtimeStats `protobuf:"bytes,4,opt,name=realtime_stats,json=realtimeStats" json:"realtime_stats,omitempty"` RealtimeStats *RealtimeStats `protobuf:"bytes,4,opt,name=realtime_stats,json=realtimeStats,proto3" json:"realtime_stats,omitempty"`
// AggregateStats constains information about the group of tablet status. // AggregateStats constains information about the group of tablet status.
// It is only filled in if the information is about a group of tablets. // It is only filled in if the information is about a group of tablets.
AggregateStats *AggregateStats `protobuf:"bytes,6,opt,name=aggregate_stats,json=aggregateStats" json:"aggregate_stats,omitempty"` AggregateStats *AggregateStats `protobuf:"bytes,6,opt,name=aggregate_stats,json=aggregateStats,proto3" json:"aggregate_stats,omitempty"`
// tablet_alias is the alias of the sending tablet. The discovery/healthcheck.go // tablet_alias is the alias of the sending tablet. The discovery/healthcheck.go
// code uses it to verify that it's talking to the correct tablet and that it // code uses it to verify that it's talking to the correct tablet and that it
// hasn't changed in the meantime e.g. due to tablet restarts where ports or // hasn't changed in the meantime e.g. due to tablet restarts where ports or
// ips have been reused but assigned differently. // ips have been reused but assigned differently.
TabletAlias *topodata.TabletAlias `protobuf:"bytes,5,opt,name=tablet_alias,json=tabletAlias" json:"tablet_alias,omitempty"` TabletAlias *topodata.TabletAlias `protobuf:"bytes,5,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3915,15 +3915,15 @@ func (m *StreamHealthResponse) GetTabletAlias() *topodata.TabletAlias { ...@@ -3915,15 +3915,15 @@ func (m *StreamHealthResponse) GetTabletAlias() *topodata.TabletAlias {
// position and timestamp can be set. If neither is set, we will start // position and timestamp can be set. If neither is set, we will start
// streaming from the current binlog position. // streaming from the current binlog position.
type UpdateStreamRequest struct { type UpdateStreamRequest struct {
EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId" json:"effective_caller_id,omitempty"` EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId" json:"immediate_caller_id,omitempty"` ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
Target *Target `protobuf:"bytes,3,opt,name=target" json:"target,omitempty"` Target *Target `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
// If position is set, we will start the streaming from that replication // If position is set, we will start the streaming from that replication
// position. Incompatible with timestamp. // position. Incompatible with timestamp.
Position string `protobuf:"bytes,4,opt,name=position" json:"position,omitempty"` Position string `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
// If timestamp is set, we will start the streaming from the first // If timestamp is set, we will start the streaming from the first
// event in the binlogs that have that timestamp. Incompatible with position. // event in the binlogs that have that timestamp. Incompatible with position.
Timestamp int64 `protobuf:"varint,5,opt,name=timestamp" json:"timestamp,omitempty"` Timestamp int64 `protobuf:"varint,5,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3990,7 +3990,7 @@ func (m *UpdateStreamRequest) GetTimestamp() int64 { ...@@ -3990,7 +3990,7 @@ func (m *UpdateStreamRequest) GetTimestamp() int64 {
// UpdateStreamResponse is returned by UpdateStream // UpdateStreamResponse is returned by UpdateStream
type UpdateStreamResponse struct { type UpdateStreamResponse struct {
Event *StreamEvent `protobuf:"bytes,1,opt,name=event" json:"event,omitempty"` Event *StreamEvent `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -4029,10 +4029,10 @@ func (m *UpdateStreamResponse) GetEvent() *StreamEvent { ...@@ -4029,10 +4029,10 @@ func (m *UpdateStreamResponse) GetEvent() *StreamEvent {
// TransactionMetadata contains the metadata for a distributed transaction. // TransactionMetadata contains the metadata for a distributed transaction.
type TransactionMetadata struct { type TransactionMetadata struct {
Dtid string `protobuf:"bytes,1,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
State TransactionState `protobuf:"varint,2,opt,name=state,enum=query.TransactionState" json:"state,omitempty"` State TransactionState `protobuf:"varint,2,opt,name=state,proto3,enum=query.TransactionState" json:"state,omitempty"`
TimeCreated int64 `protobuf:"varint,3,opt,name=time_created,json=timeCreated" json:"time_created,omitempty"` TimeCreated int64 `protobuf:"varint,3,opt,name=time_created,json=timeCreated,proto3" json:"time_created,omitempty"`
Participants []*Target `protobuf:"bytes,4,rep,name=participants" json:"participants,omitempty"` Participants []*Target `protobuf:"bytes,4,rep,name=participants,proto3" json:"participants,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
......
...@@ -171,10 +171,10 @@ func (m *KeyRange) GetEnd() []byte { ...@@ -171,10 +171,10 @@ func (m *KeyRange) GetEnd() []byte {
// TabletAlias is a globally unique tablet identifier. // TabletAlias is a globally unique tablet identifier.
type TabletAlias struct { type TabletAlias struct {
// cell is the cell (or datacenter) the tablet is in // cell is the cell (or datacenter) the tablet is in
Cell string `protobuf:"bytes,1,opt,name=cell" json:"cell,omitempty"` Cell string `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
// uid is a unique id for this tablet within the shard // uid is a unique id for this tablet within the shard
// (this is the MySQL server id as well). // (this is the MySQL server id as well).
Uid uint32 `protobuf:"varint,2,opt,name=uid" json:"uid,omitempty"` Uid uint32 `protobuf:"varint,2,opt,name=uid,proto3" json:"uid,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -221,36 +221,36 @@ func (m *TabletAlias) GetUid() uint32 { ...@@ -221,36 +221,36 @@ func (m *TabletAlias) GetUid() uint32 {
// Tablet represents information about a running instance of vttablet. // Tablet represents information about a running instance of vttablet.
type Tablet struct { type Tablet struct {
// alias is the unique name of the tablet. // alias is the unique name of the tablet.
Alias *TabletAlias `protobuf:"bytes,1,opt,name=alias" json:"alias,omitempty"` Alias *TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
// Fully qualified domain name of the host. // Fully qualified domain name of the host.
Hostname string `protobuf:"bytes,2,opt,name=hostname" json:"hostname,omitempty"` Hostname string `protobuf:"bytes,2,opt,name=hostname,proto3" json:"hostname,omitempty"`
// Map of named ports. Normally this should include vt and grpc. // Map of named ports. Normally this should include vt and grpc.
// Going forward, the mysql port will be stored in mysql_port // Going forward, the mysql port will be stored in mysql_port
// instead of here. // instead of here.
// For accessing mysql port, use topoproto.MysqlPort to fetch, and // For accessing mysql port, use topoproto.MysqlPort to fetch, and
// topoproto.SetMysqlPort to set. These wrappers will ensure // topoproto.SetMysqlPort to set. These wrappers will ensure
// legacy behavior is supported. // legacy behavior is supported.
PortMap map[string]int32 `protobuf:"bytes,4,rep,name=port_map,json=portMap" json:"port_map,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` PortMap map[string]int32 `protobuf:"bytes,4,rep,name=port_map,json=portMap,proto3" json:"port_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
// Keyspace name. // Keyspace name.
Keyspace string `protobuf:"bytes,5,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,5,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// Shard name. If range based sharding is used, it should match // Shard name. If range based sharding is used, it should match
// key_range. // key_range.
Shard string `protobuf:"bytes,6,opt,name=shard" json:"shard,omitempty"` Shard string `protobuf:"bytes,6,opt,name=shard,proto3" json:"shard,omitempty"`
// If range based sharding is used, range for the tablet's shard. // If range based sharding is used, range for the tablet's shard.
KeyRange *KeyRange `protobuf:"bytes,7,opt,name=key_range,json=keyRange" json:"key_range,omitempty"` KeyRange *KeyRange `protobuf:"bytes,7,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
// type is the current type of the tablet. // type is the current type of the tablet.
Type TabletType `protobuf:"varint,8,opt,name=type,enum=topodata.TabletType" json:"type,omitempty"` Type TabletType `protobuf:"varint,8,opt,name=type,proto3,enum=topodata.TabletType" json:"type,omitempty"`
// It this is set, it is used as the database name instead of the // It this is set, it is used as the database name instead of the
// normal "vt_" + keyspace. // normal "vt_" + keyspace.
DbNameOverride string `protobuf:"bytes,9,opt,name=db_name_override,json=dbNameOverride" json:"db_name_override,omitempty"` DbNameOverride string `protobuf:"bytes,9,opt,name=db_name_override,json=dbNameOverride,proto3" json:"db_name_override,omitempty"`
// tablet tags // tablet tags
Tags map[string]string `protobuf:"bytes,10,rep,name=tags" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Tags map[string]string `protobuf:"bytes,10,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
// MySQL hostname. // MySQL hostname.
MysqlHostname string `protobuf:"bytes,12,opt,name=mysql_hostname,json=mysqlHostname" json:"mysql_hostname,omitempty"` MysqlHostname string `protobuf:"bytes,12,opt,name=mysql_hostname,json=mysqlHostname,proto3" json:"mysql_hostname,omitempty"`
// MySQL port. Use topoproto.MysqlPort and topoproto.SetMysqlPort // MySQL port. Use topoproto.MysqlPort and topoproto.SetMysqlPort
// to access this variable. The functions provide support // to access this variable. The functions provide support
// for legacy behavior. // for legacy behavior.
MysqlPort int32 `protobuf:"varint,13,opt,name=mysql_port,json=mysqlPort" json:"mysql_port,omitempty"` MysqlPort int32 `protobuf:"varint,13,opt,name=mysql_port,json=mysqlPort,proto3" json:"mysql_port,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -364,27 +364,27 @@ type Shard struct { ...@@ -364,27 +364,27 @@ type Shard struct {
// shard for reparenting operations (InitShardMaster, // shard for reparenting operations (InitShardMaster,
// PlannedReparentShard,EmergencyReparentShard), to guarantee // PlannedReparentShard,EmergencyReparentShard), to guarantee
// exclusive operation. // exclusive operation.
MasterAlias *TabletAlias `protobuf:"bytes,1,opt,name=master_alias,json=masterAlias" json:"master_alias,omitempty"` MasterAlias *TabletAlias `protobuf:"bytes,1,opt,name=master_alias,json=masterAlias,proto3" json:"master_alias,omitempty"`
// key_range is the KeyRange for this shard. It can be unset if: // key_range is the KeyRange for this shard. It can be unset if:
// - we are not using range-based sharding in this shard. // - we are not using range-based sharding in this shard.
// - the shard covers the entire keyrange. // - the shard covers the entire keyrange.
// This must match the shard name based on our other conventions, but // This must match the shard name based on our other conventions, but
// helpful to have it decomposed here. // helpful to have it decomposed here.
// Once set at creation time, it is never changed. // Once set at creation time, it is never changed.
KeyRange *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange" json:"key_range,omitempty"` KeyRange *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
// served_types has at most one entry per TabletType // served_types has at most one entry per TabletType
// The keyspace lock is always taken when changing this. // The keyspace lock is always taken when changing this.
ServedTypes []*Shard_ServedType `protobuf:"bytes,3,rep,name=served_types,json=servedTypes" json:"served_types,omitempty"` ServedTypes []*Shard_ServedType `protobuf:"bytes,3,rep,name=served_types,json=servedTypes,proto3" json:"served_types,omitempty"`
// SourceShards is the list of shards we're replicating from, // SourceShards is the list of shards we're replicating from,
// using filtered replication. // using filtered replication.
// The keyspace lock is always taken when changing this. // The keyspace lock is always taken when changing this.
SourceShards []*Shard_SourceShard `protobuf:"bytes,4,rep,name=source_shards,json=sourceShards" json:"source_shards,omitempty"` SourceShards []*Shard_SourceShard `protobuf:"bytes,4,rep,name=source_shards,json=sourceShards,proto3" json:"source_shards,omitempty"`
// Cells is the list of cells that contain tablets for this shard. // Cells is the list of cells that contain tablets for this shard.
// No lock is necessary to update this field. // No lock is necessary to update this field.
Cells []string `protobuf:"bytes,5,rep,name=cells" json:"cells,omitempty"` Cells []string `protobuf:"bytes,5,rep,name=cells,proto3" json:"cells,omitempty"`
// tablet_controls has at most one entry per TabletType. // tablet_controls has at most one entry per TabletType.
// The keyspace lock is always taken when changing this. // The keyspace lock is always taken when changing this.
TabletControls []*Shard_TabletControl `protobuf:"bytes,6,rep,name=tablet_controls,json=tabletControls" json:"tablet_controls,omitempty"` TabletControls []*Shard_TabletControl `protobuf:"bytes,6,rep,name=tablet_controls,json=tabletControls,proto3" json:"tablet_controls,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -458,8 +458,8 @@ func (m *Shard) GetTabletControls() []*Shard_TabletControl { ...@@ -458,8 +458,8 @@ func (m *Shard) GetTabletControls() []*Shard_TabletControl {
// ServedType is an entry in the served_types // ServedType is an entry in the served_types
type Shard_ServedType struct { type Shard_ServedType struct {
TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
Cells []string `protobuf:"bytes,2,rep,name=cells" json:"cells,omitempty"` Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -508,15 +508,15 @@ func (m *Shard_ServedType) GetCells() []string { ...@@ -508,15 +508,15 @@ func (m *Shard_ServedType) GetCells() []string {
// of that shard will run filtered replication. // of that shard will run filtered replication.
type Shard_SourceShard struct { type Shard_SourceShard struct {
// Uid is the unique ID for this SourceShard object. // Uid is the unique ID for this SourceShard object.
Uid uint32 `protobuf:"varint,1,opt,name=uid" json:"uid,omitempty"` Uid uint32 `protobuf:"varint,1,opt,name=uid,proto3" json:"uid,omitempty"`
// the source keyspace // the source keyspace
Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// the source shard // the source shard
Shard string `protobuf:"bytes,3,opt,name=shard" json:"shard,omitempty"` Shard string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
// the source shard keyrange // the source shard keyrange
KeyRange *KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange" json:"key_range,omitempty"` KeyRange *KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
// the source table list to replicate // the source table list to replicate
Tables []string `protobuf:"bytes,5,rep,name=tables" json:"tables,omitempty"` Tables []string `protobuf:"bytes,5,rep,name=tables,proto3" json:"tables,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -584,14 +584,14 @@ func (m *Shard_SourceShard) GetTables() []string { ...@@ -584,14 +584,14 @@ func (m *Shard_SourceShard) GetTables() []string {
// TabletControl controls tablet's behavior // TabletControl controls tablet's behavior
type Shard_TabletControl struct { type Shard_TabletControl struct {
// which tablet type is affected // which tablet type is affected
TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
Cells []string `protobuf:"bytes,2,rep,name=cells" json:"cells,omitempty"` Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
// what to do // what to do
DisableQueryService bool `protobuf:"varint,3,opt,name=disable_query_service,json=disableQueryService" json:"disable_query_service,omitempty"` DisableQueryService bool `protobuf:"varint,3,opt,name=disable_query_service,json=disableQueryService,proto3" json:"disable_query_service,omitempty"`
BlacklistedTables []string `protobuf:"bytes,4,rep,name=blacklisted_tables,json=blacklistedTables" json:"blacklisted_tables,omitempty"` BlacklistedTables []string `protobuf:"bytes,4,rep,name=blacklisted_tables,json=blacklistedTables,proto3" json:"blacklisted_tables,omitempty"`
// frozen is set if we've started failing over traffic for // frozen is set if we've started failing over traffic for
// the master. If set, this record should not be removed. // the master. If set, this record should not be removed.
Frozen bool `protobuf:"varint,5,opt,name=frozen" json:"frozen,omitempty"` Frozen bool `protobuf:"varint,5,opt,name=frozen,proto3" json:"frozen,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -660,13 +660,13 @@ func (m *Shard_TabletControl) GetFrozen() bool { ...@@ -660,13 +660,13 @@ func (m *Shard_TabletControl) GetFrozen() bool {
type Keyspace struct { type Keyspace struct {
// name of the column used for sharding // name of the column used for sharding
// empty if the keyspace is not sharded // empty if the keyspace is not sharded
ShardingColumnName string `protobuf:"bytes,1,opt,name=sharding_column_name,json=shardingColumnName" json:"sharding_column_name,omitempty"` ShardingColumnName string `protobuf:"bytes,1,opt,name=sharding_column_name,json=shardingColumnName,proto3" json:"sharding_column_name,omitempty"`
// type of the column used for sharding // type of the column used for sharding
// UNSET if the keyspace is not sharded // UNSET if the keyspace is not sharded
ShardingColumnType KeyspaceIdType `protobuf:"varint,2,opt,name=sharding_column_type,json=shardingColumnType,enum=topodata.KeyspaceIdType" json:"sharding_column_type,omitempty"` ShardingColumnType KeyspaceIdType `protobuf:"varint,2,opt,name=sharding_column_type,json=shardingColumnType,proto3,enum=topodata.KeyspaceIdType" json:"sharding_column_type,omitempty"`
// ServedFrom will redirect the appropriate traffic to // ServedFrom will redirect the appropriate traffic to
// another keyspace. // another keyspace.
ServedFroms []*Keyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_froms,json=servedFroms" json:"served_froms,omitempty"` ServedFroms []*Keyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_froms,json=servedFroms,proto3" json:"served_froms,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -721,11 +721,11 @@ func (m *Keyspace) GetServedFroms() []*Keyspace_ServedFrom { ...@@ -721,11 +721,11 @@ func (m *Keyspace) GetServedFroms() []*Keyspace_ServedFrom {
// keyspace name that's serving it. // keyspace name that's serving it.
type Keyspace_ServedFrom struct { type Keyspace_ServedFrom struct {
// the tablet type (key for the map) // the tablet type (key for the map)
TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// the cells to limit this to // the cells to limit this to
Cells []string `protobuf:"bytes,2,rep,name=cells" json:"cells,omitempty"` Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
// the keyspace name that's serving it // the keyspace name that's serving it
Keyspace string `protobuf:"bytes,3,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -781,7 +781,7 @@ func (m *Keyspace_ServedFrom) GetKeyspace() string { ...@@ -781,7 +781,7 @@ func (m *Keyspace_ServedFrom) GetKeyspace() string {
type ShardReplication struct { type ShardReplication struct {
// Note there can be only one Node in this array // Note there can be only one Node in this array
// for a given tablet. // for a given tablet.
Nodes []*ShardReplication_Node `protobuf:"bytes,1,rep,name=nodes" json:"nodes,omitempty"` Nodes []*ShardReplication_Node `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -820,7 +820,7 @@ func (m *ShardReplication) GetNodes() []*ShardReplication_Node { ...@@ -820,7 +820,7 @@ func (m *ShardReplication) GetNodes() []*ShardReplication_Node {
// Node describes a tablet instance within the cell // Node describes a tablet instance within the cell
type ShardReplication_Node struct { type ShardReplication_Node struct {
TabletAlias *TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias" json:"tablet_alias,omitempty"` TabletAlias *TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -860,8 +860,8 @@ func (m *ShardReplication_Node) GetTabletAlias() *TabletAlias { ...@@ -860,8 +860,8 @@ func (m *ShardReplication_Node) GetTabletAlias() *TabletAlias {
// ShardReference is used as a pointer from a SrvKeyspace to a Shard // ShardReference is used as a pointer from a SrvKeyspace to a Shard
type ShardReference struct { type ShardReference struct {
// Copied from Shard. // Copied from Shard.
Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
KeyRange *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange" json:"key_range,omitempty"` KeyRange *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -908,11 +908,11 @@ func (m *ShardReference) GetKeyRange() *KeyRange { ...@@ -908,11 +908,11 @@ func (m *ShardReference) GetKeyRange() *KeyRange {
// SrvKeyspace is a rollup node for the keyspace itself. // SrvKeyspace is a rollup node for the keyspace itself.
type SrvKeyspace struct { type SrvKeyspace struct {
// The partitions this keyspace is serving, per tablet type. // The partitions this keyspace is serving, per tablet type.
Partitions []*SrvKeyspace_KeyspacePartition `protobuf:"bytes,1,rep,name=partitions" json:"partitions,omitempty"` Partitions []*SrvKeyspace_KeyspacePartition `protobuf:"bytes,1,rep,name=partitions,proto3" json:"partitions,omitempty"`
// copied from Keyspace // copied from Keyspace
ShardingColumnName string `protobuf:"bytes,2,opt,name=sharding_column_name,json=shardingColumnName" json:"sharding_column_name,omitempty"` ShardingColumnName string `protobuf:"bytes,2,opt,name=sharding_column_name,json=shardingColumnName,proto3" json:"sharding_column_name,omitempty"`
ShardingColumnType KeyspaceIdType `protobuf:"varint,3,opt,name=sharding_column_type,json=shardingColumnType,enum=topodata.KeyspaceIdType" json:"sharding_column_type,omitempty"` ShardingColumnType KeyspaceIdType `protobuf:"varint,3,opt,name=sharding_column_type,json=shardingColumnType,proto3,enum=topodata.KeyspaceIdType" json:"sharding_column_type,omitempty"`
ServedFrom []*SrvKeyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_from,json=servedFrom" json:"served_from,omitempty"` ServedFrom []*SrvKeyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_from,json=servedFrom,proto3" json:"served_from,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -972,9 +972,9 @@ func (m *SrvKeyspace) GetServedFrom() []*SrvKeyspace_ServedFrom { ...@@ -972,9 +972,9 @@ func (m *SrvKeyspace) GetServedFrom() []*SrvKeyspace_ServedFrom {
type SrvKeyspace_KeyspacePartition struct { type SrvKeyspace_KeyspacePartition struct {
// The type this partition applies to. // The type this partition applies to.
ServedType TabletType `protobuf:"varint,1,opt,name=served_type,json=servedType,enum=topodata.TabletType" json:"served_type,omitempty"` ServedType TabletType `protobuf:"varint,1,opt,name=served_type,json=servedType,proto3,enum=topodata.TabletType" json:"served_type,omitempty"`
// List of non-overlapping continuous shards sorted by range. // List of non-overlapping continuous shards sorted by range.
ShardReferences []*ShardReference `protobuf:"bytes,2,rep,name=shard_references,json=shardReferences" json:"shard_references,omitempty"` ShardReferences []*ShardReference `protobuf:"bytes,2,rep,name=shard_references,json=shardReferences,proto3" json:"shard_references,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1022,9 +1022,9 @@ func (m *SrvKeyspace_KeyspacePartition) GetShardReferences() []*ShardReference { ...@@ -1022,9 +1022,9 @@ func (m *SrvKeyspace_KeyspacePartition) GetShardReferences() []*ShardReference {
// keyspace name that's serving it. // keyspace name that's serving it.
type SrvKeyspace_ServedFrom struct { type SrvKeyspace_ServedFrom struct {
// the tablet type // the tablet type
TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// the keyspace name that's serving it // the keyspace name that's serving it
Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1076,13 +1076,13 @@ type CellInfo struct { ...@@ -1076,13 +1076,13 @@ type CellInfo struct {
// The syntax of this field is topology implementation specific. // The syntax of this field is topology implementation specific.
// For instance, for Zookeeper, it is a comma-separated list of // For instance, for Zookeeper, it is a comma-separated list of
// server addresses. // server addresses.
ServerAddress string `protobuf:"bytes,1,opt,name=server_address,json=serverAddress" json:"server_address,omitempty"` ServerAddress string `protobuf:"bytes,1,opt,name=server_address,json=serverAddress,proto3" json:"server_address,omitempty"`
// Root is the path to store data in. It is only used when talking // Root is the path to store data in. It is only used when talking
// to server_address. // to server_address.
Root string `protobuf:"bytes,2,opt,name=root" json:"root,omitempty"` Root string `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"`
// Region is a group this cell belongs to. Used by vtgate to route traffic to // Region is a group this cell belongs to. Used by vtgate to route traffic to
// other cells (in same region) when there is no available tablet in the current cell. // other cells (in same region) when there is no available tablet in the current cell.
Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"` Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
......
...@@ -68,27 +68,27 @@ func (TransactionMode) EnumDescriptor() ([]byte, []int) { ...@@ -68,27 +68,27 @@ func (TransactionMode) EnumDescriptor() ([]byte, []int) {
// an optional parameter for the V2 APIs. // an optional parameter for the V2 APIs.
type Session struct { type Session struct {
// in_transaction is set to true if the session is in a transaction. // in_transaction is set to true if the session is in a transaction.
InTransaction bool `protobuf:"varint,1,opt,name=in_transaction,json=inTransaction" json:"in_transaction,omitempty"` InTransaction bool `protobuf:"varint,1,opt,name=in_transaction,json=inTransaction,proto3" json:"in_transaction,omitempty"`
// shard_sessions keep track of per-shard transaction info. // shard_sessions keep track of per-shard transaction info.
ShardSessions []*Session_ShardSession `protobuf:"bytes,2,rep,name=shard_sessions,json=shardSessions" json:"shard_sessions,omitempty"` ShardSessions []*Session_ShardSession `protobuf:"bytes,2,rep,name=shard_sessions,json=shardSessions,proto3" json:"shard_sessions,omitempty"`
// single_db is deprecated. Use transaction_mode instead. // single_db is deprecated. Use transaction_mode instead.
// The value specifies if the transaction should be restricted // The value specifies if the transaction should be restricted
// to a single shard. // to a single shard.
// TODO(sougou): remove in 3.1 // TODO(sougou): remove in 3.1
SingleDb bool `protobuf:"varint,3,opt,name=single_db,json=singleDb" json:"single_db,omitempty"` SingleDb bool `protobuf:"varint,3,opt,name=single_db,json=singleDb,proto3" json:"single_db,omitempty"`
// autocommit specifies if the session is in autocommit mode. // autocommit specifies if the session is in autocommit mode.
// This is used only for V3. // This is used only for V3.
Autocommit bool `protobuf:"varint,4,opt,name=autocommit" json:"autocommit,omitempty"` Autocommit bool `protobuf:"varint,4,opt,name=autocommit,proto3" json:"autocommit,omitempty"`
// target_string is the target expressed as a string. Valid // target_string is the target expressed as a string. Valid
// names are: keyspace:shard@target, keyspace@target or @target. // names are: keyspace:shard@target, keyspace@target or @target.
// This is used only for V3. // This is used only for V3.
TargetString string `protobuf:"bytes,5,opt,name=target_string,json=targetString" json:"target_string,omitempty"` TargetString string `protobuf:"bytes,5,opt,name=target_string,json=targetString,proto3" json:"target_string,omitempty"`
// options is used only for V3. // options is used only for V3.
Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
// transaction_mode specifies the current transaction mode. // transaction_mode specifies the current transaction mode.
TransactionMode TransactionMode `protobuf:"varint,7,opt,name=transaction_mode,json=transactionMode,enum=vtgate.TransactionMode" json:"transaction_mode,omitempty"` TransactionMode TransactionMode `protobuf:"varint,7,opt,name=transaction_mode,json=transactionMode,proto3,enum=vtgate.TransactionMode" json:"transaction_mode,omitempty"`
// warnings contains non-fatal warnings from the previous query // warnings contains non-fatal warnings from the previous query
Warnings []*query.QueryWarning `protobuf:"bytes,8,rep,name=warnings" json:"warnings,omitempty"` Warnings []*query.QueryWarning `protobuf:"bytes,8,rep,name=warnings,proto3" json:"warnings,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -175,8 +175,8 @@ func (m *Session) GetWarnings() []*query.QueryWarning { ...@@ -175,8 +175,8 @@ func (m *Session) GetWarnings() []*query.QueryWarning {
} }
type Session_ShardSession struct { type Session_ShardSession struct {
Target *query.Target `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"` Target *query.Target `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
TransactionId int64 `protobuf:"varint,2,opt,name=transaction_id,json=transactionId" json:"transaction_id,omitempty"` TransactionId int64 `protobuf:"varint,2,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -224,17 +224,17 @@ func (m *Session_ShardSession) GetTransactionId() int64 { ...@@ -224,17 +224,17 @@ func (m *Session_ShardSession) GetTransactionId() int64 {
type ExecuteRequest struct { type ExecuteRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the session state. // session carries the session state.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
// These values are deprecated. Use session instead. // These values are deprecated. Use session instead.
// TODO(sougou): remove in 3.1 // TODO(sougou): remove in 3.1
TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
NotInTransaction bool `protobuf:"varint,5,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"` NotInTransaction bool `protobuf:"varint,5,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
KeyspaceShard string `protobuf:"bytes,6,opt,name=keyspace_shard,json=keyspaceShard" json:"keyspace_shard,omitempty"` KeyspaceShard string `protobuf:"bytes,6,opt,name=keyspace_shard,json=keyspaceShard,proto3" json:"keyspace_shard,omitempty"`
Options *query.ExecuteOptions `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,7,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -318,11 +318,11 @@ type ExecuteResponse struct { ...@@ -318,11 +318,11 @@ type ExecuteResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// session may have changed, even when an error is returned (for // session may have changed, even when an error is returned (for
// instance if a database integrity error happened). // instance if a database integrity error happened).
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
// session is the updated session information. // session is the updated session information.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// result contains the query result, only set if error is unset. // result contains the query result, only set if error is unset.
Result *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"` Result *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -377,22 +377,22 @@ func (m *ExecuteResponse) GetResult() *query.QueryResult { ...@@ -377,22 +377,22 @@ func (m *ExecuteResponse) GetResult() *query.QueryResult {
type ExecuteShardsRequest struct { type ExecuteShardsRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the current transaction data. It is returned by Begin. // session carries the current transaction data. It is returned by Begin.
// Do not fill it in if outside of a transaction. // Do not fill it in if outside of a transaction.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,4,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,4,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// shards to target the query to. A DML can only target one shard. // shards to target the query to. A DML can only target one shard.
Shards []string `protobuf:"bytes,5,rep,name=shards" json:"shards,omitempty"` Shards []string `protobuf:"bytes,5,rep,name=shards,proto3" json:"shards,omitempty"`
// tablet_type is the type of tablets that this query is targeted to. // tablet_type is the type of tablets that this query is targeted to.
TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// not_in_transaction is deprecated. // not_in_transaction is deprecated.
NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"` NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
// options // options
Options *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -483,11 +483,11 @@ type ExecuteShardsResponse struct { ...@@ -483,11 +483,11 @@ type ExecuteShardsResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// session may have changed, even when an error is returned (for // session may have changed, even when an error is returned (for
// instance if a database integrity error happened). // instance if a database integrity error happened).
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
// session is the updated session information (only returned inside a transaction). // session is the updated session information (only returned inside a transaction).
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// result contains the query result, only set if error is unset. // result contains the query result, only set if error is unset.
Result *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"` Result *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -542,23 +542,23 @@ func (m *ExecuteShardsResponse) GetResult() *query.QueryResult { ...@@ -542,23 +542,23 @@ func (m *ExecuteShardsResponse) GetResult() *query.QueryResult {
type ExecuteKeyspaceIdsRequest struct { type ExecuteKeyspaceIdsRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the current transaction data. It is returned by Begin. // session carries the current transaction data. It is returned by Begin.
// Do not fill it in if outside of a transaction. // Do not fill it in if outside of a transaction.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,4,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,4,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// keyspace_ids contains the list of keyspace_ids affected by this query. // keyspace_ids contains the list of keyspace_ids affected by this query.
// Will be used to find the shards to send the query to. // Will be used to find the shards to send the query to.
KeyspaceIds [][]byte `protobuf:"bytes,5,rep,name=keyspace_ids,json=keyspaceIds,proto3" json:"keyspace_ids,omitempty"` KeyspaceIds [][]byte `protobuf:"bytes,5,rep,name=keyspace_ids,json=keyspaceIds,proto3" json:"keyspace_ids,omitempty"`
// tablet_type is the type of tablets that this query is targeted to. // tablet_type is the type of tablets that this query is targeted to.
TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// not_in_transaction is deprecated. // not_in_transaction is deprecated.
NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"` NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
// options // options
Options *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -649,11 +649,11 @@ type ExecuteKeyspaceIdsResponse struct { ...@@ -649,11 +649,11 @@ type ExecuteKeyspaceIdsResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// session may have changed, even when an error is returned (for // session may have changed, even when an error is returned (for
// instance if a database integrity error happened). // instance if a database integrity error happened).
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
// session is the updated session information (only returned inside a transaction). // session is the updated session information (only returned inside a transaction).
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// result contains the query result, only set if error is unset. // result contains the query result, only set if error is unset.
Result *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"` Result *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -708,23 +708,23 @@ func (m *ExecuteKeyspaceIdsResponse) GetResult() *query.QueryResult { ...@@ -708,23 +708,23 @@ func (m *ExecuteKeyspaceIdsResponse) GetResult() *query.QueryResult {
type ExecuteKeyRangesRequest struct { type ExecuteKeyRangesRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the current transaction data. It is returned by Begin. // session carries the current transaction data. It is returned by Begin.
// Do not fill it in if outside of a transaction. // Do not fill it in if outside of a transaction.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
// keyspace to target the query to // keyspace to target the query to
Keyspace string `protobuf:"bytes,4,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,4,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// key_ranges contains the list of key ranges affected by this query. // key_ranges contains the list of key ranges affected by this query.
// Will be used to find the shards to send the query to. // Will be used to find the shards to send the query to.
KeyRanges []*topodata.KeyRange `protobuf:"bytes,5,rep,name=key_ranges,json=keyRanges" json:"key_ranges,omitempty"` KeyRanges []*topodata.KeyRange `protobuf:"bytes,5,rep,name=key_ranges,json=keyRanges,proto3" json:"key_ranges,omitempty"`
// tablet_type is the type of tablets that this query is targeted to. // tablet_type is the type of tablets that this query is targeted to.
TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// not_in_transaction is deprecated. // not_in_transaction is deprecated.
NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"` NotInTransaction bool `protobuf:"varint,7,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
// options // options
Options *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,8,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -815,11 +815,11 @@ type ExecuteKeyRangesResponse struct { ...@@ -815,11 +815,11 @@ type ExecuteKeyRangesResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// session may have changed, even when an error is returned (for // session may have changed, even when an error is returned (for
// instance if a database integrity error happened). // instance if a database integrity error happened).
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
// session is the updated session information (only returned inside a transaction). // session is the updated session information (only returned inside a transaction).
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// result contains the query result, only set if error is unset. // result contains the query result, only set if error is unset.
Result *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"` Result *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -874,25 +874,25 @@ func (m *ExecuteKeyRangesResponse) GetResult() *query.QueryResult { ...@@ -874,25 +874,25 @@ func (m *ExecuteKeyRangesResponse) GetResult() *query.QueryResult {
type ExecuteEntityIdsRequest struct { type ExecuteEntityIdsRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the current transaction data. It is returned by Begin. // session carries the current transaction data. It is returned by Begin.
// Do not fill it in if outside of a transaction. // Do not fill it in if outside of a transaction.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,4,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,4,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// entity_column_name is the column name to use. // entity_column_name is the column name to use.
EntityColumnName string `protobuf:"bytes,5,opt,name=entity_column_name,json=entityColumnName" json:"entity_column_name,omitempty"` EntityColumnName string `protobuf:"bytes,5,opt,name=entity_column_name,json=entityColumnName,proto3" json:"entity_column_name,omitempty"`
// entity_keyspace_ids are pairs of entity_column_name values // entity_keyspace_ids are pairs of entity_column_name values
// associated with its corresponding keyspace_id. // associated with its corresponding keyspace_id.
EntityKeyspaceIds []*ExecuteEntityIdsRequest_EntityId `protobuf:"bytes,6,rep,name=entity_keyspace_ids,json=entityKeyspaceIds" json:"entity_keyspace_ids,omitempty"` EntityKeyspaceIds []*ExecuteEntityIdsRequest_EntityId `protobuf:"bytes,6,rep,name=entity_keyspace_ids,json=entityKeyspaceIds,proto3" json:"entity_keyspace_ids,omitempty"`
// tablet_type is the type of tablets that this query is targeted to. // tablet_type is the type of tablets that this query is targeted to.
TabletType topodata.TabletType `protobuf:"varint,7,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,7,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// not_in_transaction is deprecated. // not_in_transaction is deprecated.
NotInTransaction bool `protobuf:"varint,8,opt,name=not_in_transaction,json=notInTransaction" json:"not_in_transaction,omitempty"` NotInTransaction bool `protobuf:"varint,8,opt,name=not_in_transaction,json=notInTransaction,proto3" json:"not_in_transaction,omitempty"`
// options // options
Options *query.ExecuteOptions `protobuf:"bytes,9,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,9,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -987,7 +987,7 @@ func (m *ExecuteEntityIdsRequest) GetOptions() *query.ExecuteOptions { ...@@ -987,7 +987,7 @@ func (m *ExecuteEntityIdsRequest) GetOptions() *query.ExecuteOptions {
type ExecuteEntityIdsRequest_EntityId struct { type ExecuteEntityIdsRequest_EntityId struct {
// type is the type of the entity's value. Can be NULL_TYPE. // type is the type of the entity's value. Can be NULL_TYPE.
Type query.Type `protobuf:"varint,1,opt,name=type,enum=query.Type" json:"type,omitempty"` Type query.Type `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
// value is the value for the entity. Not set if type is NULL_TYPE. // value is the value for the entity. Not set if type is NULL_TYPE.
Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
// keyspace_id is the associated keyspace_id for the entity. // keyspace_id is the associated keyspace_id for the entity.
...@@ -1047,11 +1047,11 @@ type ExecuteEntityIdsResponse struct { ...@@ -1047,11 +1047,11 @@ type ExecuteEntityIdsResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// session may have changed, even when an error is returned (for // session may have changed, even when an error is returned (for
// instance if a database integrity error happened). // instance if a database integrity error happened).
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
// session is the updated session information (only returned inside a transaction). // session is the updated session information (only returned inside a transaction).
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// result contains the query result, only set if error is unset. // result contains the query result, only set if error is unset.
Result *query.QueryResult `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"` Result *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1106,17 +1106,17 @@ func (m *ExecuteEntityIdsResponse) GetResult() *query.QueryResult { ...@@ -1106,17 +1106,17 @@ func (m *ExecuteEntityIdsResponse) GetResult() *query.QueryResult {
type ExecuteBatchRequest struct { type ExecuteBatchRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the session state. // session carries the session state.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// queries is a list of query and bind variables to execute. // queries is a list of query and bind variables to execute.
Queries []*query.BoundQuery `protobuf:"bytes,3,rep,name=queries" json:"queries,omitempty"` Queries []*query.BoundQuery `protobuf:"bytes,3,rep,name=queries,proto3" json:"queries,omitempty"`
// These values are deprecated. Use session instead. // These values are deprecated. Use session instead.
// TODO(sougou): remove in 3.1 // TODO(sougou): remove in 3.1
TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"` AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
KeyspaceShard string `protobuf:"bytes,6,opt,name=keyspace_shard,json=keyspaceShard" json:"keyspace_shard,omitempty"` KeyspaceShard string `protobuf:"bytes,6,opt,name=keyspace_shard,json=keyspaceShard,proto3" json:"keyspace_shard,omitempty"`
Options *query.ExecuteOptions `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,7,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1200,11 +1200,11 @@ type ExecuteBatchResponse struct { ...@@ -1200,11 +1200,11 @@ type ExecuteBatchResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// session may have changed, even when an error is returned (for // session may have changed, even when an error is returned (for
// instance if a database integrity error happened). // instance if a database integrity error happened).
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
// session is the updated session information. // session is the updated session information.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// results contains the query results, only set if application level error is unset. // results contains the query results, only set if application level error is unset.
Results []*query.ResultWithError `protobuf:"bytes,3,rep,name=results" json:"results,omitempty"` Results []*query.ResultWithError `protobuf:"bytes,3,rep,name=results,proto3" json:"results,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1260,11 +1260,11 @@ func (m *ExecuteBatchResponse) GetResults() []*query.ResultWithError { ...@@ -1260,11 +1260,11 @@ func (m *ExecuteBatchResponse) GetResults() []*query.ResultWithError {
// ExecuteBatchShardsRequest. // ExecuteBatchShardsRequest.
type BoundShardQuery struct { type BoundShardQuery struct {
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// shards to target the query to. A DML can only target one shard. // shards to target the query to. A DML can only target one shard.
Shards []string `protobuf:"bytes,3,rep,name=shards" json:"shards,omitempty"` Shards []string `protobuf:"bytes,3,rep,name=shards,proto3" json:"shards,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1319,20 +1319,20 @@ func (m *BoundShardQuery) GetShards() []string { ...@@ -1319,20 +1319,20 @@ func (m *BoundShardQuery) GetShards() []string {
type ExecuteBatchShardsRequest struct { type ExecuteBatchShardsRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the current transaction data. It is returned by Begin. // session carries the current transaction data. It is returned by Begin.
// Do not fill it in if outside of a transaction. // Do not fill it in if outside of a transaction.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// queries carries all the queries to execute. // queries carries all the queries to execute.
Queries []*BoundShardQuery `protobuf:"bytes,3,rep,name=queries" json:"queries,omitempty"` Queries []*BoundShardQuery `protobuf:"bytes,3,rep,name=queries,proto3" json:"queries,omitempty"`
// tablet_type is the type of tablets that this query is targeted to. // tablet_type is the type of tablets that this query is targeted to.
TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose. // as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose.
// (this can be seen as adding a 'begin' before and 'commit' after the queries). // (this can be seen as adding a 'begin' before and 'commit' after the queries).
// Only makes sense if tablet_type is master. If set, the Session is ignored. // Only makes sense if tablet_type is master. If set, the Session is ignored.
AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"` AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
// options // options
Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1409,11 +1409,11 @@ type ExecuteBatchShardsResponse struct { ...@@ -1409,11 +1409,11 @@ type ExecuteBatchShardsResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// session may have changed, even when an error is returned (for // session may have changed, even when an error is returned (for
// instance if a database integrity error happened). // instance if a database integrity error happened).
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
// session is the updated session information (only returned inside a transaction). // session is the updated session information (only returned inside a transaction).
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// result contains the query result, only set if error is unset. // result contains the query result, only set if error is unset.
Results []*query.QueryResult `protobuf:"bytes,3,rep,name=results" json:"results,omitempty"` Results []*query.QueryResult `protobuf:"bytes,3,rep,name=results,proto3" json:"results,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1469,9 +1469,9 @@ func (m *ExecuteBatchShardsResponse) GetResults() []*query.QueryResult { ...@@ -1469,9 +1469,9 @@ func (m *ExecuteBatchShardsResponse) GetResults() []*query.QueryResult {
// ExecuteBatchKeyspaceIdsRequest. // ExecuteBatchKeyspaceIdsRequest.
type BoundKeyspaceIdQuery struct { type BoundKeyspaceIdQuery struct {
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// keyspace_ids contains the list of keyspace_ids affected by this query. // keyspace_ids contains the list of keyspace_ids affected by this query.
// Will be used to find the shards to send the query to. // Will be used to find the shards to send the query to.
KeyspaceIds [][]byte `protobuf:"bytes,3,rep,name=keyspace_ids,json=keyspaceIds,proto3" json:"keyspace_ids,omitempty"` KeyspaceIds [][]byte `protobuf:"bytes,3,rep,name=keyspace_ids,json=keyspaceIds,proto3" json:"keyspace_ids,omitempty"`
...@@ -1529,19 +1529,19 @@ func (m *BoundKeyspaceIdQuery) GetKeyspaceIds() [][]byte { ...@@ -1529,19 +1529,19 @@ func (m *BoundKeyspaceIdQuery) GetKeyspaceIds() [][]byte {
type ExecuteBatchKeyspaceIdsRequest struct { type ExecuteBatchKeyspaceIdsRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the current transaction data. It is returned by Begin. // session carries the current transaction data. It is returned by Begin.
// Do not fill it in if outside of a transaction. // Do not fill it in if outside of a transaction.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
Queries []*BoundKeyspaceIdQuery `protobuf:"bytes,3,rep,name=queries" json:"queries,omitempty"` Queries []*BoundKeyspaceIdQuery `protobuf:"bytes,3,rep,name=queries,proto3" json:"queries,omitempty"`
// tablet_type is the type of tablets that this query is targeted to. // tablet_type is the type of tablets that this query is targeted to.
TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,4,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose. // as_transaction will execute the queries in this batch in a single transaction per shard, created for this purpose.
// (this can be seen as adding a 'begin' before and 'commit' after the queries). // (this can be seen as adding a 'begin' before and 'commit' after the queries).
// Only makes sense if tablet_type is master. If set, the Session is ignored. // Only makes sense if tablet_type is master. If set, the Session is ignored.
AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction" json:"as_transaction,omitempty"` AsTransaction bool `protobuf:"varint,5,opt,name=as_transaction,json=asTransaction,proto3" json:"as_transaction,omitempty"`
// options // options
Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1618,11 +1618,11 @@ type ExecuteBatchKeyspaceIdsResponse struct { ...@@ -1618,11 +1618,11 @@ type ExecuteBatchKeyspaceIdsResponse struct {
// error contains an application level error if necessary. Note the // error contains an application level error if necessary. Note the
// session may have changed, even when an error is returned (for // session may have changed, even when an error is returned (for
// instance if a database integrity error happened). // instance if a database integrity error happened).
Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
// session is the updated session information (only returned inside a transaction). // session is the updated session information (only returned inside a transaction).
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// result contains the query result, only set if error is unset. // result contains the query result, only set if error is unset.
Results []*query.QueryResult `protobuf:"bytes,3,rep,name=results" json:"results,omitempty"` Results []*query.QueryResult `protobuf:"bytes,3,rep,name=results,proto3" json:"results,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1677,16 +1677,16 @@ func (m *ExecuteBatchKeyspaceIdsResponse) GetResults() []*query.QueryResult { ...@@ -1677,16 +1677,16 @@ func (m *ExecuteBatchKeyspaceIdsResponse) GetResults() []*query.QueryResult {
type StreamExecuteRequest struct { type StreamExecuteRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
// These values are deprecated. Use session instead. // These values are deprecated. Use session instead.
// TODO(sougou): remove in 3.1 // TODO(sougou): remove in 3.1
TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
KeyspaceShard string `protobuf:"bytes,4,opt,name=keyspace_shard,json=keyspaceShard" json:"keyspace_shard,omitempty"` KeyspaceShard string `protobuf:"bytes,4,opt,name=keyspace_shard,json=keyspaceShard,proto3" json:"keyspace_shard,omitempty"`
Options *query.ExecuteOptions `protobuf:"bytes,5,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
// session carries the session state. // session carries the session state.
Session *Session `protobuf:"bytes,6,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,6,opt,name=session,proto3" json:"session,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1765,7 +1765,7 @@ type StreamExecuteResponse struct { ...@@ -1765,7 +1765,7 @@ type StreamExecuteResponse struct {
// result contains the result data. // result contains the result data.
// The first value contains only Fields information. // The first value contains only Fields information.
// The next values contain the actual rows, a few values per result. // The next values contain the actual rows, a few values per result.
Result *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1806,17 +1806,17 @@ func (m *StreamExecuteResponse) GetResult() *query.QueryResult { ...@@ -1806,17 +1806,17 @@ func (m *StreamExecuteResponse) GetResult() *query.QueryResult {
type StreamExecuteShardsRequest struct { type StreamExecuteShardsRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,3,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// shards to target the query to. // shards to target the query to.
Shards []string `protobuf:"bytes,4,rep,name=shards" json:"shards,omitempty"` Shards []string `protobuf:"bytes,4,rep,name=shards,proto3" json:"shards,omitempty"`
// tablet_type is the type of tablets that this query is targeted to. // tablet_type is the type of tablets that this query is targeted to.
TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// options // options
Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1893,7 +1893,7 @@ type StreamExecuteShardsResponse struct { ...@@ -1893,7 +1893,7 @@ type StreamExecuteShardsResponse struct {
// result contains the result data. // result contains the result data.
// The first value contains only Fields information. // The first value contains only Fields information.
// The next values contain the actual rows, a few values per result. // The next values contain the actual rows, a few values per result.
Result *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1934,18 +1934,18 @@ func (m *StreamExecuteShardsResponse) GetResult() *query.QueryResult { ...@@ -1934,18 +1934,18 @@ func (m *StreamExecuteShardsResponse) GetResult() *query.QueryResult {
type StreamExecuteKeyspaceIdsRequest struct { type StreamExecuteKeyspaceIdsRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,3,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// keyspace_ids contains the list of keyspace_ids affected by this query. // keyspace_ids contains the list of keyspace_ids affected by this query.
// Will be used to find the shards to send the query to. // Will be used to find the shards to send the query to.
KeyspaceIds [][]byte `protobuf:"bytes,4,rep,name=keyspace_ids,json=keyspaceIds,proto3" json:"keyspace_ids,omitempty"` KeyspaceIds [][]byte `protobuf:"bytes,4,rep,name=keyspace_ids,json=keyspaceIds,proto3" json:"keyspace_ids,omitempty"`
// tablet_type is the type of tablets that this query is targeted to. // tablet_type is the type of tablets that this query is targeted to.
TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// options // options
Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2022,7 +2022,7 @@ type StreamExecuteKeyspaceIdsResponse struct { ...@@ -2022,7 +2022,7 @@ type StreamExecuteKeyspaceIdsResponse struct {
// result contains the result data. // result contains the result data.
// The first value contains only Fields information. // The first value contains only Fields information.
// The next values contain the actual rows, a few values per result. // The next values contain the actual rows, a few values per result.
Result *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2063,18 +2063,18 @@ func (m *StreamExecuteKeyspaceIdsResponse) GetResult() *query.QueryResult { ...@@ -2063,18 +2063,18 @@ func (m *StreamExecuteKeyspaceIdsResponse) GetResult() *query.QueryResult {
type StreamExecuteKeyRangesRequest struct { type StreamExecuteKeyRangesRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,3,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// key_ranges contains the list of key ranges affected by this query. // key_ranges contains the list of key ranges affected by this query.
// Will be used to find the shards to send the query to. // Will be used to find the shards to send the query to.
KeyRanges []*topodata.KeyRange `protobuf:"bytes,4,rep,name=key_ranges,json=keyRanges" json:"key_ranges,omitempty"` KeyRanges []*topodata.KeyRange `protobuf:"bytes,4,rep,name=key_ranges,json=keyRanges,proto3" json:"key_ranges,omitempty"`
// tablet_type is the type of tablets that this query is targeted to. // tablet_type is the type of tablets that this query is targeted to.
TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// options // options
Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options" json:"options,omitempty"` Options *query.ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2151,7 +2151,7 @@ type StreamExecuteKeyRangesResponse struct { ...@@ -2151,7 +2151,7 @@ type StreamExecuteKeyRangesResponse struct {
// result contains the result data. // result contains the result data.
// The first value contains only Fields information. // The first value contains only Fields information.
// The next values contain the actual rows, a few values per result. // The next values contain the actual rows, a few values per result.
Result *query.QueryResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2192,12 +2192,12 @@ func (m *StreamExecuteKeyRangesResponse) GetResult() *query.QueryResult { ...@@ -2192,12 +2192,12 @@ func (m *StreamExecuteKeyRangesResponse) GetResult() *query.QueryResult {
type BeginRequest struct { type BeginRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// single_db is deprecated. Use transaction_mode instead. // single_db is deprecated. Use transaction_mode instead.
// The value specifies if the transaction should be restricted // The value specifies if the transaction should be restricted
// to a single database. // to a single database.
// TODO(sougou): remove in 3.1 // TODO(sougou): remove in 3.1
SingleDb bool `protobuf:"varint,2,opt,name=single_db,json=singleDb" json:"single_db,omitempty"` SingleDb bool `protobuf:"varint,2,opt,name=single_db,json=singleDb,proto3" json:"single_db,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2244,7 +2244,7 @@ func (m *BeginRequest) GetSingleDb() bool { ...@@ -2244,7 +2244,7 @@ func (m *BeginRequest) GetSingleDb() bool {
// BeginResponse is the returned value from Begin. // BeginResponse is the returned value from Begin.
type BeginResponse struct { type BeginResponse struct {
// session is the initial session information to use for subsequent queries. // session is the initial session information to use for subsequent queries.
Session *Session `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2285,14 +2285,14 @@ func (m *BeginResponse) GetSession() *Session { ...@@ -2285,14 +2285,14 @@ func (m *BeginResponse) GetSession() *Session {
type CommitRequest struct { type CommitRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the current transaction data to commit. // session carries the current transaction data to commit.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
// atomic is deprecated. Use transaction_mode instead. // atomic is deprecated. Use transaction_mode instead.
// The value specifies if the commit should go through the // The value specifies if the commit should go through the
// 2PC workflow to ensure atomicity. // 2PC workflow to ensure atomicity.
// TODO(sougou): remove in 3.1 // TODO(sougou): remove in 3.1
Atomic bool `protobuf:"varint,3,opt,name=atomic" json:"atomic,omitempty"` Atomic bool `protobuf:"varint,3,opt,name=atomic,proto3" json:"atomic,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2378,9 +2378,9 @@ var xxx_messageInfo_CommitResponse proto.InternalMessageInfo ...@@ -2378,9 +2378,9 @@ var xxx_messageInfo_CommitResponse proto.InternalMessageInfo
type RollbackRequest struct { type RollbackRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// session carries the current transaction data to rollback. // session carries the current transaction data to rollback.
Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"` Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2459,9 +2459,9 @@ var xxx_messageInfo_RollbackResponse proto.InternalMessageInfo ...@@ -2459,9 +2459,9 @@ var xxx_messageInfo_RollbackResponse proto.InternalMessageInfo
type ResolveTransactionRequest struct { type ResolveTransactionRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// dtid is the dtid of the transaction to be resolved. // dtid is the dtid of the transaction to be resolved.
Dtid string `protobuf:"bytes,2,opt,name=dtid" json:"dtid,omitempty"` Dtid string `protobuf:"bytes,2,opt,name=dtid,proto3" json:"dtid,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2509,15 +2509,15 @@ func (m *ResolveTransactionRequest) GetDtid() string { ...@@ -2509,15 +2509,15 @@ func (m *ResolveTransactionRequest) GetDtid() string {
type MessageStreamRequest struct { type MessageStreamRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// shard to target the query to, for unsharded keyspaces. // shard to target the query to, for unsharded keyspaces.
Shard string `protobuf:"bytes,3,opt,name=shard" json:"shard,omitempty"` Shard string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
// KeyRange to target the query to, for sharded keyspaces. // KeyRange to target the query to, for sharded keyspaces.
KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange" json:"key_range,omitempty"` KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
// name is the message table name. // name is the message table name.
Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"` Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2586,13 +2586,13 @@ func (m *MessageStreamRequest) GetName() string { ...@@ -2586,13 +2586,13 @@ func (m *MessageStreamRequest) GetName() string {
type MessageAckRequest struct { type MessageAckRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// keyspace to target the message to. // keyspace to target the message to.
Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// name is the message table name. // name is the message table name.
Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
// ids is the list of ids to ack. // ids is the list of ids to ack.
Ids []*query.Value `protobuf:"bytes,4,rep,name=ids" json:"ids,omitempty"` Ids []*query.Value `protobuf:"bytes,4,rep,name=ids,proto3" json:"ids,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2654,7 +2654,7 @@ func (m *MessageAckRequest) GetIds() []*query.Value { ...@@ -2654,7 +2654,7 @@ func (m *MessageAckRequest) GetIds() []*query.Value {
// The kesypace_id represents the routing info for id. // The kesypace_id represents the routing info for id.
type IdKeyspaceId struct { type IdKeyspaceId struct {
// id represents the message id. // id represents the message id.
Id *query.Value `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` Id *query.Value `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
// keyspace_id is the associated keyspace_id for the id. // keyspace_id is the associated keyspace_id for the id.
KeyspaceId []byte `protobuf:"bytes,2,opt,name=keyspace_id,json=keyspaceId,proto3" json:"keyspace_id,omitempty"` KeyspaceId []byte `protobuf:"bytes,2,opt,name=keyspace_id,json=keyspaceId,proto3" json:"keyspace_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
...@@ -2704,12 +2704,12 @@ func (m *IdKeyspaceId) GetKeyspaceId() []byte { ...@@ -2704,12 +2704,12 @@ func (m *IdKeyspaceId) GetKeyspaceId() []byte {
type MessageAckKeyspaceIdsRequest struct { type MessageAckKeyspaceIdsRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// Optional keyspace for message table. // Optional keyspace for message table.
Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// name is the message table name. // name is the message table name.
Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
IdKeyspaceIds []*IdKeyspaceId `protobuf:"bytes,4,rep,name=id_keyspace_ids,json=idKeyspaceIds" json:"id_keyspace_ids,omitempty"` IdKeyspaceIds []*IdKeyspaceId `protobuf:"bytes,4,rep,name=id_keyspace_ids,json=idKeyspaceIds,proto3" json:"id_keyspace_ids,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2818,9 +2818,9 @@ var xxx_messageInfo_ResolveTransactionResponse proto.InternalMessageInfo ...@@ -2818,9 +2818,9 @@ var xxx_messageInfo_ResolveTransactionResponse proto.InternalMessageInfo
type SplitQueryRequest struct { type SplitQueryRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// The query and bind variables to produce splits for. // The query and bind variables to produce splits for.
// The given query must be a simple query of the form // The given query must be a simple query of the form
// SELECT <cols> FROM <table> WHERE <filter>. // SELECT <cols> FROM <table> WHERE <filter>.
...@@ -2828,7 +2828,7 @@ type SplitQueryRequest struct { ...@@ -2828,7 +2828,7 @@ type SplitQueryRequest struct {
// JOIN, GROUP BY, ORDER BY, LIMIT, DISTINCT. // JOIN, GROUP BY, ORDER BY, LIMIT, DISTINCT.
// Furthermore, <table> must be a single “concrete” table. // Furthermore, <table> must be a single “concrete” table.
// It cannot be a view. // It cannot be a view.
Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
// Each generated query-part will be restricted to rows whose values // Each generated query-part will be restricted to rows whose values
// in the columns listed in this field are in a particular range. // in the columns listed in this field are in a particular range.
// The list of columns named here must be a prefix of the list of // The list of columns named here must be a prefix of the list of
...@@ -2837,7 +2837,7 @@ type SplitQueryRequest struct { ...@@ -2837,7 +2837,7 @@ type SplitQueryRequest struct {
// (in order) is sufficient and this is the default if this field is omitted. // (in order) is sufficient and this is the default if this field is omitted.
// See the comment on the 'algorithm' field for more restrictions and // See the comment on the 'algorithm' field for more restrictions and
// information. // information.
SplitColumn []string `protobuf:"bytes,4,rep,name=split_column,json=splitColumn" json:"split_column,omitempty"` SplitColumn []string `protobuf:"bytes,4,rep,name=split_column,json=splitColumn,proto3" json:"split_column,omitempty"`
// You can specify either an estimate of the number of query-parts to // You can specify either an estimate of the number of query-parts to
// generate or an estimate of the number of rows each query-part should // generate or an estimate of the number of rows each query-part should
// return. // return.
...@@ -2850,8 +2850,8 @@ type SplitQueryRequest struct { ...@@ -2850,8 +2850,8 @@ type SplitQueryRequest struct {
// Note that if "split_count" is given it is regarded as an estimate. // Note that if "split_count" is given it is regarded as an estimate.
// The number of query-parts returned may differ slightly (in particular, // The number of query-parts returned may differ slightly (in particular,
// if it's not a whole multiple of the number of vitess shards). // if it's not a whole multiple of the number of vitess shards).
SplitCount int64 `protobuf:"varint,5,opt,name=split_count,json=splitCount" json:"split_count,omitempty"` SplitCount int64 `protobuf:"varint,5,opt,name=split_count,json=splitCount,proto3" json:"split_count,omitempty"`
NumRowsPerQueryPart int64 `protobuf:"varint,6,opt,name=num_rows_per_query_part,json=numRowsPerQueryPart" json:"num_rows_per_query_part,omitempty"` NumRowsPerQueryPart int64 `protobuf:"varint,6,opt,name=num_rows_per_query_part,json=numRowsPerQueryPart,proto3" json:"num_rows_per_query_part,omitempty"`
// The algorithm to use to split the query. The split algorithm is performed // The algorithm to use to split the query. The split algorithm is performed
// on each database shard in parallel. The lists of query-parts generated // on each database shard in parallel. The lists of query-parts generated
// by the shards are merged and returned to the caller. // by the shards are merged and returned to the caller.
...@@ -2881,12 +2881,12 @@ type SplitQueryRequest struct { ...@@ -2881,12 +2881,12 @@ type SplitQueryRequest struct {
// located between two successive boundary rows. // located between two successive boundary rows.
// This algorithm supports multiple split_column's of any type, // This algorithm supports multiple split_column's of any type,
// but is slower than EQUAL_SPLITS. // but is slower than EQUAL_SPLITS.
Algorithm query.SplitQueryRequest_Algorithm `protobuf:"varint,7,opt,name=algorithm,enum=query.SplitQueryRequest_Algorithm" json:"algorithm,omitempty"` Algorithm query.SplitQueryRequest_Algorithm `protobuf:"varint,7,opt,name=algorithm,proto3,enum=query.SplitQueryRequest_Algorithm" json:"algorithm,omitempty"`
// TODO(erez): This field is no longer used by the server code. // TODO(erez): This field is no longer used by the server code.
// Remove this field after this new server code is released to prod. // Remove this field after this new server code is released to prod.
// We must keep it for now, so that clients can still send it to the old // We must keep it for now, so that clients can still send it to the old
// server code currently in production. // server code currently in production.
UseSplitQueryV2 bool `protobuf:"varint,8,opt,name=use_split_query_v2,json=useSplitQueryV2" json:"use_split_query_v2,omitempty"` UseSplitQueryV2 bool `protobuf:"varint,8,opt,name=use_split_query_v2,json=useSplitQueryV2,proto3" json:"use_split_query_v2,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2975,7 +2975,7 @@ func (m *SplitQueryRequest) GetUseSplitQueryV2() bool { ...@@ -2975,7 +2975,7 @@ func (m *SplitQueryRequest) GetUseSplitQueryV2() bool {
// SplitQueryResponse is the returned value from SplitQuery. // SplitQueryResponse is the returned value from SplitQuery.
type SplitQueryResponse struct { type SplitQueryResponse struct {
// splits contains the queries to run to fetch the entire data set. // splits contains the queries to run to fetch the entire data set.
Splits []*SplitQueryResponse_Part `protobuf:"bytes,1,rep,name=splits" json:"splits,omitempty"` Splits []*SplitQueryResponse_Part `protobuf:"bytes,1,rep,name=splits,proto3" json:"splits,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3014,9 +3014,9 @@ func (m *SplitQueryResponse) GetSplits() []*SplitQueryResponse_Part { ...@@ -3014,9 +3014,9 @@ func (m *SplitQueryResponse) GetSplits() []*SplitQueryResponse_Part {
type SplitQueryResponse_KeyRangePart struct { type SplitQueryResponse_KeyRangePart struct {
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,1,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// key ranges to target the query to. // key ranges to target the query to.
KeyRanges []*topodata.KeyRange `protobuf:"bytes,2,rep,name=key_ranges,json=keyRanges" json:"key_ranges,omitempty"` KeyRanges []*topodata.KeyRange `protobuf:"bytes,2,rep,name=key_ranges,json=keyRanges,proto3" json:"key_ranges,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3062,9 +3062,9 @@ func (m *SplitQueryResponse_KeyRangePart) GetKeyRanges() []*topodata.KeyRange { ...@@ -3062,9 +3062,9 @@ func (m *SplitQueryResponse_KeyRangePart) GetKeyRanges() []*topodata.KeyRange {
type SplitQueryResponse_ShardPart struct { type SplitQueryResponse_ShardPart struct {
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,1,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// shards to target the query to. // shards to target the query to.
Shards []string `protobuf:"bytes,2,rep,name=shards" json:"shards,omitempty"` Shards []string `protobuf:"bytes,2,rep,name=shards,proto3" json:"shards,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3110,14 +3110,14 @@ func (m *SplitQueryResponse_ShardPart) GetShards() []string { ...@@ -3110,14 +3110,14 @@ func (m *SplitQueryResponse_ShardPart) GetShards() []string {
type SplitQueryResponse_Part struct { type SplitQueryResponse_Part struct {
// query is the query and bind variables to execute. // query is the query and bind variables to execute.
Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"` Query *query.BoundQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
// key_range_part is set if the query should be executed by // key_range_part is set if the query should be executed by
// ExecuteKeyRanges. // ExecuteKeyRanges.
KeyRangePart *SplitQueryResponse_KeyRangePart `protobuf:"bytes,2,opt,name=key_range_part,json=keyRangePart" json:"key_range_part,omitempty"` KeyRangePart *SplitQueryResponse_KeyRangePart `protobuf:"bytes,2,opt,name=key_range_part,json=keyRangePart,proto3" json:"key_range_part,omitempty"`
// shard_part is set if the query should be executed by ExecuteShards. // shard_part is set if the query should be executed by ExecuteShards.
ShardPart *SplitQueryResponse_ShardPart `protobuf:"bytes,3,opt,name=shard_part,json=shardPart" json:"shard_part,omitempty"` ShardPart *SplitQueryResponse_ShardPart `protobuf:"bytes,3,opt,name=shard_part,json=shardPart,proto3" json:"shard_part,omitempty"`
// size is the approximate number of rows this query will return. // size is the approximate number of rows this query will return.
Size int64 `protobuf:"varint,4,opt,name=size" json:"size,omitempty"` Size int64 `protobuf:"varint,4,opt,name=size,proto3" json:"size,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3178,7 +3178,7 @@ func (m *SplitQueryResponse_Part) GetSize() int64 { ...@@ -3178,7 +3178,7 @@ func (m *SplitQueryResponse_Part) GetSize() int64 {
// GetSrvKeyspaceRequest is the payload to GetSrvKeyspace. // GetSrvKeyspaceRequest is the payload to GetSrvKeyspace.
type GetSrvKeyspaceRequest struct { type GetSrvKeyspaceRequest struct {
// keyspace name to fetch. // keyspace name to fetch.
Keyspace string `protobuf:"bytes,1,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3218,7 +3218,7 @@ func (m *GetSrvKeyspaceRequest) GetKeyspace() string { ...@@ -3218,7 +3218,7 @@ func (m *GetSrvKeyspaceRequest) GetKeyspace() string {
// GetSrvKeyspaceResponse is the returned value from GetSrvKeyspace. // GetSrvKeyspaceResponse is the returned value from GetSrvKeyspace.
type GetSrvKeyspaceResponse struct { type GetSrvKeyspaceResponse struct {
// srv_keyspace is the topology object for the SrvKeyspace. // srv_keyspace is the topology object for the SrvKeyspace.
SrvKeyspace *topodata.SrvKeyspace `protobuf:"bytes,1,opt,name=srv_keyspace,json=srvKeyspace" json:"srv_keyspace,omitempty"` SrvKeyspace *topodata.SrvKeyspace `protobuf:"bytes,1,opt,name=srv_keyspace,json=srvKeyspace,proto3" json:"srv_keyspace,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3259,24 +3259,24 @@ func (m *GetSrvKeyspaceResponse) GetSrvKeyspace() *topodata.SrvKeyspace { ...@@ -3259,24 +3259,24 @@ func (m *GetSrvKeyspaceResponse) GetSrvKeyspace() *topodata.SrvKeyspace {
type UpdateStreamRequest struct { type UpdateStreamRequest struct {
// caller_id identifies the caller. This is the effective caller ID, // caller_id identifies the caller. This is the effective caller ID,
// set by the application to further identify the caller. // set by the application to further identify the caller.
CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId" json:"caller_id,omitempty"` CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
// keyspace to target the query to. // keyspace to target the query to.
Keyspace string `protobuf:"bytes,2,opt,name=keyspace" json:"keyspace,omitempty"` Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
// shard to target the query to, for unsharded keyspaces. // shard to target the query to, for unsharded keyspaces.
Shard string `protobuf:"bytes,3,opt,name=shard" json:"shard,omitempty"` Shard string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
// KeyRange to target the query to, for sharded keyspaces. // KeyRange to target the query to, for sharded keyspaces.
KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange" json:"key_range,omitempty"` KeyRange *topodata.KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
// tablet_type is the type of tablets that this request is targeted to. // tablet_type is the type of tablets that this request is targeted to.
TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,enum=topodata.TabletType" json:"tablet_type,omitempty"` TabletType topodata.TabletType `protobuf:"varint,5,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
// timestamp is the timestamp to start the stream from. It is // timestamp is the timestamp to start the stream from. It is
// unused is event is set, and we are only streaming from the shard // unused is event is set, and we are only streaming from the shard
// described by event.shard. // described by event.shard.
Timestamp int64 `protobuf:"varint,6,opt,name=timestamp" json:"timestamp,omitempty"` Timestamp int64 `protobuf:"varint,6,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
// event is the event to start the stream from. // event is the event to start the stream from.
// Note it is only used if we are streaming from exactly the same shard // Note it is only used if we are streaming from exactly the same shard
// as this event was coming from. Otherwise we can't use this event, // as this event was coming from. Otherwise we can't use this event,
// and will use the timestamp as a starting point. // and will use the timestamp as a starting point.
Event *query.EventToken `protobuf:"bytes,7,opt,name=event" json:"event,omitempty"` Event *query.EventToken `protobuf:"bytes,7,opt,name=event,proto3" json:"event,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -3358,13 +3358,13 @@ func (m *UpdateStreamRequest) GetEvent() *query.EventToken { ...@@ -3358,13 +3358,13 @@ func (m *UpdateStreamRequest) GetEvent() *query.EventToken {
// UpdateStreamResponse is streamed by UpdateStream. // UpdateStreamResponse is streamed by UpdateStream.
type UpdateStreamResponse struct { type UpdateStreamResponse struct {
// event is one event from the stream. // event is one event from the stream.
Event *query.StreamEvent `protobuf:"bytes,1,opt,name=event" json:"event,omitempty"` Event *query.StreamEvent `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
// resume_timestamp is the timestamp to resume streaming from if the // resume_timestamp is the timestamp to resume streaming from if the
// client is interrupted. If the Update Stream only goes to one // client is interrupted. If the Update Stream only goes to one
// shard, this is equal to event.timestamp. If the Update Stream // shard, this is equal to event.timestamp. If the Update Stream
// goes to multiple shards and aggregates, this is the minimum value // goes to multiple shards and aggregates, this is the minimum value
// of the current timestamp for all shards. // of the current timestamp for all shards.
ResumeTimestamp int64 `protobuf:"varint,2,opt,name=resume_timestamp,json=resumeTimestamp" json:"resume_timestamp,omitempty"` ResumeTimestamp int64 `protobuf:"varint,2,opt,name=resume_timestamp,json=resumeTimestamp,proto3" json:"resume_timestamp,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
......
...@@ -293,15 +293,15 @@ type CallerID struct { ...@@ -293,15 +293,15 @@ type CallerID struct {
// came from an automated job or another system component. // came from an automated job or another system component.
// If the request comes directly from the Internet, or if the Vitess client // If the request comes directly from the Internet, or if the Vitess client
// takes action on its own accord, it is okay for this field to be absent. // takes action on its own accord, it is okay for this field to be absent.
Principal string `protobuf:"bytes,1,opt,name=principal" json:"principal,omitempty"` Principal string `protobuf:"bytes,1,opt,name=principal,proto3" json:"principal,omitempty"`
// component describes the running process of the effective caller. // component describes the running process of the effective caller.
// It can for instance be the hostname:port of the servlet initiating the // It can for instance be the hostname:port of the servlet initiating the
// database call, or the container engine ID used by the servlet. // database call, or the container engine ID used by the servlet.
Component string `protobuf:"bytes,2,opt,name=component" json:"component,omitempty"` Component string `protobuf:"bytes,2,opt,name=component,proto3" json:"component,omitempty"`
// subcomponent describes a component inisde the immediate caller which // subcomponent describes a component inisde the immediate caller which
// is responsible for generating is request. Suggested values are a // is responsible for generating is request. Suggested values are a
// servlet name or an API endpoint name. // servlet name or an API endpoint name.
Subcomponent string `protobuf:"bytes,3,opt,name=subcomponent" json:"subcomponent,omitempty"` Subcomponent string `protobuf:"bytes,3,opt,name=subcomponent,proto3" json:"subcomponent,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -357,9 +357,9 @@ func (m *CallerID) GetSubcomponent() string { ...@@ -357,9 +357,9 @@ func (m *CallerID) GetSubcomponent() string {
// We use this so the clients don't have to parse the error messages, // We use this so the clients don't have to parse the error messages,
// but instead can depend on the value of the code. // but instead can depend on the value of the code.
type RPCError struct { type RPCError struct {
LegacyCode LegacyErrorCode `protobuf:"varint,1,opt,name=legacy_code,json=legacyCode,enum=vtrpc.LegacyErrorCode" json:"legacy_code,omitempty"` LegacyCode LegacyErrorCode `protobuf:"varint,1,opt,name=legacy_code,json=legacyCode,proto3,enum=vtrpc.LegacyErrorCode" json:"legacy_code,omitempty"`
Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"` Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
Code Code `protobuf:"varint,3,opt,name=code,enum=vtrpc.Code" json:"code,omitempty"` Code Code `protobuf:"varint,3,opt,name=code,proto3,enum=vtrpc.Code" json:"code,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
......
...@@ -6,6 +6,7 @@ package sqlparser ...@@ -6,6 +6,7 @@ package sqlparser
import __yyfmt__ "fmt" import __yyfmt__ "fmt"
//line sql.y:18 //line sql.y:18
func setParseTree(yylex interface{}, stmt Statement) { func setParseTree(yylex interface{}, stmt Statement) {
yylex.(*Tokenizer).ParseTree = stmt yylex.(*Tokenizer).ParseTree = stmt
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册