update vendor

vendor/github.com/golang/protobuf/proto/deprecated.go

@@ -31,8 +31,33 @@
 
 package proto
 
+import "errors"
+
 // Deprecated: do not use.
 type Stats struct{ Emalloc, Dmalloc, Encode, Decode, Chit, Cmiss, Size uint64 }
 
 // Deprecated: do not use.
 func GetStats() Stats { return Stats{} }
+
+// Deprecated: do not use.
+func MarshalMessageSet(interface{}) ([]byte, error) {
+	return nil, errors.New("proto: not implemented")
+}
+
+// Deprecated: do not use.
+func UnmarshalMessageSet([]byte, interface{}) error {
+	return errors.New("proto: not implemented")
+}
+
+// Deprecated: do not use.
+func MarshalMessageSetJSON(interface{}) ([]byte, error) {
+	return nil, errors.New("proto: not implemented")
+}
+
+// Deprecated: do not use.
+func UnmarshalMessageSetJSON([]byte, interface{}) error {
+	return errors.New("proto: not implemented")
+}
+
+// Deprecated: do not use.
+func RegisterMessageSetType(Message, int32, string) {}

vendor/github.com/golang/protobuf/proto/equal.go

@@ -246,7 +246,8 @@ func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool {
 			return false
 		}
 
-		m1, m2 := e1.value, e2.value
+		m1 := extensionAsLegacyType(e1.value)
+		m2 := extensionAsLegacyType(e2.value)
 
 		if m1 == nil && m2 == nil {
 			// Both have only encoded form.

vendor/github.com/golang/protobuf/proto/extensions.go

@@ -185,9 +185,25 @@ type Extension struct {
 	// extension will have only enc set. When such an extension is
 	// accessed using GetExtension (or GetExtensions) desc and value
 	// will be set.
-	desc  *ExtensionDesc
+	desc *ExtensionDesc
+
+	// value is a concrete value for the extension field. Let the type of
+	// desc.ExtensionType be the "API type" and the type of Extension.value
+	// be the "storage type". The API type and storage type are the same except:
+	//	* For scalars (except []byte), the API type uses *T,
+	//	while the storage type uses T.
+	//	* For repeated fields, the API type uses []T, while the storage type
+	//	uses *[]T.
+	//
+	// The reason for the divergence is so that the storage type more naturally
+	// matches what is expected of when retrieving the values through the
+	// protobuf reflection APIs.
+	//
+	// The value may only be populated if desc is also populated.
 	value interface{}
-	enc   []byte
+
+	// enc is the raw bytes for the extension field.
+	enc []byte
 }
 
 // SetRawExtension is for testing only.
@@ -334,7 +350,7 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
 			// descriptors with the same field number.
 			return nil, errors.New("proto: descriptor conflict")
 		}
-		return e.value, nil
+		return extensionAsLegacyType(e.value), nil
 	}
 
 	if extension.ExtensionType == nil {
@@ -349,11 +365,11 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
 
 	// Remember the decoded version and drop the encoded version.
 	// That way it is safe to mutate what we return.
-	e.value = v
+	e.value = extensionAsStorageType(v)
 	e.desc = extension
 	e.enc = nil
 	emap[extension.Field] = e
-	return e.value, nil
+	return extensionAsLegacyType(e.value), nil
 }
 
 // defaultExtensionValue returns the default value for extension.
@@ -500,7 +516,7 @@ func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error
 	}
 
 	extmap := epb.extensionsWrite()
-	extmap[extension.Field] = Extension{desc: extension, value: value}
+	extmap[extension.Field] = Extension{desc: extension, value: extensionAsStorageType(value)}
 	return nil
 }
 
@@ -541,3 +557,51 @@ func RegisterExtension(desc *ExtensionDesc) {
 func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
 	return extensionMaps[reflect.TypeOf(pb).Elem()]
 }
+
+// extensionAsLegacyType converts an value in the storage type as the API type.
+// See Extension.value.
+func extensionAsLegacyType(v interface{}) interface{} {
+	switch rv := reflect.ValueOf(v); rv.Kind() {
+	case reflect.Bool, reflect.Int32, reflect.Int64, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.String:
+		// Represent primitive types as a pointer to the value.
+		rv2 := reflect.New(rv.Type())
+		rv2.Elem().Set(rv)
+		v = rv2.Interface()
+	case reflect.Ptr:
+		// Represent slice types as the value itself.
+		switch rv.Type().Elem().Kind() {
+		case reflect.Slice:
+			if rv.IsNil() {
+				v = reflect.Zero(rv.Type().Elem()).Interface()
+			} else {
+				v = rv.Elem().Interface()
+			}
+		}
+	}
+	return v
+}
+
+// extensionAsStorageType converts an value in the API type as the storage type.
+// See Extension.value.
+func extensionAsStorageType(v interface{}) interface{} {
+	switch rv := reflect.ValueOf(v); rv.Kind() {
+	case reflect.Ptr:
+		// Represent slice types as the value itself.
+		switch rv.Type().Elem().Kind() {
+		case reflect.Bool, reflect.Int32, reflect.Int64, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.String:
+			if rv.IsNil() {
+				v = reflect.Zero(rv.Type().Elem()).Interface()
+			} else {
+				v = rv.Elem().Interface()
+			}
+		}
+	case reflect.Slice:
+		// Represent slice types as a pointer to the value.
+		if rv.Type().Elem().Kind() != reflect.Uint8 {
+			rv2 := reflect.New(rv.Type())
+			rv2.Elem().Set(rv)
+			v = rv2.Interface()
+		}
+	}
+	return v
+}

vendor/github.com/golang/protobuf/proto/lib.go

@@ -940,13 +940,19 @@ func isProto3Zero(v reflect.Value) bool {
 	return false
 }
 
-// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const ProtoPackageIsVersion2 = true
-
-// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const ProtoPackageIsVersion1 = true
+const (
+	// ProtoPackageIsVersion3 is referenced from generated protocol buffer files
+	// to assert that that code is compatible with this version of the proto package.
+	ProtoPackageIsVersion3 = true
+
+	// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
+	// to assert that that code is compatible with this version of the proto package.
+	ProtoPackageIsVersion2 = true
+
+	// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
+	// to assert that that code is compatible with this version of the proto package.
+	ProtoPackageIsVersion1 = true
+)
 
 // InternalMessageInfo is a type used internally by generated .pb.go files.
 // This type is not intended to be used by non-generated code.

vendor/github.com/golang/protobuf/proto/message_set.go

@@ -36,13 +36,7 @@ package proto
  */
 
 import (
-	"bytes"
-	"encoding/json"
 	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-	"sync"
 )
 
 // errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
@@ -145,46 +139,9 @@ func skipVarint(buf []byte) []byte {
 	return buf[i+1:]
 }
 
-// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
-// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSet(exts interface{}) ([]byte, error) {
-	return marshalMessageSet(exts, false)
-}
-
-// marshaMessageSet implements above function, with the opt to turn on / off deterministic during Marshal.
-func marshalMessageSet(exts interface{}, deterministic bool) ([]byte, error) {
-	switch exts := exts.(type) {
-	case *XXX_InternalExtensions:
-		var u marshalInfo
-		siz := u.sizeMessageSet(exts)
-		b := make([]byte, 0, siz)
-		return u.appendMessageSet(b, exts, deterministic)
-
-	case map[int32]Extension:
-		// This is an old-style extension map.
-		// Wrap it in a new-style XXX_InternalExtensions.
-		ie := XXX_InternalExtensions{
-			p: &struct {
-				mu           sync.Mutex
-				extensionMap map[int32]Extension
-			}{
-				extensionMap: exts,
-			},
-		}
-
-		var u marshalInfo
-		siz := u.sizeMessageSet(&ie)
-		b := make([]byte, 0, siz)
-		return u.appendMessageSet(b, &ie, deterministic)
-
-	default:
-		return nil, errors.New("proto: not an extension map")
-	}
-}
-
-// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
+// unmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
 // It is called by Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSet(buf []byte, exts interface{}) error {
+func unmarshalMessageSet(buf []byte, exts interface{}) error {
 	var m map[int32]Extension
 	switch exts := exts.(type) {
 	case *XXX_InternalExtensions:
@@ -222,93 +179,3 @@ func UnmarshalMessageSet(buf []byte, exts interface{}) error {
 	}
 	return nil
 }
-
-// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
-// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSetJSON(exts interface{}) ([]byte, error) {
-	var m map[int32]Extension
-	switch exts := exts.(type) {
-	case *XXX_InternalExtensions:
-		var mu sync.Locker
-		m, mu = exts.extensionsRead()
-		if m != nil {
-			// Keep the extensions map locked until we're done marshaling to prevent
-			// races between marshaling and unmarshaling the lazily-{en,de}coded
-			// values.
-			mu.Lock()
-			defer mu.Unlock()
-		}
-	case map[int32]Extension:
-		m = exts
-	default:
-		return nil, errors.New("proto: not an extension map")
-	}
-	var b bytes.Buffer
-	b.WriteByte('{')
-
-	// Process the map in key order for deterministic output.
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
-
-	for i, id := range ids {
-		ext := m[id]
-		msd, ok := messageSetMap[id]
-		if !ok {
-			// Unknown type; we can't render it, so skip it.
-			continue
-		}
-
-		if i > 0 && b.Len() > 1 {
-			b.WriteByte(',')
-		}
-
-		fmt.Fprintf(&b, `"[%s]":`, msd.name)
-
-		x := ext.value
-		if x == nil {
-			x = reflect.New(msd.t.Elem()).Interface()
-			if err := Unmarshal(ext.enc, x.(Message)); err != nil {
-				return nil, err
-			}
-		}
-		d, err := json.Marshal(x)
-		if err != nil {
-			return nil, err
-		}
-		b.Write(d)
-	}
-	b.WriteByte('}')
-	return b.Bytes(), nil
-}
-
-// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
-// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSetJSON(buf []byte, exts interface{}) error {
-	// Common-case fast path.
-	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
-		return nil
-	}
-
-	// This is fairly tricky, and it's not clear that it is needed.
-	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
-}
-
-// A global registry of types that can be used in a MessageSet.
-
-var messageSetMap = make(map[int32]messageSetDesc)
-
-type messageSetDesc struct {
-	t    reflect.Type // pointer to struct
-	name string
-}
-
-// RegisterMessageSetType is called from the generated code.
-func RegisterMessageSetType(m Message, fieldNum int32, name string) {
-	messageSetMap[fieldNum] = messageSetDesc{
-		t:    reflect.TypeOf(m),
-		name: name,
-	}
-}

vendor/github.com/golang/protobuf/proto/pointer_reflect.go

@@ -79,10 +79,13 @@ func toPointer(i *Message) pointer {
 
 // toAddrPointer converts an interface to a pointer that points to
 // the interface data.
-func toAddrPointer(i *interface{}, isptr bool) pointer {
+func toAddrPointer(i *interface{}, isptr, deref bool) pointer {
 	v := reflect.ValueOf(*i)
 	u := reflect.New(v.Type())
 	u.Elem().Set(v)
+	if deref {
+		u = u.Elem()
+	}
 	return pointer{v: u}
 }
 

vendor/github.com/golang/protobuf/proto/pointer_unsafe.go

@@ -85,16 +85,21 @@ func toPointer(i *Message) pointer {
 
 // toAddrPointer converts an interface to a pointer that points to
 // the interface data.
-func toAddrPointer(i *interface{}, isptr bool) pointer {
+func toAddrPointer(i *interface{}, isptr, deref bool) (p pointer) {
 	// Super-tricky - read or get the address of data word of interface value.
 	if isptr {
 		// The interface is of pointer type, thus it is a direct interface.
 		// The data word is the pointer data itself. We take its address.
-		return pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)}
+		p = pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)}
+	} else {
+		// The interface is not of pointer type. The data word is the pointer
+		// to the data.
+		p = pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
 	}
-	// The interface is not of pointer type. The data word is the pointer
-	// to the data.
-	return pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
+	if deref {
+		p.p = *(*unsafe.Pointer)(p.p)
+	}
+	return p
 }
 
 // valToPointer converts v to a pointer. v must be of pointer type.

vendor/github.com/golang/protobuf/proto/properties.go

@@ -38,7 +38,6 @@ package proto
 import (
 	"fmt"
 	"log"
-	"os"
 	"reflect"
 	"sort"
 	"strconv"
@@ -194,7 +193,7 @@ func (p *Properties) Parse(s string) {
 	// "bytes,49,opt,name=foo,def=hello!"
 	fields := strings.Split(s, ",") // breaks def=, but handled below.
 	if len(fields) < 2 {
-		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
+		log.Printf("proto: tag has too few fields: %q", s)
 		return
 	}
 
@@ -214,7 +213,7 @@ func (p *Properties) Parse(s string) {
 		p.WireType = WireBytes
 		// no numeric converter for non-numeric types
 	default:
-		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
+		log.Printf("proto: tag has unknown wire type: %q", s)
 		return
 	}
 
@@ -343,6 +342,15 @@ func GetProperties(t reflect.Type) *StructProperties {
 	return sprop
 }
 
+type (
+	oneofFuncsIface interface {
+		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
+	}
+	oneofWrappersIface interface {
+		XXX_OneofWrappers() []interface{}
+	}
+)
+
 // getPropertiesLocked requires that propertiesMu is held.
 func getPropertiesLocked(t reflect.Type) *StructProperties {
 	if prop, ok := propertiesMap[t]; ok {
@@ -382,13 +390,14 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 	// Re-order prop.order.
 	sort.Sort(prop)
 
-	type oneofMessage interface {
-		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
+	var oots []interface{}
+	switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
+	case oneofFuncsIface:
+		_, _, _, oots = m.XXX_OneofFuncs()
+	case oneofWrappersIface:
+		oots = m.XXX_OneofWrappers()
 	}
-	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
-		var oots []interface{}
-		_, _, _, oots = om.XXX_OneofFuncs()
-
+	if len(oots) > 0 {
 		// Interpret oneof metadata.
 		prop.OneofTypes = make(map[string]*OneofProperties)
 		for _, oot := range oots {

vendor/github.com/golang/protobuf/proto/table_marshal.go

@@ -87,6 +87,7 @@ type marshalElemInfo struct {
 	sizer     sizer
 	marshaler marshaler
 	isptr     bool // elem is pointer typed, thus interface of this type is a direct interface (extension only)
+	deref     bool // dereference the pointer before operating on it; implies isptr
 }
 
 var (
@@ -320,8 +321,11 @@ func (u *marshalInfo) computeMarshalInfo() {
 
 	// get oneof implementers
 	var oneofImplementers []interface{}
-	if m, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
+	switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
+	case oneofFuncsIface:
 		_, _, _, oneofImplementers = m.XXX_OneofFuncs()
+	case oneofWrappersIface:
+		oneofImplementers = m.XXX_OneofWrappers()
 	}
 
 	n := t.NumField()
@@ -407,13 +411,22 @@ func (u *marshalInfo) getExtElemInfo(desc *ExtensionDesc) *marshalElemInfo {
 		panic("tag is not an integer")
 	}
 	wt := wiretype(tags[0])
+	if t.Kind() == reflect.Ptr && t.Elem().Kind() != reflect.Struct {
+		t = t.Elem()
+	}
 	sizer, marshaler := typeMarshaler(t, tags, false, false)
+	var deref bool
+	if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 {
+		t = reflect.PtrTo(t)
+		deref = true
+	}
 	e = &marshalElemInfo{
 		wiretag:   uint64(tag)<<3 | wt,
 		tagsize:   SizeVarint(uint64(tag) << 3),
 		sizer:     sizer,
 		marshaler: marshaler,
 		isptr:     t.Kind() == reflect.Ptr,
+		deref:     deref,
 	}
 
 	// update cache
@@ -476,10 +489,6 @@ func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofI
 	}
 }
 
-type oneofMessage interface {
-	XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
-}
-
 // wiretype returns the wire encoding of the type.
 func wiretype(encoding string) uint64 {
 	switch encoding {
@@ -2310,8 +2319,8 @@ func makeMapMarshaler(f *reflect.StructField) (sizer, marshaler) {
 			for _, k := range m.MapKeys() {
 				ki := k.Interface()
 				vi := m.MapIndex(k).Interface()
-				kaddr := toAddrPointer(&ki, false)             // pointer to key
-				vaddr := toAddrPointer(&vi, valIsPtr)          // pointer to value
+				kaddr := toAddrPointer(&ki, false, false)      // pointer to key
+				vaddr := toAddrPointer(&vi, valIsPtr, false)   // pointer to value
 				siz := keySizer(kaddr, 1) + valSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1)
 				n += siz + SizeVarint(uint64(siz)) + tagsize
 			}
@@ -2329,8 +2338,8 @@ func makeMapMarshaler(f *reflect.StructField) (sizer, marshaler) {
 			for _, k := range keys {
 				ki := k.Interface()
 				vi := m.MapIndex(k).Interface()
-				kaddr := toAddrPointer(&ki, false)    // pointer to key
-				vaddr := toAddrPointer(&vi, valIsPtr) // pointer to value
+				kaddr := toAddrPointer(&ki, false, false)    // pointer to key
+				vaddr := toAddrPointer(&vi, valIsPtr, false) // pointer to value
 				b = appendVarint(b, tag)
 				siz := keySizer(kaddr, 1) + valCachedSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1)
 				b = appendVarint(b, uint64(siz))
@@ -2399,7 +2408,7 @@ func (u *marshalInfo) sizeExtensions(ext *XXX_InternalExtensions) int {
 		// the last time this function was called.
 		ei := u.getExtElemInfo(e.desc)
 		v := e.value
-		p := toAddrPointer(&v, ei.isptr)
+		p := toAddrPointer(&v, ei.isptr, ei.deref)
 		n += ei.sizer(p, ei.tagsize)
 	}
 	mu.Unlock()
@@ -2434,7 +2443,7 @@ func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, de
 
 			ei := u.getExtElemInfo(e.desc)
 			v := e.value
-			p := toAddrPointer(&v, ei.isptr)
+			p := toAddrPointer(&v, ei.isptr, ei.deref)
 			b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
 			if !nerr.Merge(err) {
 				return b, err
@@ -2465,7 +2474,7 @@ func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, de
 
 		ei := u.getExtElemInfo(e.desc)
 		v := e.value
-		p := toAddrPointer(&v, ei.isptr)
+		p := toAddrPointer(&v, ei.isptr, ei.deref)
 		b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
 		if !nerr.Merge(err) {
 			return b, err
@@ -2510,7 +2519,7 @@ func (u *marshalInfo) sizeMessageSet(ext *XXX_InternalExtensions) int {
 
 		ei := u.getExtElemInfo(e.desc)
 		v := e.value
-		p := toAddrPointer(&v, ei.isptr)
+		p := toAddrPointer(&v, ei.isptr, ei.deref)
 		n += ei.sizer(p, 1) // message, tag = 3 (size=1)
 	}
 	mu.Unlock()
@@ -2553,7 +2562,7 @@ func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, de
 
 			ei := u.getExtElemInfo(e.desc)
 			v := e.value
-			p := toAddrPointer(&v, ei.isptr)
+			p := toAddrPointer(&v, ei.isptr, ei.deref)
 			b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic)
 			if !nerr.Merge(err) {
 				return b, err
@@ -2591,7 +2600,7 @@ func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, de
 
 		ei := u.getExtElemInfo(e.desc)
 		v := e.value
-		p := toAddrPointer(&v, ei.isptr)
+		p := toAddrPointer(&v, ei.isptr, ei.deref)
 		b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic)
 		b = append(b, 1<<3|WireEndGroup)
 		if !nerr.Merge(err) {
@@ -2621,7 +2630,7 @@ func (u *marshalInfo) sizeV1Extensions(m map[int32]Extension) int {
 
 		ei := u.getExtElemInfo(e.desc)
 		v := e.value
-		p := toAddrPointer(&v, ei.isptr)
+		p := toAddrPointer(&v, ei.isptr, ei.deref)
 		n += ei.sizer(p, ei.tagsize)
 	}
 	return n
@@ -2656,7 +2665,7 @@ func (u *marshalInfo) appendV1Extensions(b []byte, m map[int32]Extension, determ
 
 		ei := u.getExtElemInfo(e.desc)
 		v := e.value
-		p := toAddrPointer(&v, ei.isptr)
+		p := toAddrPointer(&v, ei.isptr, ei.deref)
 		b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
 		if !nerr.Merge(err) {
 			return b, err

vendor/github.com/golang/protobuf/proto/table_unmarshal.go

@@ -136,7 +136,7 @@ func (u *unmarshalInfo) unmarshal(m pointer, b []byte) error {
 		u.computeUnmarshalInfo()
 	}
 	if u.isMessageSet {
-		return UnmarshalMessageSet(b, m.offset(u.extensions).toExtensions())
+		return unmarshalMessageSet(b, m.offset(u.extensions).toExtensions())
 	}
 	var reqMask uint64 // bitmask of required fields we've seen.
 	var errLater error
@@ -362,46 +362,48 @@ func (u *unmarshalInfo) computeUnmarshalInfo() {
 	}
 
 	// Find any types associated with oneof fields.
-	// TODO: XXX_OneofFuncs returns more info than we need.  Get rid of some of it?
-	fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("XXX_OneofFuncs")
-	if fn.IsValid() {
-		res := fn.Call(nil)[3] // last return value from XXX_OneofFuncs: []interface{}
-		for i := res.Len() - 1; i >= 0; i-- {
-			v := res.Index(i)                             // interface{}
-			tptr := reflect.ValueOf(v.Interface()).Type() // *Msg_X
-			typ := tptr.Elem()                            // Msg_X
-
-			f := typ.Field(0) // oneof implementers have one field
-			baseUnmarshal := fieldUnmarshaler(&f)
-			tags := strings.Split(f.Tag.Get("protobuf"), ",")
-			fieldNum, err := strconv.Atoi(tags[1])
-			if err != nil {
-				panic("protobuf tag field not an integer: " + tags[1])
-			}
-			var name string
-			for _, tag := range tags {
-				if strings.HasPrefix(tag, "name=") {
-					name = strings.TrimPrefix(tag, "name=")
-					break
-				}
+	var oneofImplementers []interface{}
+	switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
+	case oneofFuncsIface:
+		_, _, _, oneofImplementers = m.XXX_OneofFuncs()
+	case oneofWrappersIface:
+		oneofImplementers = m.XXX_OneofWrappers()
+	}
+	for _, v := range oneofImplementers {
+		tptr := reflect.TypeOf(v) // *Msg_X
+		typ := tptr.Elem()        // Msg_X
+
+		f := typ.Field(0) // oneof implementers have one field
+		baseUnmarshal := fieldUnmarshaler(&f)
+		tags := strings.Split(f.Tag.Get("protobuf"), ",")
+		fieldNum, err := strconv.Atoi(tags[1])
+		if err != nil {
+			panic("protobuf tag field not an integer: " + tags[1])
+		}
+		var name string
+		for _, tag := range tags {
+			if strings.HasPrefix(tag, "name=") {
+				name = strings.TrimPrefix(tag, "name=")
+				break
 			}
+		}
 
-			// Find the oneof field that this struct implements.
-			// Might take O(n^2) to process all of the oneofs, but who cares.
-			for _, of := range oneofFields {
-				if tptr.Implements(of.ityp) {
-					// We have found the corresponding interface for this struct.
-					// That lets us know where this struct should be stored
-					// when we encounter it during unmarshaling.
-					unmarshal := makeUnmarshalOneof(typ, of.ityp, baseUnmarshal)
-					u.setTag(fieldNum, of.field, unmarshal, 0, name)
-				}
+		// Find the oneof field that this struct implements.
+		// Might take O(n^2) to process all of the oneofs, but who cares.
+		for _, of := range oneofFields {
+			if tptr.Implements(of.ityp) {
+				// We have found the corresponding interface for this struct.
+				// That lets us know where this struct should be stored
+				// when we encounter it during unmarshaling.
+				unmarshal := makeUnmarshalOneof(typ, of.ityp, baseUnmarshal)
+				u.setTag(fieldNum, of.field, unmarshal, 0, name)
 			}
 		}
+
 	}
 
 	// Get extension ranges, if any.
-	fn = reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray")
+	fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray")
 	if fn.IsValid() {
 		if !u.extensions.IsValid() && !u.oldExtensions.IsValid() {
 			panic("a message with extensions, but no extensions field in " + t.Name())

vendor/github.com/golang/protobuf/proto/text.go

@@ -456,6 +456,8 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 	return nil
 }
 
+var textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem()
+
 // writeAny writes an arbitrary field.
 func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
 	v = reflect.Indirect(v)
@@ -519,8 +521,8 @@ func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Propert
 			// mutating this value.
 			v = v.Addr()
 		}
-		if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
-			text, err := etm.MarshalText()
+		if v.Type().Implements(textMarshalerType) {
+			text, err := v.Interface().(encoding.TextMarshaler).MarshalText()
 			if err != nil {
 				return err
 			}

vendor/github.com/pingcap/parser/ast/ddl.go

@@ -428,6 +428,7 @@ const (
 	ColumnOptionCollate
 	ColumnOptionCheck
 	ColumnOptionColumnFormat
+	ColumnOptionStorage
 )
 
 var (
@@ -525,6 +526,9 @@ func (n *ColumnOption) Restore(ctx *RestoreCtx) error {
 	case ColumnOptionColumnFormat:
 		ctx.WriteKeyWord("COLUMN_FORMAT ")
 		ctx.WriteKeyWord(n.StrValue)
+	case ColumnOptionStorage:
+		ctx.WriteKeyWord("STORAGE ")
+		ctx.WriteKeyWord(n.StrValue)
 	default:
 		return errors.New("An error occurred while splicing ColumnOption")
 	}

vendor/github.com/pingcap/parser/ast/dml.go

@@ -1828,6 +1828,7 @@ const (
 	ShowOpenTables
 	ShowAnalyzeStatus
 	ShowRegions
+	ShowBuiltins
 )
 
 const (
@@ -2018,6 +2019,8 @@ func (n *ShowStmt) Restore(ctx *RestoreCtx) error {
 
 	case ShowPrivileges:
 		ctx.WriteKeyWord("PRIVILEGES")
+	case ShowBuiltins:
+		ctx.WriteKeyWord("BUILTINS")
 	// ShowTargetFilterable
 	default:
 		switch n.Tp {

vendor/github.com/pingcap/parser/ast/misc.go

@@ -333,6 +333,7 @@ type ExecuteStmt struct {
 	UsingVars  []ExprNode
 	BinaryArgs interface{}
 	ExecID     uint32
+	IdxInMulti int
 }
 
 // Restore implements Node interface.

vendor/github.com/pingcap/parser/misc.go

@@ -170,6 +170,7 @@ var tokenMap = map[string]int{
 	"BOTH":                     both,
 	"BTREE":                    btree,
 	"BUCKETS":                  buckets,
+	"BUILTINS":                 builtins,
 	"BY":                       by,
 	"BYTE":                     byteType,
 	"CANCEL":                   cancel,

vendor/github.com/pingcap/parser/parser.y

@@ -565,6 +565,7 @@ import (
 	/* The following tokens belong to TiDBKeyword. Notice: make sure these tokens are contained in TiDBKeyword. */
 	admin		"ADMIN"
 	buckets		"BUCKETS"
+	builtins    "BUILTINS"
 	cancel		"CANCEL"
 	cmSketch	"CMSKETCH"
 	ddl		"DDL"
@@ -1128,6 +1129,7 @@ import (
 	logOr			"logical or operator"
 	LinearOpt		"linear or empty"
 	FieldsOrColumns 	"Fields or columns"
+	StorageMedia		"{DISK|MEMORY|DEFAULT}"
 
 %type	<ident>
 	ODBCDateTimeType		"ODBC type keywords for date and time literals"
@@ -2402,6 +2404,15 @@ ColumnOption:
 	{
 		$$ = &ast.ColumnOption{Tp: ast.ColumnOptionColumnFormat, StrValue: $2.(string)}
 	}
+|	"STORAGE" StorageMedia
+	{
+		$$ = &ast.ColumnOption{Tp: ast.ColumnOptionStorage, StrValue: $2}
+		yylex.AppendError(yylex.Errorf("The STORAGE clause is parsed but ignored by all storage engines."))
+		parser.lastErrorAsWarn()
+	}
+
+StorageMedia:
+	"DEFAULT" | "DISK" | "MEMORY"
 
 ColumnFormat:
 	"DEFAULT"
@@ -4355,7 +4366,7 @@ UnReservedKeyword:
 | "SQL_TSI_DAY" | "SQL_TSI_HOUR" | "SQL_TSI_MINUTE" | "SQL_TSI_MONTH" | "SQL_TSI_QUARTER" | "SQL_TSI_SECOND" | "SQL_TSI_WEEK" | "SQL_TSI_YEAR" | "INVISIBLE" | "VISIBLE" | "TYPE"
 
 TiDBKeyword:
- "ADMIN" | "AGG_TO_COP" |"BUCKETS" | "CANCEL" | "CMSKETCH" | "DDL" | "DEPTH" | "DRAINER" | "JOBS" | "JOB" | "NODE_ID" | "NODE_STATE" | "PUMP" | "SAMPLES" | "STATS" | "STATS_META" | "STATS_HISTOGRAMS" | "STATS_BUCKETS" | "STATS_HEALTHY" | "TIDB"
+ "ADMIN" | "AGG_TO_COP" |"BUCKETS" | "BUILTINS" | "CANCEL" | "CMSKETCH" | "DDL" | "DEPTH" | "DRAINER" | "JOBS" | "JOB" | "NODE_ID" | "NODE_STATE" | "PUMP" | "SAMPLES" | "STATS" | "STATS_META" | "STATS_HISTOGRAMS" | "STATS_BUCKETS" | "STATS_HEALTHY" | "TIDB"
 | "HASH_JOIN" | "SM_JOIN" | "INL_JOIN" | "HASH_AGG" | "STREAM_AGG" | "USE_INDEX" | "IGNORE_INDEX" | "USE_INDEX_MERGE" | "NO_INDEX_MERGE" | "USE_TOJA" | "ENABLE_PLAN_CACHE" | "USE_PLAN_CACHE"
 | "READ_CONSISTENT_REPLICA" | "READ_FROM_STORAGE" | "QB_NAME" | "QUERY_TYPE" | "MEMORY_QUOTA" | "OLAP" | "OLTP" | "TOPN" | "TIKV" | "TIFLASH" | "SPLIT" | "OPTIMISTIC" | "PESSIMISTIC" | "WIDTH" | "REGIONS"
 
@@ -7872,6 +7883,12 @@ ShowStmt:
 		}
 		$$ = stmt
 	}
+|	"SHOW" "BUILTINS"
+	{
+		$$ = &ast.ShowStmt{
+			Tp: ast.ShowBuiltins,
+		}
+	}
 
 ShowProfileTypesOpt:
 	{
@@ -8832,6 +8849,10 @@ FixedPointType:
 	{
 		$$ = mysql.TypeNewDecimal
 	}
+|	"FIXED"
+	{
+		$$ = mysql.TypeNewDecimal
+	}
 
 FloatingPointType:
 	"FLOAT"

vendor/github.com/pingcap/parser/yy_parser.go

@@ -100,7 +100,7 @@ type Parser struct {
 	// the following fields are used by yyParse to reduce allocation.
 	cache  []yySymType
 	yylval yySymType
-	yyVAL  yySymType
+	yyVAL  *yySymType
 }
 
 type stmtTexter interface {

vendor/github.com/pingcap/tidb/sessionctx/stmtctx/stmtctx.go

@@ -135,7 +135,8 @@ type StatementContext struct {
 		normalized string
 		digest     string
 	}
-	Tables []TableEntry
+	Tables    []TableEntry
+	PointExec bool // for point update cached execution, Constant expression need to set "paramMarker"
 }
 
 // StmtHints are SessionVars related sql hints.

vendor/github.com/pingcap/tidb/types/datum.go

@@ -1258,12 +1258,16 @@ func (d *Datum) convertToMysqlBit(sc *stmtctx.StatementContext, target *FieldTyp
 	switch d.k {
 	case KindString, KindBytes:
 		uintValue, err = BinaryLiteral(d.b).ToInt(sc)
+	case KindInt64:
+		// if input kind is int64 (signed), when trans to bit, we need to treat it as unsigned
+		d.k = KindUint64
+		fallthrough
 	default:
 		uintDatum, err1 := d.convertToUint(sc, target)
 		uintValue, err = uintDatum.GetUint64(), err1
 	}
 	if target.Flen < 64 && uintValue >= 1<<(uint64(target.Flen)) {
-		return Datum{}, errors.Trace(ErrOverflow.GenWithStackByArgs("BIT", fmt.Sprintf("(%d)", target.Flen)))
+		return Datum{}, errors.Trace(ErrDataTooLong.GenWithStack("Data Too Long, field len %d", target.Flen))
 	}
 	byteSize := (target.Flen + 7) >> 3
 	ret.SetMysqlBit(NewBinaryLiteralFromUint(uintValue, byteSize))

vendor/github.com/pingcap/tidb/types/overflow.go

@@ -16,6 +16,7 @@ package types
 import (
 	"fmt"
 	"math"
+	"time"
 
 	"github.com/pingcap/errors"
 )
@@ -38,6 +39,16 @@ func AddInt64(a int64, b int64) (int64, error) {
 	return a + b, nil
 }
 
+// AddDuration adds time.Duration a and b if no overflow, otherwise returns error.
+func AddDuration(a time.Duration, b time.Duration) (time.Duration, error) {
+	if (a > 0 && b > 0 && math.MaxInt64-a < b) ||
+		(a < 0 && b < 0 && math.MinInt64-a > b) {
+		return 0, ErrOverflow.GenWithStackByArgs("BIGINT", fmt.Sprintf("(%d, %d)", int64(a), int64(b)))
+	}
+
+	return a + b, nil
+}
+
 // AddInteger adds uint64 a and int64 b and returns uint64 if no overflow error.
 func AddInteger(a uint64, b int64) (uint64, error) {
 	if b >= 0 {

vendor/github.com/pingcap/tidb/types/time.go

@@ -292,8 +292,17 @@ const dateFormat = "%Y%m%d"
 // 2012-12-12T10:10:10 -> 20121212101010
 // 2012-12-12T10:10:10.123456 -> 20121212101010.123456
 func (t Time) ToNumber() *MyDecimal {
+	dec := new(MyDecimal)
+	t.FillNumber(dec)
+	return dec
+}
+
+// FillNumber is the same as ToNumber,
+// but reuses input decimal instead of allocating one.
+func (t Time) FillNumber(dec *MyDecimal) {
 	if t.IsZero() {
-		return &MyDecimal{}
+		dec.FromInt(0)
+		return
 	}
 
 	// Fix issue #1046
@@ -314,12 +323,9 @@ func (t Time) ToNumber() *MyDecimal {
 		s1 := fmt.Sprintf("%s.%06d", s, t.Time.Microsecond())
 		s = s1[:len(s)+int(t.Fsp)+1]
 	}
-
 	// We skip checking error here because time formatted string can be parsed certainly.
-	dec := new(MyDecimal)
 	err = dec.FromString([]byte(s))
 	terror.Log(errors.Trace(err))
-	return dec
 }
 
 // Convert converts t with type tp.

vendor/github.com/pingcap/tidb/util/memory/action.go

@@ -32,6 +32,9 @@ type ActionOnExceed interface {
 	// SetLogHook binds a log hook which will be triggered and log an detailed
 	// message for the out-of-memory sql.
 	SetLogHook(hook func(uint64))
+	// SetFallback sets a fallback action which will be triggered if itself has
+	// already been triggered.
+	SetFallback(a ActionOnExceed)
 }
 
 // LogOnExceed logs a warning only once when memory usage exceeds memory quota.
@@ -62,6 +65,9 @@ func (a *LogOnExceed) Action(t *Tracker) {
 	}
 }
 
+// SetFallback sets a fallback action.
+func (a *LogOnExceed) SetFallback(ActionOnExceed) {}
+
 // PanicOnExceed panics when memory usage exceeds memory quota.
 type PanicOnExceed struct {
 	mutex   sync.Mutex // For synchronization.
@@ -90,6 +96,9 @@ func (a *PanicOnExceed) Action(t *Tracker) {
 	panic(PanicMemoryExceed + fmt.Sprintf("[conn_id=%d]", a.ConnID))
 }
 
+// SetFallback sets a fallback action.
+func (a *PanicOnExceed) SetFallback(ActionOnExceed) {}
+
 var (
 	errMemExceedThreshold = terror.ClassExecutor.New(codeMemExceedThreshold, mysql.MySQLErrName[mysql.ErrMemExceedThreshold])
 )

vendor/github.com/pingcap/tidb/util/memory/tracker.go

@@ -42,24 +42,28 @@ type Tracker struct {
 		sync.Mutex
 		children []*Tracker // The children memory trackers
 	}
+	actionMu struct {
+		sync.Mutex
+		actionOnExceed ActionOnExceed
+	}
 
-	label          fmt.Stringer // Label of this "Tracker".
-	bytesConsumed  int64        // Consumed bytes.
-	bytesLimit     int64        // Negative value means no limit.
-	maxConsumed    int64        // max number of bytes consumed during execution.
-	actionOnExceed ActionOnExceed
-	parent         *Tracker // The parent memory tracker.
+	label         fmt.Stringer // Label of this "Tracker".
+	bytesConsumed int64        // Consumed bytes.
+	bytesLimit    int64        // bytesLimit <= 0 means no limit.
+	maxConsumed   int64        // max number of bytes consumed during execution.
+	parent        *Tracker     // The parent memory tracker.
 }
 
 // NewTracker creates a memory tracker.
 //	1. "label" is the label used in the usage string.
 //	2. "bytesLimit <= 0" means no limit.
 func NewTracker(label fmt.Stringer, bytesLimit int64) *Tracker {
-	return &Tracker{
-		label:          label,
-		bytesLimit:     bytesLimit,
-		actionOnExceed: &LogOnExceed{},
+	t := &Tracker{
+		label:      label,
+		bytesLimit: bytesLimit,
 	}
+	t.actionMu.actionOnExceed = &LogOnExceed{}
+	return t
 }
 
 // CheckBytesLimit check whether the bytes limit of the tracker is equal to a value.
@@ -76,7 +80,18 @@ func (t *Tracker) SetBytesLimit(bytesLimit int64) {
 
 // SetActionOnExceed sets the action when memory usage exceeds bytesLimit.
 func (t *Tracker) SetActionOnExceed(a ActionOnExceed) {
-	t.actionOnExceed = a
+	t.actionMu.Lock()
+	t.actionMu.actionOnExceed = a
+	t.actionMu.Unlock()
+}
+
+// FallbackOldAndSetNewAction sets the action when memory usage exceeds bytesLimit
+// and set the original action as its fallback.
+func (t *Tracker) FallbackOldAndSetNewAction(a ActionOnExceed) {
+	t.actionMu.Lock()
+	defer t.actionMu.Unlock()
+	a.SetFallback(t.actionMu.actionOnExceed)
+	t.actionMu.actionOnExceed = a
 }
 
 // SetLabel sets the label of a Tracker.
@@ -151,12 +166,10 @@ func (t *Tracker) ReplaceChild(oldChild, newChild *Tracker) {
 // which means this is a memory release operation. When memory usage of a tracker
 // exceeds its bytesLimit, the tracker calls its action, so does each of its ancestors.
 func (t *Tracker) Consume(bytes int64) {
+	var rootExceed *Tracker
 	for tracker := t; tracker != nil; tracker = tracker.parent {
 		if atomic.AddInt64(&tracker.bytesConsumed, bytes) >= tracker.bytesLimit && tracker.bytesLimit > 0 {
-			// TODO(fengliyuan): try to find a way to avoid logging at each tracker in chain.
-			if tracker.actionOnExceed != nil {
-				tracker.actionOnExceed.Action(tracker)
-			}
+			rootExceed = tracker
 		}
 
 		for {
@@ -168,6 +181,13 @@ func (t *Tracker) Consume(bytes int64) {
 			break
 		}
 	}
+	if rootExceed != nil {
+		rootExceed.actionMu.Lock()
+		defer rootExceed.actionMu.Unlock()
+		if rootExceed.actionMu.actionOnExceed != nil {
+			rootExceed.actionMu.actionOnExceed.Action(rootExceed)
+		}
+	}
 }
 
 // BytesConsumed returns the consumed memory usage value in bytes.

vendor/vendor.json

@@ -57,10 +57,10 @@
 			"revisionTime": "2016-01-25T20:49:56Z"
 		},
 		{
-			"checksumSHA1": "GaJLoEuMGnP5ofXvuweAI4wx06U=",
+			"checksumSHA1": "C8nYObwbo2oyODQbIT83lY37ajM=",
 			"path": "github.com/golang/protobuf/proto",
-			"revision": "ddf22928ea3c56eb4292a0adbbf5001b1e8e7d0d",
-			"revisionTime": "2018-10-05T18:17:28Z"
+			"revision": "1680a479a2cfb3fa22b972af7e36d0a0fde47bf8",
+			"revisionTime": "2019-09-20T23:43:18Z"
 		},
 		{
 			"checksumSHA1": "tkJPssYejSjuAwE2tdEnoEIj93Q=",
@@ -129,118 +129,118 @@
 			"revisionTime": "2019-03-07T07:54:52Z"
 		},
 		{
-			"checksumSHA1": "6Q3DjwHqeCoRIxBT+Jy5ctnK6hw=",
+			"checksumSHA1": "QR1zSwFP8BdkTjNFC+/5gTS8C6c=",
 			"path": "github.com/pingcap/parser",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
-			"checksumSHA1": "2zFL4KJXdxL9LvQ/HNQhUDNIMd4=",
+			"checksumSHA1": "I4zlpjlOMFiWnRtAoSj50RSHsvk=",
 			"path": "github.com/pingcap/parser/ast",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
 			"checksumSHA1": "xiv40YqnvHcbIhaEzJqjh5K7ehM=",
 			"path": "github.com/pingcap/parser/auth",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
 			"checksumSHA1": "EvDXpplklIXmKqLclzWzaN/uHKQ=",
 			"path": "github.com/pingcap/parser/charset",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
 			"checksumSHA1": "Aao6Mul/qqogOwPwM2arBKZkYZs=",
 			"path": "github.com/pingcap/parser/format",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
 			"checksumSHA1": "GAJ7IUg0t8DCKJbJQxJLkklEj2E=",
 			"path": "github.com/pingcap/parser/model",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
 			"checksumSHA1": "pN8v8r1syhLlLXw9TOq6bFgJfnY=",
 			"path": "github.com/pingcap/parser/mysql",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
 			"checksumSHA1": "olapD16WCMBU9vrA5PtlERGFfXw=",
 			"path": "github.com/pingcap/parser/opcode",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
 			"checksumSHA1": "L6rzy3sJU1RPf7AkJN+0zcwW/YY=",
 			"path": "github.com/pingcap/parser/terror",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
 			"checksumSHA1": "u1Lmm4Fa3su4ElZMN4w0hPzFZl4=",
 			"path": "github.com/pingcap/parser/types",
-			"revision": "33636bc5e5d6c114f4b443dee71ff72645656d96",
-			"revisionTime": "2019-09-23T03:17:04Z"
+			"revision": "51a2e3b2e34b61a7519e7d3e17dac38f0e8684f7",
+			"revisionTime": "2019-10-08T03:21:57Z"
 		},
 		{
-			"checksumSHA1": "MqOvmeZKNG2g9yh3KS7WR18zhnM=",
+			"checksumSHA1": "guCKXZsHObqyjp6P2BwLSUpcG+Y=",
 			"path": "github.com/pingcap/tidb/sessionctx/stmtctx",
-			"revision": "582076b5cc9e0743bdd4aa95fbfd2ca1cc0e86e0",
-			"revisionTime": "2019-09-23T07:09:15Z"
+			"revision": "7c776be85d4445edd894052cc7585c310be6fca6",
+			"revisionTime": "2019-10-08T05:59:24Z"
 		},
 		{
-			"checksumSHA1": "E3tVZMdsoBoN+PbIBTd0hqxsHXA=",
+			"checksumSHA1": "DIDA04qsKrAzuwlq+uJrY3wTU2Y=",
 			"path": "github.com/pingcap/tidb/types",
-			"revision": "582076b5cc9e0743bdd4aa95fbfd2ca1cc0e86e0",
-			"revisionTime": "2019-09-23T07:09:15Z"
+			"revision": "7c776be85d4445edd894052cc7585c310be6fca6",
+			"revisionTime": "2019-10-08T05:59:24Z"
 		},
 		{
 			"checksumSHA1": "OSOQVeP518zWu3RoYSDWoh7DIjg=",
 			"path": "github.com/pingcap/tidb/types/json",
-			"revision": "582076b5cc9e0743bdd4aa95fbfd2ca1cc0e86e0",
-			"revisionTime": "2019-09-23T07:09:15Z"
+			"revision": "7c776be85d4445edd894052cc7585c310be6fca6",
+			"revisionTime": "2019-10-08T05:59:24Z"
 		},
 		{
 			"checksumSHA1": "45zWX5Q6D6aTEWtc4p/lbD9WD4o=",
 			"path": "github.com/pingcap/tidb/types/parser_driver",
-			"revision": "582076b5cc9e0743bdd4aa95fbfd2ca1cc0e86e0",
-			"revisionTime": "2019-09-23T07:09:15Z"
+			"revision": "7c776be85d4445edd894052cc7585c310be6fca6",
+			"revisionTime": "2019-10-08T05:59:24Z"
 		},
 		{
 			"checksumSHA1": "oCrNchmOGNQTnrkjk5CxFZpu2rE=",
 			"path": "github.com/pingcap/tidb/util/execdetails",
-			"revision": "582076b5cc9e0743bdd4aa95fbfd2ca1cc0e86e0",
-			"revisionTime": "2019-09-23T07:09:15Z"
+			"revision": "7c776be85d4445edd894052cc7585c310be6fca6",
+			"revisionTime": "2019-10-08T05:59:24Z"
 		},
 		{
 			"checksumSHA1": "QGCTegCx13wJyB0isXsV7mNIljE=",
 			"path": "github.com/pingcap/tidb/util/hack",
-			"revision": "582076b5cc9e0743bdd4aa95fbfd2ca1cc0e86e0",
-			"revisionTime": "2019-09-23T07:09:15Z"
+			"revision": "7c776be85d4445edd894052cc7585c310be6fca6",
+			"revisionTime": "2019-10-08T05:59:24Z"
 		},
 		{
 			"checksumSHA1": "SZhLPQR66Rd4kWkva6W3sJmSNLY=",
 			"path": "github.com/pingcap/tidb/util/logutil",
-			"revision": "582076b5cc9e0743bdd4aa95fbfd2ca1cc0e86e0",
-			"revisionTime": "2019-09-23T07:09:15Z"
+			"revision": "7c776be85d4445edd894052cc7585c310be6fca6",
+			"revisionTime": "2019-10-08T05:59:24Z"
 		},
 		{
 			"checksumSHA1": "OveQu0ABBJmMEwmmthqSRQC2Ef0=",
 			"path": "github.com/pingcap/tidb/util/math",
-			"revision": "582076b5cc9e0743bdd4aa95fbfd2ca1cc0e86e0",
-			"revisionTime": "2019-09-23T07:09:15Z"
+			"revision": "7c776be85d4445edd894052cc7585c310be6fca6",
+			"revisionTime": "2019-10-08T05:59:24Z"
 		},
 		{
-			"checksumSHA1": "wtzRvG5v1M4goFuWvP8ohkcZaT0=",
+			"checksumSHA1": "EhvViFDlyohEB9dvepvISTP28Zg=",
 			"path": "github.com/pingcap/tidb/util/memory",
-			"revision": "582076b5cc9e0743bdd4aa95fbfd2ca1cc0e86e0",
-			"revisionTime": "2019-09-23T07:09:15Z"
+			"revision": "7c776be85d4445edd894052cc7585c310be6fca6",
+			"revisionTime": "2019-10-08T05:59:24Z"
 		},
 		{
 			"checksumSHA1": "QPIBwDNUFF5Whrnd41S3mkKa4gQ=",
@@ -497,68 +497,74 @@
 		{
 			"checksumSHA1": "aKn1oKcY74N8TRLm3Ayt7Q4bbI4=",
 			"path": "vitess.io/vitess/go/bytes2",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
 			"checksumSHA1": "bhE6CGQgZTIgLPp9lnvlKW/47xc=",
 			"path": "vitess.io/vitess/go/hack",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
-			"checksumSHA1": "IpNRu9mF+hsO3XRHzhW2Tz4G81o=",
+			"checksumSHA1": "v2dgco7U/RQtQbdX9ULGEXsZw6k=",
 			"path": "vitess.io/vitess/go/sqltypes",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
 			"checksumSHA1": "vAIRxI6MHsq3x1hLQwIyw5AvqtI=",
 			"path": "vitess.io/vitess/go/vt/log",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
-			"checksumSHA1": "//MHnGEq9xApvIMdwQaRrQf5ZWo=",
+			"checksumSHA1": "pm6qqJ+px6ev0huIVSE73XKT/pM=",
 			"path": "vitess.io/vitess/go/vt/proto/binlogdata",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
-			"checksumSHA1": "u8uuZWMqaXgQ1MduggrgIHU50FI=",
+			"checksumSHA1": "U2N66XbwVN2UbS7mI2fQqODKTFU=",
 			"path": "vitess.io/vitess/go/vt/proto/query",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
-			"checksumSHA1": "rJ1Iqz/lvaKikIUx4oEFfYJtoBQ=",
+			"checksumSHA1": "mioM1BFNP3voMMt6rvT6i9BMxTA=",
 			"path": "vitess.io/vitess/go/vt/proto/topodata",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
-			"checksumSHA1": "Bv8lucvoH9AnJSYiWX8MIrJl4zY=",
+			"checksumSHA1": "vFv/sVYQzHQFzLdxfLA3vX5Nz0U=",
 			"path": "vitess.io/vitess/go/vt/proto/vtgate",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
-			"checksumSHA1": "HeUJu5njPq9iznpAOcrLpLD7f9w=",
+			"checksumSHA1": "6Pzimtq+Jv8CI6kTqkAjMkPoZZI=",
 			"path": "vitess.io/vitess/go/vt/proto/vtrpc",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
+		},
+		{
+			"checksumSHA1": "IpnM59xLwj3/Kv5sbEFXBUvcj0o=",
+			"path": "vitess.io/vitess/go/vt/proto/vttime",
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
-			"checksumSHA1": "QP+KJhlTW4o4uRt2uFFiI9tjriI=",
+			"checksumSHA1": "W6ID/pp1kmcssaxW+PtAD3flg5E=",
 			"path": "vitess.io/vitess/go/vt/sqlparser",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		},
 		{
 			"checksumSHA1": "z9+F/lA1Xrl5S16LKssUH8VL6hs=",
 			"path": "vitess.io/vitess/go/vt/vterrors",
-			"revision": "909d0c8861b2b1a4a5942f99e7b44bf38e5db503",
-			"revisionTime": "2019-09-23T01:36:26Z"
+			"revision": "2c8664c8005b440c11fd070d30357c90f749f140",
+			"revisionTime": "2019-10-07T23:18:38Z"
 		}
 	],
 	"rootPath": "github.com/XiaoMi/soar"

vendor/vitess.io/vitess/go/sqltypes/arithmetic.go

@@ -87,6 +87,28 @@ func Subtract(v1, v2 Value) (Value, error) {
 	return castFromNumeric(lresult, lresult.typ), nil
 }
 
+// Multiply takes two values and multiplies it together
+func Multiply(v1, v2 Value) (Value, error) {
+	if v1.IsNull() || v2.IsNull() {
+		return NULL, nil
+	}
+
+	lv1, err := newNumeric(v1)
+	if err != nil {
+		return NULL, err
+	}
+	lv2, err := newNumeric(v2)
+	if err != nil {
+		return NULL, err
+	}
+	lresult, err := multiplyNumericWithError(lv1, lv2)
+	if err != nil {
+		return NULL, err
+	}
+
+	return castFromNumeric(lresult, lresult.typ), nil
+}
+
 // NullsafeAdd adds two Values in a null-safe manner. A null value
 // is treated as 0. If both values are null, then a null is returned.
 // If both values are not null, a numeric value is built
@@ -430,6 +452,24 @@ func subtractNumericWithError(v1, v2 numeric) (numeric, error) {
 	panic("unreachable")
 }
 
+func multiplyNumericWithError(v1, v2 numeric) (numeric, error) {
+	v1, v2 = prioritize(v1, v2)
+	switch v1.typ {
+	case Int64:
+		return intTimesIntWithError(v1.ival, v2.ival)
+	case Uint64:
+		switch v2.typ {
+		case Int64:
+			return uintTimesIntWithError(v1.uval, v2.ival)
+		case Uint64:
+			return uintTimesUintWithError(v1.uval, v2.uval)
+		}
+	case Float64:
+		return floatTimesAny(v1.fval, v2), nil
+	}
+	panic("unreachable")
+}
+
 // prioritize reorders the input parameters
 // to be Float64, Uint64, Int64.
 func prioritize(v1, v2 numeric) (altv1, altv2 numeric) {
@@ -477,6 +517,14 @@ func intMinusIntWithError(v1, v2 int64) (numeric, error) {
 	return numeric{typ: Int64, ival: result}, nil
 }
 
+func intTimesIntWithError(v1, v2 int64) (numeric, error) {
+	result := v1 * v2
+	if v1 != 0 && result/v1 != v2 {
+		return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "BIGINT value is out of range in %v * %v", v1, v2)
+	}
+	return numeric{typ: Int64, ival: result}, nil
+}
+
 func intMinusUintWithError(v1 int64, v2 uint64) (numeric, error) {
 	if v1 < 0 || v1 < int64(v2) {
 		return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "BIGINT UNSIGNED value is out of range in %v - %v", v1, v2)
@@ -508,6 +556,13 @@ func uintMinusIntWithError(v1 uint64, v2 int64) (numeric, error) {
 	return uintMinusUintWithError(v1, uint64(v2))
 }
 
+func uintTimesIntWithError(v1 uint64, v2 int64) (numeric, error) {
+	if v2 < 0 || int64(v1) < 0 {
+		return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "BIGINT UNSIGNED value is out of range in %v * %v", v1, v2)
+	}
+	return uintTimesUintWithError(v1, uint64(v2))
+}
+
 func uintPlusUint(v1, v2 uint64) numeric {
 	result := v1 + v2
 	if result < v2 {
@@ -529,6 +584,15 @@ func uintMinusUintWithError(v1, v2 uint64) (numeric, error) {
 	if v2 > v1 {
 		return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "BIGINT UNSIGNED value is out of range in %v - %v", v1, v2)
 	}
+
+	return numeric{typ: Uint64, uval: result}, nil
+}
+
+func uintTimesUintWithError(v1, v2 uint64) (numeric, error) {
+	result := v1 * v2
+	if result < v2 || result < v1 {
+		return numeric{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "BIGINT UNSIGNED value is out of range in %v * %v", v1, v2)
+	}
 	return numeric{typ: Uint64, uval: result}, nil
 }
 
@@ -552,6 +616,16 @@ func floatMinusAny(v1 float64, v2 numeric) numeric {
 	return numeric{typ: Float64, fval: v1 - v2.fval}
 }
 
+func floatTimesAny(v1 float64, v2 numeric) numeric {
+	switch v2.typ {
+	case Int64:
+		v2.fval = float64(v2.ival)
+	case Uint64:
+		v2.fval = float64(v2.uval)
+	}
+	return numeric{typ: Float64, fval: v1 * v2.fval}
+}
+
 func anyMinusFloat(v1 numeric, v2 float64) numeric {
 	switch v1.typ {
 	case Int64:

vendor/vitess.io/vitess/go/sqltypes/type.go

@@ -154,6 +154,7 @@ const (
 // If you add to this map, make sure you add a test case
 // in tabletserver/endtoend.
 var mysqlToType = map[int64]querypb.Type{
+	0:   Decimal,
 	1:   Int8,
 	2:   Int16,
 	3:   Int32,
@@ -169,8 +170,13 @@ var mysqlToType = map[int64]querypb.Type{
 	13:  Year,
 	15:  VarChar,
 	16:  Bit,
+	17:  Timestamp,
+	18:  Datetime,
+	19:  Time,
 	245: TypeJSON,
 	246: Decimal,
+	247: Enum,
+	248: Set,
 	249: Text,
 	250: Text,
 	251: Text,
@@ -245,6 +251,24 @@ func MySQLToType(mysqlType, flags int64) (typ querypb.Type, err error) {
 	return modifyType(result, flags), nil
 }
 
+//TypeEquivalenceCheck returns whether two types are equivalent.
+func AreTypesEquivalent(mysqlTypeFromBinlog, mysqlTypeFromSchema querypb.Type) bool {
+	return (mysqlTypeFromBinlog == mysqlTypeFromSchema) ||
+		(mysqlTypeFromBinlog == VarChar && mysqlTypeFromSchema == VarBinary) ||
+		// Binlog only has base type. But doesn't have per-column-flags to differentiate
+		// various logical types. For Binary, Enum, Set types, binlog only returns Char
+		// as data type.
+		(mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Binary) ||
+		(mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Enum) ||
+		(mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Set) ||
+		(mysqlTypeFromBinlog == Text && mysqlTypeFromSchema == Blob) ||
+		(mysqlTypeFromBinlog == Int8 && mysqlTypeFromSchema == Uint8) ||
+		(mysqlTypeFromBinlog == Int16 && mysqlTypeFromSchema == Uint16) ||
+		(mysqlTypeFromBinlog == Int24 && mysqlTypeFromSchema == Uint24) ||
+		(mysqlTypeFromBinlog == Int32 && mysqlTypeFromSchema == Uint32) ||
+		(mysqlTypeFromBinlog == Int64 && mysqlTypeFromSchema == Uint64)
+}
+
 // typeToMySQL is the reverse of mysqlToType.
 var typeToMySQL = map[querypb.Type]struct {
 	typ   int64

vendor/vitess.io/vitess/go/vt/proto/binlogdata/binlogdata.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: binlogdata.proto
 
-package binlogdata // import "vitess.io/vitess/go/vt/proto/binlogdata"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import query "vitess.io/vitess/go/vt/proto/query"
-import topodata "vitess.io/vitess/go/vt/proto/topodata"
-import vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
+package binlogdata
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	query "vitess.io/vitess/go/vt/proto/query"
+	topodata "vitess.io/vitess/go/vt/proto/topodata"
+	vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // OnDDLAction lists the possible actions for DDLs.
 type OnDDLAction int32
@@ -37,6 +39,7 @@ var OnDDLAction_name = map[int32]string{
 	2: "EXEC",
 	3: "EXEC_IGNORE",
 }
+
 var OnDDLAction_value = map[string]int32{
 	"IGNORE":      0,
 	"STOP":        1,
@@ -47,8 +50,9 @@ var OnDDLAction_value = map[string]int32{
 func (x OnDDLAction) String() string {
 	return proto.EnumName(OnDDLAction_name, int32(x))
 }
+
 func (OnDDLAction) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{0}
+	return fileDescriptor_5fd02bcb2e350dad, []int{0}
 }
 
 // VEventType enumerates the event types.
@@ -95,6 +99,7 @@ var VEventType_name = map[int32]string{
 	15: "VGTID",
 	16: "JOURNAL",
 }
+
 var VEventType_value = map[string]int32{
 	"UNKNOWN":   0,
 	"GTID":      1,
@@ -118,8 +123,9 @@ var VEventType_value = map[string]int32{
 func (x VEventType) String() string {
 	return proto.EnumName(VEventType_name, int32(x))
 }
+
 func (VEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{1}
+	return fileDescriptor_5fd02bcb2e350dad, []int{1}
 }
 
 // MigrationType specifies the type of migration for the Journal.
@@ -134,6 +140,7 @@ var MigrationType_name = map[int32]string{
 	0: "TABLES",
 	1: "SHARDS",
 }
+
 var MigrationType_value = map[string]int32{
 	"TABLES": 0,
 	"SHARDS": 1,
@@ -142,8 +149,9 @@ var MigrationType_value = map[string]int32{
 func (x MigrationType) String() string {
 	return proto.EnumName(MigrationType_name, int32(x))
 }
+
 func (MigrationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{2}
+	return fileDescriptor_5fd02bcb2e350dad, []int{2}
 }
 
 type BinlogTransaction_Statement_Category int32
@@ -174,6 +182,7 @@ var BinlogTransaction_Statement_Category_name = map[int32]string{
 	8: "BL_UPDATE",
 	9: "BL_DELETE",
 }
+
 var BinlogTransaction_Statement_Category_value = map[string]int32{
 	"BL_UNRECOGNIZED":   0,
 	"BL_BEGIN":          1,
@@ -190,8 +199,34 @@ var BinlogTransaction_Statement_Category_value = map[string]int32{
 func (x BinlogTransaction_Statement_Category) String() string {
 	return proto.EnumName(BinlogTransaction_Statement_Category_name, int32(x))
 }
+
 func (BinlogTransaction_Statement_Category) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{1, 0, 0}
+	return fileDescriptor_5fd02bcb2e350dad, []int{1, 0, 0}
+}
+
+type Filter_FieldEventMode int32
+
+const (
+	Filter_ERR_ON_MISMATCH Filter_FieldEventMode = 0
+	Filter_BEST_EFFORT     Filter_FieldEventMode = 1
+)
+
+var Filter_FieldEventMode_name = map[int32]string{
+	0: "ERR_ON_MISMATCH",
+	1: "BEST_EFFORT",
+}
+
+var Filter_FieldEventMode_value = map[string]int32{
+	"ERR_ON_MISMATCH": 0,
+	"BEST_EFFORT":     1,
+}
+
+func (x Filter_FieldEventMode) String() string {
+	return proto.EnumName(Filter_FieldEventMode_name, int32(x))
+}
+
+func (Filter_FieldEventMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_5fd02bcb2e350dad, []int{7, 0}
 }
 
 // Charset is the per-statement charset info from a QUERY_EVENT binlog entry.
@@ -211,16 +246,17 @@ func (m *Charset) Reset()         { *m = Charset{} }
 func (m *Charset) String() string { return proto.CompactTextString(m) }
 func (*Charset) ProtoMessage()    {}
 func (*Charset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{0}
+	return fileDescriptor_5fd02bcb2e350dad, []int{0}
 }
+
 func (m *Charset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Charset.Unmarshal(m, b)
 }
 func (m *Charset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Charset.Marshal(b, m, deterministic)
 }
-func (dst *Charset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Charset.Merge(dst, src)
+func (m *Charset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Charset.Merge(m, src)
 }
 func (m *Charset) XXX_Size() int {
 	return xxx_messageInfo_Charset.Size(m)
@@ -268,16 +304,17 @@ func (m *BinlogTransaction) Reset()         { *m = BinlogTransaction{} }
 func (m *BinlogTransaction) String() string { return proto.CompactTextString(m) }
 func (*BinlogTransaction) ProtoMessage()    {}
 func (*BinlogTransaction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{1}
+	return fileDescriptor_5fd02bcb2e350dad, []int{1}
 }
+
 func (m *BinlogTransaction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BinlogTransaction.Unmarshal(m, b)
 }
 func (m *BinlogTransaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BinlogTransaction.Marshal(b, m, deterministic)
 }
-func (dst *BinlogTransaction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BinlogTransaction.Merge(dst, src)
+func (m *BinlogTransaction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BinlogTransaction.Merge(m, src)
 }
 func (m *BinlogTransaction) XXX_Size() int {
 	return xxx_messageInfo_BinlogTransaction.Size(m)
@@ -318,16 +355,17 @@ func (m *BinlogTransaction_Statement) Reset()         { *m = BinlogTransaction_S
 func (m *BinlogTransaction_Statement) String() string { return proto.CompactTextString(m) }
 func (*BinlogTransaction_Statement) ProtoMessage()    {}
 func (*BinlogTransaction_Statement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{1, 0}
+	return fileDescriptor_5fd02bcb2e350dad, []int{1, 0}
 }
+
 func (m *BinlogTransaction_Statement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BinlogTransaction_Statement.Unmarshal(m, b)
 }
 func (m *BinlogTransaction_Statement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BinlogTransaction_Statement.Marshal(b, m, deterministic)
 }
-func (dst *BinlogTransaction_Statement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BinlogTransaction_Statement.Merge(dst, src)
+func (m *BinlogTransaction_Statement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BinlogTransaction_Statement.Merge(m, src)
 }
 func (m *BinlogTransaction_Statement) XXX_Size() int {
 	return xxx_messageInfo_BinlogTransaction_Statement.Size(m)
@@ -376,16 +414,17 @@ func (m *StreamKeyRangeRequest) Reset()         { *m = StreamKeyRangeRequest{} }
 func (m *StreamKeyRangeRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamKeyRangeRequest) ProtoMessage()    {}
 func (*StreamKeyRangeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{2}
+	return fileDescriptor_5fd02bcb2e350dad, []int{2}
 }
+
 func (m *StreamKeyRangeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamKeyRangeRequest.Unmarshal(m, b)
 }
 func (m *StreamKeyRangeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamKeyRangeRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamKeyRangeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamKeyRangeRequest.Merge(dst, src)
+func (m *StreamKeyRangeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamKeyRangeRequest.Merge(m, src)
 }
 func (m *StreamKeyRangeRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamKeyRangeRequest.Size(m)
@@ -429,16 +468,17 @@ func (m *StreamKeyRangeResponse) Reset()         { *m = StreamKeyRangeResponse{}
 func (m *StreamKeyRangeResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamKeyRangeResponse) ProtoMessage()    {}
 func (*StreamKeyRangeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{3}
+	return fileDescriptor_5fd02bcb2e350dad, []int{3}
 }
+
 func (m *StreamKeyRangeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamKeyRangeResponse.Unmarshal(m, b)
 }
 func (m *StreamKeyRangeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamKeyRangeResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamKeyRangeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamKeyRangeResponse.Merge(dst, src)
+func (m *StreamKeyRangeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamKeyRangeResponse.Merge(m, src)
 }
 func (m *StreamKeyRangeResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamKeyRangeResponse.Size(m)
@@ -473,16 +513,17 @@ func (m *StreamTablesRequest) Reset()         { *m = StreamTablesRequest{} }
 func (m *StreamTablesRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamTablesRequest) ProtoMessage()    {}
 func (*StreamTablesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{4}
+	return fileDescriptor_5fd02bcb2e350dad, []int{4}
 }
+
 func (m *StreamTablesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamTablesRequest.Unmarshal(m, b)
 }
 func (m *StreamTablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamTablesRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamTablesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamTablesRequest.Merge(dst, src)
+func (m *StreamTablesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamTablesRequest.Merge(m, src)
 }
 func (m *StreamTablesRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamTablesRequest.Size(m)
@@ -526,16 +567,17 @@ func (m *StreamTablesResponse) Reset()         { *m = StreamTablesResponse{} }
 func (m *StreamTablesResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamTablesResponse) ProtoMessage()    {}
 func (*StreamTablesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{5}
+	return fileDescriptor_5fd02bcb2e350dad, []int{5}
 }
+
 func (m *StreamTablesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamTablesResponse.Unmarshal(m, b)
 }
 func (m *StreamTablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamTablesResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamTablesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamTablesResponse.Merge(dst, src)
+func (m *StreamTablesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamTablesResponse.Merge(m, src)
 }
 func (m *StreamTablesResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamTablesResponse.Size(m)
@@ -571,16 +613,17 @@ func (m *Rule) Reset()         { *m = Rule{} }
 func (m *Rule) String() string { return proto.CompactTextString(m) }
 func (*Rule) ProtoMessage()    {}
 func (*Rule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{6}
+	return fileDescriptor_5fd02bcb2e350dad, []int{6}
 }
+
 func (m *Rule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Rule.Unmarshal(m, b)
 }
 func (m *Rule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Rule.Marshal(b, m, deterministic)
 }
-func (dst *Rule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Rule.Merge(dst, src)
+func (m *Rule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rule.Merge(m, src)
 }
 func (m *Rule) XXX_Size() int {
 	return xxx_messageInfo_Rule.Size(m)
@@ -608,26 +651,28 @@ func (m *Rule) GetFilter() string {
 // Filter represents a list of ordered rules. First match
 // wins.
 type Filter struct {
-	Rules                []*Rule  `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Rules                []*Rule               `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	FieldEventMode       Filter_FieldEventMode `protobuf:"varint,2,opt,name=fieldEventMode,proto3,enum=binlogdata.Filter_FieldEventMode" json:"fieldEventMode,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
 func (m *Filter) Reset()         { *m = Filter{} }
 func (m *Filter) String() string { return proto.CompactTextString(m) }
 func (*Filter) ProtoMessage()    {}
 func (*Filter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{7}
+	return fileDescriptor_5fd02bcb2e350dad, []int{7}
 }
+
 func (m *Filter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Filter.Unmarshal(m, b)
 }
 func (m *Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Filter.Marshal(b, m, deterministic)
 }
-func (dst *Filter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Filter.Merge(dst, src)
+func (m *Filter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Filter.Merge(m, src)
 }
 func (m *Filter) XXX_Size() int {
 	return xxx_messageInfo_Filter.Size(m)
@@ -645,6 +690,13 @@ func (m *Filter) GetRules() []*Rule {
 	return nil
 }
 
+func (m *Filter) GetFieldEventMode() Filter_FieldEventMode {
+	if m != nil {
+		return m.FieldEventMode
+	}
+	return Filter_ERR_ON_MISMATCH
+}
+
 // BinlogSource specifies the source  and filter parameters for
 // Filtered Replication. It currently supports a keyrange
 // or a list of tables.
@@ -673,16 +725,17 @@ func (m *BinlogSource) Reset()         { *m = BinlogSource{} }
 func (m *BinlogSource) String() string { return proto.CompactTextString(m) }
 func (*BinlogSource) ProtoMessage()    {}
 func (*BinlogSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{8}
+	return fileDescriptor_5fd02bcb2e350dad, []int{8}
 }
+
 func (m *BinlogSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BinlogSource.Unmarshal(m, b)
 }
 func (m *BinlogSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BinlogSource.Marshal(b, m, deterministic)
 }
-func (dst *BinlogSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BinlogSource.Merge(dst, src)
+func (m *BinlogSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BinlogSource.Merge(m, src)
 }
 func (m *BinlogSource) XXX_Size() int {
 	return xxx_messageInfo_BinlogSource.Size(m)
@@ -755,16 +808,17 @@ func (m *RowChange) Reset()         { *m = RowChange{} }
 func (m *RowChange) String() string { return proto.CompactTextString(m) }
 func (*RowChange) ProtoMessage()    {}
 func (*RowChange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{9}
+	return fileDescriptor_5fd02bcb2e350dad, []int{9}
 }
+
 func (m *RowChange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowChange.Unmarshal(m, b)
 }
 func (m *RowChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowChange.Marshal(b, m, deterministic)
 }
-func (dst *RowChange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowChange.Merge(dst, src)
+func (m *RowChange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowChange.Merge(m, src)
 }
 func (m *RowChange) XXX_Size() int {
 	return xxx_messageInfo_RowChange.Size(m)
@@ -802,16 +856,17 @@ func (m *RowEvent) Reset()         { *m = RowEvent{} }
 func (m *RowEvent) String() string { return proto.CompactTextString(m) }
 func (*RowEvent) ProtoMessage()    {}
 func (*RowEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{10}
+	return fileDescriptor_5fd02bcb2e350dad, []int{10}
 }
+
 func (m *RowEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowEvent.Unmarshal(m, b)
 }
 func (m *RowEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowEvent.Marshal(b, m, deterministic)
 }
-func (dst *RowEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowEvent.Merge(dst, src)
+func (m *RowEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowEvent.Merge(m, src)
 }
 func (m *RowEvent) XXX_Size() int {
 	return xxx_messageInfo_RowEvent.Size(m)
@@ -848,16 +903,17 @@ func (m *FieldEvent) Reset()         { *m = FieldEvent{} }
 func (m *FieldEvent) String() string { return proto.CompactTextString(m) }
 func (*FieldEvent) ProtoMessage()    {}
 func (*FieldEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{11}
+	return fileDescriptor_5fd02bcb2e350dad, []int{11}
 }
+
 func (m *FieldEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldEvent.Unmarshal(m, b)
 }
 func (m *FieldEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldEvent.Marshal(b, m, deterministic)
 }
-func (dst *FieldEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldEvent.Merge(dst, src)
+func (m *FieldEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldEvent.Merge(m, src)
 }
 func (m *FieldEvent) XXX_Size() int {
 	return xxx_messageInfo_FieldEvent.Size(m)
@@ -895,16 +951,17 @@ func (m *ShardGtid) Reset()         { *m = ShardGtid{} }
 func (m *ShardGtid) String() string { return proto.CompactTextString(m) }
 func (*ShardGtid) ProtoMessage()    {}
 func (*ShardGtid) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{12}
+	return fileDescriptor_5fd02bcb2e350dad, []int{12}
 }
+
 func (m *ShardGtid) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShardGtid.Unmarshal(m, b)
 }
 func (m *ShardGtid) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShardGtid.Marshal(b, m, deterministic)
 }
-func (dst *ShardGtid) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShardGtid.Merge(dst, src)
+func (m *ShardGtid) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShardGtid.Merge(m, src)
 }
 func (m *ShardGtid) XXX_Size() int {
 	return xxx_messageInfo_ShardGtid.Size(m)
@@ -947,16 +1004,17 @@ func (m *VGtid) Reset()         { *m = VGtid{} }
 func (m *VGtid) String() string { return proto.CompactTextString(m) }
 func (*VGtid) ProtoMessage()    {}
 func (*VGtid) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{13}
+	return fileDescriptor_5fd02bcb2e350dad, []int{13}
 }
+
 func (m *VGtid) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VGtid.Unmarshal(m, b)
 }
 func (m *VGtid) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VGtid.Marshal(b, m, deterministic)
 }
-func (dst *VGtid) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VGtid.Merge(dst, src)
+func (m *VGtid) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VGtid.Merge(m, src)
 }
 func (m *VGtid) XXX_Size() int {
 	return xxx_messageInfo_VGtid.Size(m)
@@ -986,16 +1044,17 @@ func (m *KeyspaceShard) Reset()         { *m = KeyspaceShard{} }
 func (m *KeyspaceShard) String() string { return proto.CompactTextString(m) }
 func (*KeyspaceShard) ProtoMessage()    {}
 func (*KeyspaceShard) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{14}
+	return fileDescriptor_5fd02bcb2e350dad, []int{14}
 }
+
 func (m *KeyspaceShard) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeyspaceShard.Unmarshal(m, b)
 }
 func (m *KeyspaceShard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeyspaceShard.Marshal(b, m, deterministic)
 }
-func (dst *KeyspaceShard) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeyspaceShard.Merge(dst, src)
+func (m *KeyspaceShard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeyspaceShard.Merge(m, src)
 }
 func (m *KeyspaceShard) XXX_Size() int {
 	return xxx_messageInfo_KeyspaceShard.Size(m)
@@ -1037,16 +1096,17 @@ func (m *Journal) Reset()         { *m = Journal{} }
 func (m *Journal) String() string { return proto.CompactTextString(m) }
 func (*Journal) ProtoMessage()    {}
 func (*Journal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{15}
+	return fileDescriptor_5fd02bcb2e350dad, []int{15}
 }
+
 func (m *Journal) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Journal.Unmarshal(m, b)
 }
 func (m *Journal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Journal.Marshal(b, m, deterministic)
 }
-func (dst *Journal) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Journal.Merge(dst, src)
+func (m *Journal) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Journal.Merge(m, src)
 }
 func (m *Journal) XXX_Size() int {
 	return xxx_messageInfo_Journal.Size(m)
@@ -1127,16 +1187,17 @@ func (m *VEvent) Reset()         { *m = VEvent{} }
 func (m *VEvent) String() string { return proto.CompactTextString(m) }
 func (*VEvent) ProtoMessage()    {}
 func (*VEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{16}
+	return fileDescriptor_5fd02bcb2e350dad, []int{16}
 }
+
 func (m *VEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VEvent.Unmarshal(m, b)
 }
 func (m *VEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VEvent.Marshal(b, m, deterministic)
 }
-func (dst *VEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VEvent.Merge(dst, src)
+func (m *VEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VEvent.Merge(m, src)
 }
 func (m *VEvent) XXX_Size() int {
 	return xxx_messageInfo_VEvent.Size(m)
@@ -1226,16 +1287,17 @@ func (m *VStreamRequest) Reset()         { *m = VStreamRequest{} }
 func (m *VStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*VStreamRequest) ProtoMessage()    {}
 func (*VStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{17}
+	return fileDescriptor_5fd02bcb2e350dad, []int{17}
 }
+
 func (m *VStreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VStreamRequest.Unmarshal(m, b)
 }
 func (m *VStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VStreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *VStreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VStreamRequest.Merge(dst, src)
+func (m *VStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VStreamRequest.Merge(m, src)
 }
 func (m *VStreamRequest) XXX_Size() int {
 	return xxx_messageInfo_VStreamRequest.Size(m)
@@ -1293,16 +1355,17 @@ func (m *VStreamResponse) Reset()         { *m = VStreamResponse{} }
 func (m *VStreamResponse) String() string { return proto.CompactTextString(m) }
 func (*VStreamResponse) ProtoMessage()    {}
 func (*VStreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{18}
+	return fileDescriptor_5fd02bcb2e350dad, []int{18}
 }
+
 func (m *VStreamResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VStreamResponse.Unmarshal(m, b)
 }
 func (m *VStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VStreamResponse.Marshal(b, m, deterministic)
 }
-func (dst *VStreamResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VStreamResponse.Merge(dst, src)
+func (m *VStreamResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VStreamResponse.Merge(m, src)
 }
 func (m *VStreamResponse) XXX_Size() int {
 	return xxx_messageInfo_VStreamResponse.Size(m)
@@ -1336,16 +1399,17 @@ func (m *VStreamRowsRequest) Reset()         { *m = VStreamRowsRequest{} }
 func (m *VStreamRowsRequest) String() string { return proto.CompactTextString(m) }
 func (*VStreamRowsRequest) ProtoMessage()    {}
 func (*VStreamRowsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{19}
+	return fileDescriptor_5fd02bcb2e350dad, []int{19}
 }
+
 func (m *VStreamRowsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VStreamRowsRequest.Unmarshal(m, b)
 }
 func (m *VStreamRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VStreamRowsRequest.Marshal(b, m, deterministic)
 }
-func (dst *VStreamRowsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VStreamRowsRequest.Merge(dst, src)
+func (m *VStreamRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VStreamRowsRequest.Merge(m, src)
 }
 func (m *VStreamRowsRequest) XXX_Size() int {
 	return xxx_messageInfo_VStreamRowsRequest.Size(m)
@@ -1407,16 +1471,17 @@ func (m *VStreamRowsResponse) Reset()         { *m = VStreamRowsResponse{} }
 func (m *VStreamRowsResponse) String() string { return proto.CompactTextString(m) }
 func (*VStreamRowsResponse) ProtoMessage()    {}
 func (*VStreamRowsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_binlogdata_db2d20dd0016de21, []int{20}
+	return fileDescriptor_5fd02bcb2e350dad, []int{20}
 }
+
 func (m *VStreamRowsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VStreamRowsResponse.Unmarshal(m, b)
 }
 func (m *VStreamRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VStreamRowsResponse.Marshal(b, m, deterministic)
 }
-func (dst *VStreamRowsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VStreamRowsResponse.Merge(dst, src)
+func (m *VStreamRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VStreamRowsResponse.Merge(m, src)
 }
 func (m *VStreamRowsResponse) XXX_Size() int {
 	return xxx_messageInfo_VStreamRowsResponse.Size(m)
@@ -1463,6 +1528,11 @@ func (m *VStreamRowsResponse) GetLastpk() *query.Row {
 }
 
 func init() {
+	proto.RegisterEnum("binlogdata.OnDDLAction", OnDDLAction_name, OnDDLAction_value)
+	proto.RegisterEnum("binlogdata.VEventType", VEventType_name, VEventType_value)
+	proto.RegisterEnum("binlogdata.MigrationType", MigrationType_name, MigrationType_value)
+	proto.RegisterEnum("binlogdata.BinlogTransaction_Statement_Category", BinlogTransaction_Statement_Category_name, BinlogTransaction_Statement_Category_value)
+	proto.RegisterEnum("binlogdata.Filter_FieldEventMode", Filter_FieldEventMode_name, Filter_FieldEventMode_value)
 	proto.RegisterType((*Charset)(nil), "binlogdata.Charset")
 	proto.RegisterType((*BinlogTransaction)(nil), "binlogdata.BinlogTransaction")
 	proto.RegisterType((*BinlogTransaction_Statement)(nil), "binlogdata.BinlogTransaction.Statement")
@@ -1485,112 +1555,112 @@ func init() {
 	proto.RegisterType((*VStreamResponse)(nil), "binlogdata.VStreamResponse")
 	proto.RegisterType((*VStreamRowsRequest)(nil), "binlogdata.VStreamRowsRequest")
 	proto.RegisterType((*VStreamRowsResponse)(nil), "binlogdata.VStreamRowsResponse")
-	proto.RegisterEnum("binlogdata.OnDDLAction", OnDDLAction_name, OnDDLAction_value)
-	proto.RegisterEnum("binlogdata.VEventType", VEventType_name, VEventType_value)
-	proto.RegisterEnum("binlogdata.MigrationType", MigrationType_name, MigrationType_value)
-	proto.RegisterEnum("binlogdata.BinlogTransaction_Statement_Category", BinlogTransaction_Statement_Category_name, BinlogTransaction_Statement_Category_value)
 }
 
-func init() { proto.RegisterFile("binlogdata.proto", fileDescriptor_binlogdata_db2d20dd0016de21) }
-
-var fileDescriptor_binlogdata_db2d20dd0016de21 = []byte{
-	// 1558 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x72, 0xdb, 0xca,
-	0x11, 0x35, 0x09, 0xf0, 0xd5, 0x90, 0x28, 0x68, 0xf4, 0x08, 0xa3, 0x8a, 0x53, 0x0a, 0x2a, 0x8e,
-	0x14, 0x55, 0x85, 0x72, 0x98, 0xc4, 0x59, 0x39, 0x0e, 0x1f, 0xb0, 0x4c, 0x09, 0x22, 0xe5, 0x21,
-	0x24, 0xa7, 0xbc, 0x41, 0x41, 0xc4, 0x48, 0x42, 0x04, 0x02, 0x34, 0x30, 0xa4, 0xa2, 0x0f, 0x48,
-	0xe5, 0x03, 0xb2, 0xcd, 0x0f, 0x64, 0x9f, 0x6d, 0xb6, 0xd9, 0xe7, 0x0b, 0xb2, 0xca, 0x7f, 0xdc,
-	0x9a, 0x07, 0x40, 0x42, 0xf6, 0xb5, 0xe5, 0x5b, 0x75, 0x17, 0x77, 0xc3, 0xea, 0xe9, 0xe9, 0xe7,
-	0x41, 0x4f, 0x77, 0x13, 0xf4, 0x4b, 0x3f, 0x0c, 0xa2, 0x6b, 0xcf, 0xa5, 0x6e, 0x73, 0x1a, 0x47,
-	0x34, 0x42, 0xb0, 0xe0, 0xec, 0x68, 0x73, 0x1a, 0x4f, 0xc7, 0xe2, 0x62, 0x47, 0xfb, 0x30, 0x23,
-	0xf1, 0xbd, 0x3c, 0xd4, 0x69, 0x34, 0x8d, 0x16, 0x5a, 0xc6, 0x29, 0x54, 0xba, 0x37, 0x6e, 0x9c,
-	0x10, 0x8a, 0xb6, 0xa1, 0x3c, 0x0e, 0x7c, 0x12, 0xd2, 0x46, 0x61, 0xb7, 0xb0, 0x5f, 0xc2, 0xf2,
-	0x84, 0x10, 0xa8, 0xe3, 0x28, 0x0c, 0x1b, 0x45, 0xce, 0xe5, 0x34, 0x93, 0x4d, 0x48, 0x3c, 0x27,
-	0x71, 0x43, 0x11, 0xb2, 0xe2, 0x64, 0xfc, 0x5f, 0x81, 0xf5, 0x0e, 0x8f, 0xc3, 0x8e, 0xdd, 0x30,
-	0x71, 0xc7, 0xd4, 0x8f, 0x42, 0x74, 0x04, 0x90, 0x50, 0x97, 0x92, 0x09, 0x09, 0x69, 0xd2, 0x28,
-	0xec, 0x2a, 0xfb, 0x5a, 0x6b, 0xaf, 0xb9, 0x94, 0xc1, 0x47, 0x2a, 0xcd, 0x51, 0x2a, 0x8f, 0x97,
-	0x54, 0x51, 0x0b, 0x34, 0x32, 0x27, 0x21, 0x75, 0x68, 0x74, 0x4b, 0xc2, 0x86, 0xba, 0x5b, 0xd8,
-	0xd7, 0x5a, 0xeb, 0x4d, 0x91, 0xa0, 0xc9, 0x6e, 0x6c, 0x76, 0x81, 0x81, 0x64, 0xf4, 0xce, 0x7f,
-	0x8a, 0x50, 0xcb, 0xac, 0x21, 0x0b, 0xaa, 0x63, 0x97, 0x92, 0xeb, 0x28, 0xbe, 0xe7, 0x69, 0xd6,
-	0x5b, 0xcf, 0x1f, 0x19, 0x48, 0xb3, 0x2b, 0xf5, 0x70, 0x66, 0x01, 0xfd, 0x0a, 0x2a, 0x63, 0x81,
-	0x1e, 0x47, 0x47, 0x6b, 0x6d, 0x2c, 0x1b, 0x93, 0xc0, 0xe2, 0x54, 0x06, 0xe9, 0xa0, 0x24, 0x1f,
-	0x02, 0x0e, 0xd9, 0x0a, 0x66, 0xa4, 0xf1, 0xcf, 0x02, 0x54, 0x53, 0xbb, 0x68, 0x03, 0xd6, 0x3a,
-	0x96, 0x73, 0x3e, 0xc0, 0x66, 0x77, 0x78, 0x34, 0xe8, 0xbf, 0x37, 0x7b, 0xfa, 0x13, 0xb4, 0x02,
-	0xd5, 0x8e, 0xe5, 0x74, 0xcc, 0xa3, 0xfe, 0x40, 0x2f, 0xa0, 0x55, 0xa8, 0x75, 0x2c, 0xa7, 0x3b,
-	0x3c, 0x3d, 0xed, 0xdb, 0x7a, 0x11, 0xad, 0x81, 0xd6, 0xb1, 0x1c, 0x3c, 0xb4, 0xac, 0x4e, 0xbb,
-	0x7b, 0xa2, 0x2b, 0x68, 0x0b, 0xd6, 0x3b, 0x96, 0xd3, 0x3b, 0xb5, 0x9c, 0x9e, 0x79, 0x86, 0xcd,
-	0x6e, 0xdb, 0x36, 0x7b, 0xba, 0x8a, 0x00, 0xca, 0x8c, 0xdd, 0xb3, 0xf4, 0x92, 0xa4, 0x47, 0xa6,
-	0xad, 0x97, 0xa5, 0xb9, 0xfe, 0x60, 0x64, 0x62, 0x5b, 0xaf, 0xc8, 0xe3, 0xf9, 0x59, 0xaf, 0x6d,
-	0x9b, 0x7a, 0x55, 0x1e, 0x7b, 0xa6, 0x65, 0xda, 0xa6, 0x5e, 0x3b, 0x56, 0xab, 0x45, 0x5d, 0x39,
-	0x56, 0xab, 0x8a, 0xae, 0x1a, 0x7f, 0x2f, 0xc0, 0xd6, 0x88, 0xc6, 0xc4, 0x9d, 0x9c, 0x90, 0x7b,
-	0xec, 0x86, 0xd7, 0x04, 0x93, 0x0f, 0x33, 0x92, 0x50, 0xb4, 0x03, 0xd5, 0x69, 0x94, 0xf8, 0x0c,
-	0x3b, 0x0e, 0x70, 0x0d, 0x67, 0x67, 0x74, 0x08, 0xb5, 0x5b, 0x72, 0xef, 0xc4, 0x4c, 0x5e, 0x02,
-	0x86, 0x9a, 0x59, 0x41, 0x66, 0x96, 0xaa, 0xb7, 0x92, 0x5a, 0xc6, 0x57, 0xf9, 0x32, 0xbe, 0xc6,
-	0x15, 0x6c, 0x3f, 0x0c, 0x2a, 0x99, 0x46, 0x61, 0x42, 0x90, 0x05, 0x48, 0x28, 0x3a, 0x74, 0xf1,
-	0x6d, 0x79, 0x7c, 0x5a, 0xeb, 0xe9, 0x67, 0x0b, 0x00, 0xaf, 0x5f, 0x3e, 0x64, 0x19, 0x7f, 0x81,
-	0x0d, 0xe1, 0xc7, 0x76, 0x2f, 0x03, 0x92, 0x3c, 0x26, 0xf5, 0x6d, 0x28, 0x53, 0x2e, 0xdc, 0x28,
-	0xee, 0x2a, 0xfb, 0x35, 0x2c, 0x4f, 0x5f, 0x9b, 0xa1, 0x07, 0x9b, 0x79, 0xcf, 0xdf, 0x4b, 0x7e,
-	0xbf, 0x05, 0x15, 0xcf, 0x02, 0x82, 0x36, 0xa1, 0x34, 0x71, 0xe9, 0xf8, 0x46, 0x66, 0x23, 0x0e,
-	0x2c, 0x95, 0x2b, 0x3f, 0xa0, 0x24, 0xe6, 0x9f, 0xb0, 0x86, 0xe5, 0xc9, 0x78, 0x0e, 0xe5, 0xd7,
-	0x9c, 0x42, 0xbf, 0x80, 0x52, 0x3c, 0x63, 0xb9, 0x8a, 0xa7, 0xae, 0x2f, 0x07, 0xc0, 0x0c, 0x63,
-	0x71, 0x6d, 0xfc, 0xa3, 0x08, 0x2b, 0x22, 0xa0, 0x51, 0x34, 0x8b, 0xc7, 0x84, 0x21, 0x78, 0x4b,
-	0xee, 0x93, 0xa9, 0x3b, 0x26, 0x29, 0x82, 0xe9, 0x99, 0x05, 0x93, 0xdc, 0xb8, 0xb1, 0x27, 0xbd,
-	0x8a, 0x03, 0xfa, 0x1d, 0x68, 0x1c, 0x49, 0xea, 0xd0, 0xfb, 0x29, 0xe1, 0x18, 0xd6, 0x5b, 0x9b,
-	0x8b, 0xa2, 0xe2, 0x38, 0x51, 0xfb, 0x7e, 0x4a, 0x30, 0xd0, 0x8c, 0xce, 0x57, 0xa2, 0xfa, 0x88,
-	0x4a, 0x5c, 0x7c, 0xbf, 0x52, 0xee, 0xfb, 0x1d, 0x64, 0x60, 0x94, 0xa5, 0x95, 0xa5, 0x5c, 0x05,
-	0x1c, 0x29, 0x40, 0xa8, 0x09, 0xe5, 0x28, 0x74, 0x3c, 0x2f, 0x68, 0x54, 0x78, 0x98, 0x3f, 0x5a,
-	0x96, 0x1d, 0x86, 0xbd, 0x9e, 0xd5, 0x16, 0x9f, 0xa4, 0x14, 0x85, 0x3d, 0x2f, 0x30, 0xde, 0x42,
-	0x0d, 0x47, 0x77, 0xdd, 0x1b, 0x1e, 0x80, 0x01, 0xe5, 0x4b, 0x72, 0x15, 0xc5, 0x44, 0x7e, 0x55,
-	0x90, 0x5d, 0x0f, 0x47, 0x77, 0x58, 0xde, 0xa0, 0x5d, 0x28, 0xb9, 0x57, 0xe9, 0x87, 0xc9, 0x8b,
-	0x88, 0x0b, 0xc3, 0x85, 0x2a, 0x8e, 0xee, 0x78, 0xa7, 0x44, 0x4f, 0x41, 0x20, 0xe2, 0x84, 0xee,
-	0x24, 0x85, 0xbb, 0xc6, 0x39, 0x03, 0x77, 0x42, 0xd0, 0x0b, 0xd0, 0xe2, 0xe8, 0xce, 0x19, 0x73,
-	0xf7, 0xa2, 0x6c, 0xb5, 0xd6, 0x56, 0xee, 0x53, 0xa6, 0xc1, 0x61, 0x88, 0x53, 0x32, 0x31, 0xde,
-	0x02, 0xbc, 0xf6, 0x49, 0xe0, 0x3d, 0xca, 0xc9, 0xcf, 0x19, 0x7c, 0x24, 0xf0, 0x52, 0xfb, 0x2b,
-	0x32, 0x64, 0x6e, 0x01, 0xcb, 0x3b, 0x06, 0xc4, 0x88, 0x7d, 0xed, 0x23, 0xea, 0x7b, 0xdf, 0xa1,
-	0x46, 0x10, 0xa8, 0xd7, 0xd4, 0xf7, 0x78, 0x71, 0xd4, 0x30, 0xa7, 0x8d, 0x57, 0x50, 0xba, 0xe0,
-	0xe6, 0x5e, 0x80, 0xc6, 0xa5, 0x1c, 0xc6, 0x4e, 0x2b, 0x36, 0x97, 0x66, 0xe6, 0x1a, 0x43, 0x92,
-	0x92, 0x89, 0xd1, 0x86, 0xd5, 0x13, 0xe9, 0x96, 0x0b, 0x7c, 0x7d, 0x5c, 0xc6, 0xbf, 0x8a, 0x50,
-	0x39, 0x8e, 0x66, 0x71, 0xe8, 0x06, 0xa8, 0x0e, 0x45, 0xdf, 0xe3, 0x7a, 0x0a, 0x2e, 0xfa, 0x1e,
-	0xfa, 0x23, 0xd4, 0x27, 0xfe, 0x75, 0xec, 0xb2, 0x7a, 0x10, 0xa5, 0x5d, 0xe4, 0x35, 0xf3, 0xe3,
-	0xe5, 0xc8, 0x4e, 0x53, 0x09, 0x5e, 0xdf, 0xab, 0x93, 0xe5, 0xe3, 0x52, 0xc5, 0x2a, 0xb9, 0x8a,
-	0x7d, 0x06, 0xf5, 0x20, 0x1a, 0xbb, 0x81, 0x93, 0xf5, 0x2a, 0x95, 0x07, 0xb5, 0xca, 0xb9, 0x67,
-	0x69, 0xc3, 0x7a, 0x80, 0x4b, 0xe9, 0x91, 0xb8, 0xa0, 0x97, 0xb0, 0x32, 0x75, 0x63, 0xea, 0x8f,
-	0xfd, 0xa9, 0xcb, 0xa6, 0x7d, 0x99, 0x2b, 0xe6, 0xc2, 0xce, 0xe1, 0x86, 0x73, 0xe2, 0xe8, 0x67,
-	0xb0, 0x12, 0x93, 0x39, 0x89, 0x13, 0xe2, 0x39, 0xcc, 0x6f, 0x65, 0x57, 0xd9, 0x57, 0xb0, 0x96,
-	0xf2, 0xfa, 0x5e, 0x62, 0xfc, 0xaf, 0x08, 0xe5, 0x0b, 0x51, 0x5d, 0x07, 0xa0, 0x72, 0x6c, 0xc4,
-	0x24, 0xdf, 0x5e, 0x76, 0x22, 0x24, 0x38, 0x30, 0x5c, 0x06, 0xfd, 0x04, 0x6a, 0xd4, 0x9f, 0x90,
-	0x84, 0xba, 0x93, 0x29, 0x07, 0x53, 0xc1, 0x0b, 0xc6, 0xa7, 0x6a, 0x84, 0x8d, 0x6b, 0xf6, 0x58,
-	0x05, 0x3c, 0x8c, 0x44, 0xbf, 0x86, 0x1a, 0x7b, 0x13, 0x7c, 0xbb, 0x68, 0x94, 0xf8, 0x23, 0xdb,
-	0x7c, 0xf0, 0x22, 0xb8, 0x5b, 0x5c, 0x8d, 0xd3, 0x57, 0xf6, 0x7b, 0xd0, 0x78, 0x15, 0x4b, 0x25,
-	0xd1, 0x25, 0xb6, 0xf3, 0x5d, 0x22, 0x7d, 0x2d, 0x18, 0xae, 0x16, 0x2f, 0x67, 0x0f, 0x4a, 0x73,
-	0x1e, 0x52, 0x45, 0x6e, 0x39, 0xcb, 0xc9, 0x71, 0xd8, 0xc5, 0x3d, 0x1b, 0x21, 0x7f, 0x16, 0x55,
-	0xd4, 0xa8, 0x7e, 0x3c, 0x42, 0x64, 0x81, 0xe1, 0x54, 0x86, 0x21, 0x3c, 0x9e, 0xc5, 0x31, 0xdf,
-	0xa2, 0xfc, 0x09, 0x69, 0x6c, 0x72, 0x28, 0x34, 0xc9, 0xb3, 0xfd, 0x09, 0x31, 0xfe, 0x56, 0x84,
-	0xfa, 0x85, 0x98, 0x33, 0xe9, 0x6c, 0x7b, 0x05, 0x1b, 0xe4, 0xea, 0x8a, 0x8c, 0xa9, 0x3f, 0x27,
-	0xce, 0xd8, 0x0d, 0x02, 0x12, 0x3b, 0xb2, 0x60, 0xb5, 0xd6, 0x5a, 0x53, 0xec, 0x9b, 0x5d, 0xce,
-	0xef, 0xf7, 0xf0, 0x7a, 0x26, 0x2b, 0x59, 0x1e, 0x32, 0x61, 0xc3, 0x9f, 0x4c, 0x88, 0xe7, 0xbb,
-	0x74, 0xd9, 0x80, 0xe8, 0x54, 0x5b, 0xf2, 0xd9, 0x5f, 0xd8, 0x47, 0x2e, 0x25, 0x0b, 0x33, 0x99,
-	0x46, 0x66, 0xe6, 0x19, 0xab, 0xea, 0xf8, 0x3a, 0x1b, 0x97, 0xab, 0x52, 0xd3, 0xe6, 0x4c, 0x2c,
-	0x2f, 0x73, 0xa3, 0x58, 0x7d, 0x30, 0x8a, 0x17, 0x2d, 0xbb, 0xf4, 0xa5, 0x96, 0x6d, 0xbc, 0x84,
-	0xb5, 0x0c, 0x08, 0x39, 0x6a, 0x0f, 0xa0, 0xcc, 0x3f, 0x65, 0xda, 0x2b, 0xd0, 0xc7, 0x55, 0x87,
-	0xa5, 0x84, 0xf1, 0xd7, 0x22, 0xa0, 0x54, 0x3f, 0xba, 0x4b, 0x7e, 0xa0, 0x60, 0x6e, 0x42, 0x89,
-	0xf3, 0x25, 0x92, 0xe2, 0xc0, 0x70, 0x08, 0xdc, 0x84, 0x4e, 0x6f, 0x33, 0x18, 0x85, 0xf2, 0x5b,
-	0xf6, 0x8b, 0x49, 0x32, 0x0b, 0x28, 0x96, 0x12, 0xc6, 0xbf, 0x0b, 0xb0, 0x91, 0xc3, 0x41, 0x62,
-	0xb9, 0x68, 0xff, 0x85, 0x6f, 0x6f, 0xff, 0x68, 0x1f, 0xaa, 0xd3, 0xdb, 0xcf, 0x8c, 0x89, 0xec,
-	0xf6, 0x93, 0xaf, 0xf8, 0xa7, 0xa0, 0xc6, 0xd1, 0x5d, 0xd2, 0x50, 0xb9, 0xe6, 0xf2, 0x4c, 0xe4,
-	0x7c, 0x36, 0x58, 0x73, 0x79, 0xe4, 0x06, 0xab, 0xb8, 0x39, 0xf8, 0x03, 0x68, 0x4b, 0xf3, 0x99,
-	0xad, 0xd0, 0xfd, 0xa3, 0xc1, 0x10, 0x9b, 0xfa, 0x13, 0x54, 0x05, 0x75, 0x64, 0x0f, 0xcf, 0xf4,
-	0x02, 0xa3, 0xcc, 0x3f, 0x99, 0x5d, 0xb1, 0x96, 0x33, 0xca, 0x91, 0x42, 0xca, 0xc1, 0x7f, 0x0b,
-	0x00, 0x8b, 0x86, 0x84, 0x34, 0xa8, 0x9c, 0x0f, 0x4e, 0x06, 0xc3, 0x77, 0x03, 0x61, 0xe0, 0xc8,
-	0xee, 0xf7, 0xf4, 0x02, 0xaa, 0x41, 0x49, 0xec, 0xf9, 0x45, 0xe6, 0x41, 0x2e, 0xf9, 0x0a, 0xfb,
-	0x07, 0x90, 0x6d, 0xf8, 0x2a, 0xaa, 0x80, 0x92, 0xed, 0xf1, 0x72, 0x71, 0x2f, 0x33, 0x83, 0xd8,
-	0x3c, 0xb3, 0xda, 0x5d, 0x53, 0xaf, 0xb0, 0x8b, 0x6c, 0x85, 0x07, 0x28, 0xa7, 0xfb, 0x3b, 0xd3,
-	0x64, 0x5b, 0x3f, 0x30, 0x3f, 0x43, 0xfb, 0x8d, 0x89, 0x75, 0x8d, 0xf1, 0xf0, 0xf0, 0x9d, 0xbe,
-	0xc2, 0x78, 0xaf, 0xfb, 0xa6, 0xd5, 0xd3, 0x57, 0xd9, 0xda, 0xff, 0xc6, 0x6c, 0x63, 0xbb, 0x63,
-	0xb6, 0x6d, 0xbd, 0xce, 0x6e, 0x2e, 0x78, 0x80, 0x6b, 0xcc, 0xcd, 0xf1, 0xf0, 0x1c, 0x0f, 0xda,
-	0x96, 0xae, 0x1f, 0xec, 0xc1, 0x6a, 0x6e, 0xfe, 0x30, 0x5f, 0x76, 0xbb, 0x63, 0x99, 0x23, 0xfd,
-	0x09, 0xa3, 0x47, 0x6f, 0xda, 0xb8, 0x37, 0xd2, 0x0b, 0x9d, 0x5f, 0xbe, 0xdf, 0x9b, 0xfb, 0x94,
-	0x24, 0x49, 0xd3, 0x8f, 0x0e, 0x05, 0x75, 0x78, 0x1d, 0x1d, 0xce, 0xe9, 0x21, 0xff, 0x0b, 0x7a,
-	0xb8, 0x78, 0x3e, 0x97, 0x65, 0xce, 0xf9, 0xcd, 0x37, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xb4,
-	0x72, 0xde, 0xde, 0x0e, 0x00, 0x00,
+func init() { proto.RegisterFile("binlogdata.proto", fileDescriptor_5fd02bcb2e350dad) }
+
+var fileDescriptor_5fd02bcb2e350dad = []byte{
+	// 1620 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0x4d, 0x73, 0xf3, 0x48,
+	0x11, 0x8e, 0x2d, 0xf9, 0xab, 0x95, 0x38, 0xca, 0xe4, 0x03, 0x93, 0x62, 0xa9, 0xac, 0x8a, 0x25,
+	0x21, 0x55, 0x38, 0x60, 0xe0, 0xe5, 0xb4, 0x2c, 0xfe, 0x50, 0x12, 0x27, 0xb2, 0x9d, 0x77, 0xac,
+	0x64, 0xa9, 0xbd, 0xa8, 0x14, 0x6b, 0x92, 0x88, 0xc8, 0x92, 0x5f, 0x69, 0xec, 0x90, 0x1f, 0x40,
+	0xf1, 0x03, 0xb8, 0xf2, 0x07, 0x38, 0xc3, 0x95, 0x2b, 0x77, 0x7e, 0x01, 0x27, 0xfe, 0x07, 0x35,
+	0x1f, 0x92, 0xad, 0x64, 0xd9, 0x37, 0x4b, 0x15, 0x07, 0x2e, 0xaa, 0x9e, 0x9e, 0xee, 0x9e, 0x9e,
+	0x67, 0x9e, 0xee, 0xd1, 0x80, 0x7e, 0xeb, 0x87, 0x41, 0x74, 0xef, 0xb9, 0xd4, 0x6d, 0xce, 0xe2,
+	0x88, 0x46, 0x08, 0x96, 0x9a, 0x7d, 0x6d, 0x41, 0xe3, 0xd9, 0x44, 0x4c, 0xec, 0x6b, 0x1f, 0xe6,
+	0x24, 0x7e, 0x96, 0x83, 0x3a, 0x8d, 0x66, 0xd1, 0xd2, 0xcb, 0x18, 0x40, 0xa5, 0xfb, 0xe0, 0xc6,
+	0x09, 0xa1, 0x68, 0x0f, 0xca, 0x93, 0xc0, 0x27, 0x21, 0x6d, 0x14, 0x0e, 0x0a, 0x47, 0x25, 0x2c,
+	0x47, 0x08, 0x81, 0x3a, 0x89, 0xc2, 0xb0, 0x51, 0xe4, 0x5a, 0x2e, 0x33, 0xdb, 0x84, 0xc4, 0x0b,
+	0x12, 0x37, 0x14, 0x61, 0x2b, 0x46, 0xc6, 0xbf, 0x14, 0xd8, 0xea, 0xf0, 0x3c, 0xec, 0xd8, 0x0d,
+	0x13, 0x77, 0x42, 0xfd, 0x28, 0x44, 0x67, 0x00, 0x09, 0x75, 0x29, 0x99, 0x92, 0x90, 0x26, 0x8d,
+	0xc2, 0x81, 0x72, 0xa4, 0xb5, 0x0e, 0x9b, 0x2b, 0x3b, 0x78, 0xe5, 0xd2, 0x1c, 0xa7, 0xf6, 0x78,
+	0xc5, 0x15, 0xb5, 0x40, 0x23, 0x0b, 0x12, 0x52, 0x87, 0x46, 0x8f, 0x24, 0x6c, 0xa8, 0x07, 0x85,
+	0x23, 0xad, 0xb5, 0xd5, 0x14, 0x1b, 0x34, 0xd9, 0x8c, 0xcd, 0x26, 0x30, 0x90, 0x4c, 0xde, 0xff,
+	0x7b, 0x11, 0x6a, 0x59, 0x34, 0x64, 0x41, 0x75, 0xe2, 0x52, 0x72, 0x1f, 0xc5, 0xcf, 0x7c, 0x9b,
+	0xf5, 0xd6, 0x4f, 0xde, 0x98, 0x48, 0xb3, 0x2b, 0xfd, 0x70, 0x16, 0x01, 0xfd, 0x18, 0x2a, 0x13,
+	0x81, 0x1e, 0x47, 0x47, 0x6b, 0x6d, 0xaf, 0x06, 0x93, 0xc0, 0xe2, 0xd4, 0x06, 0xe9, 0xa0, 0x24,
+	0x1f, 0x02, 0x0e, 0xd9, 0x3a, 0x66, 0xa2, 0xf1, 0xe7, 0x02, 0x54, 0xd3, 0xb8, 0x68, 0x1b, 0x36,
+	0x3b, 0x96, 0x73, 0x3d, 0xc4, 0x66, 0x77, 0x74, 0x36, 0xec, 0x7f, 0x65, 0xf6, 0xf4, 0x35, 0xb4,
+	0x0e, 0xd5, 0x8e, 0xe5, 0x74, 0xcc, 0xb3, 0xfe, 0x50, 0x2f, 0xa0, 0x0d, 0xa8, 0x75, 0x2c, 0xa7,
+	0x3b, 0x1a, 0x0c, 0xfa, 0xb6, 0x5e, 0x44, 0x9b, 0xa0, 0x75, 0x2c, 0x07, 0x8f, 0x2c, 0xab, 0xd3,
+	0xee, 0x5e, 0xea, 0x0a, 0xda, 0x85, 0xad, 0x8e, 0xe5, 0xf4, 0x06, 0x96, 0xd3, 0x33, 0xaf, 0xb0,
+	0xd9, 0x6d, 0xdb, 0x66, 0x4f, 0x57, 0x11, 0x40, 0x99, 0xa9, 0x7b, 0x96, 0x5e, 0x92, 0xf2, 0xd8,
+	0xb4, 0xf5, 0xb2, 0x0c, 0xd7, 0x1f, 0x8e, 0x4d, 0x6c, 0xeb, 0x15, 0x39, 0xbc, 0xbe, 0xea, 0xb5,
+	0x6d, 0x53, 0xaf, 0xca, 0x61, 0xcf, 0xb4, 0x4c, 0xdb, 0xd4, 0x6b, 0x17, 0x6a, 0xb5, 0xa8, 0x2b,
+	0x17, 0x6a, 0x55, 0xd1, 0x55, 0xe3, 0x8f, 0x05, 0xd8, 0x1d, 0xd3, 0x98, 0xb8, 0xd3, 0x4b, 0xf2,
+	0x8c, 0xdd, 0xf0, 0x9e, 0x60, 0xf2, 0x61, 0x4e, 0x12, 0x8a, 0xf6, 0xa1, 0x3a, 0x8b, 0x12, 0x9f,
+	0x61, 0xc7, 0x01, 0xae, 0xe1, 0x6c, 0x8c, 0x4e, 0xa0, 0xf6, 0x48, 0x9e, 0x9d, 0x98, 0xd9, 0x4b,
+	0xc0, 0x50, 0x33, 0x23, 0x64, 0x16, 0xa9, 0xfa, 0x28, 0xa5, 0x55, 0x7c, 0x95, 0x8f, 0xe3, 0x6b,
+	0xdc, 0xc1, 0xde, 0xcb, 0xa4, 0x92, 0x59, 0x14, 0x26, 0x04, 0x59, 0x80, 0x84, 0xa3, 0x43, 0x97,
+	0x67, 0xcb, 0xf3, 0xd3, 0x5a, 0x9f, 0x7c, 0x23, 0x01, 0xf0, 0xd6, 0xed, 0x4b, 0x95, 0xf1, 0x3b,
+	0xd8, 0x16, 0xeb, 0xd8, 0xee, 0x6d, 0x40, 0x92, 0xb7, 0x6c, 0x7d, 0x0f, 0xca, 0x94, 0x1b, 0x37,
+	0x8a, 0x07, 0xca, 0x51, 0x0d, 0xcb, 0xd1, 0xb7, 0xdd, 0xa1, 0x07, 0x3b, 0xf9, 0x95, 0xff, 0x27,
+	0xfb, 0xfb, 0x39, 0xa8, 0x78, 0x1e, 0x10, 0xb4, 0x03, 0xa5, 0xa9, 0x4b, 0x27, 0x0f, 0x72, 0x37,
+	0x62, 0xc0, 0xb6, 0x72, 0xe7, 0x07, 0x94, 0xc4, 0xfc, 0x08, 0x6b, 0x58, 0x8e, 0x8c, 0xbf, 0x14,
+	0xa0, 0x7c, 0xca, 0x45, 0xf4, 0x43, 0x28, 0xc5, 0x73, 0xb6, 0x59, 0x51, 0xeb, 0xfa, 0x6a, 0x06,
+	0x2c, 0x32, 0x16, 0xd3, 0xa8, 0x0f, 0xf5, 0x3b, 0x9f, 0x04, 0x1e, 0x2f, 0xdd, 0x41, 0xe4, 0x09,
+	0x56, 0xd4, 0x5b, 0x9f, 0xae, 0x3a, 0x88, 0x98, 0xcd, 0xd3, 0x9c, 0x21, 0x7e, 0xe1, 0x68, 0xbc,
+	0x83, 0x7a, 0xde, 0x82, 0x95, 0x93, 0x89, 0xb1, 0x33, 0x1a, 0x3a, 0x83, 0xfe, 0x78, 0xd0, 0xb6,
+	0xbb, 0xe7, 0xfa, 0x1a, 0xaf, 0x18, 0x73, 0x6c, 0x3b, 0xe6, 0xe9, 0xe9, 0x08, 0xdb, 0x7a, 0xc1,
+	0xf8, 0x53, 0x11, 0xd6, 0x05, 0x28, 0xe3, 0x68, 0x1e, 0x4f, 0x08, 0x3b, 0xc5, 0x47, 0xf2, 0x9c,
+	0xcc, 0xdc, 0x09, 0x49, 0x4f, 0x31, 0x1d, 0x33, 0x40, 0x92, 0x07, 0x37, 0xf6, 0xe4, 0xce, 0xc5,
+	0x00, 0xfd, 0x02, 0x34, 0x7e, 0x9a, 0xd4, 0xa1, 0xcf, 0x33, 0xc2, 0xcf, 0xb1, 0xde, 0xda, 0x59,
+	0x12, 0x9b, 0x9f, 0x15, 0xb5, 0x9f, 0x67, 0x04, 0x03, 0xcd, 0xe4, 0x7c, 0x35, 0xa8, 0x6f, 0xa8,
+	0x86, 0x25, 0x87, 0x4a, 0x39, 0x0e, 0x1d, 0x67, 0x07, 0x52, 0x96, 0x51, 0x5e, 0xa1, 0x97, 0x1e,
+	0x12, 0x6a, 0x42, 0x39, 0x0a, 0x1d, 0xcf, 0x0b, 0x1a, 0x15, 0x9e, 0xe6, 0x77, 0x56, 0x6d, 0x47,
+	0x61, 0xaf, 0x67, 0xb5, 0x05, 0x2d, 0x4a, 0x51, 0xd8, 0xf3, 0x02, 0xe3, 0x3d, 0xd4, 0x70, 0xf4,
+	0xd4, 0x7d, 0xe0, 0x09, 0x18, 0x50, 0xbe, 0x25, 0x77, 0x51, 0x4c, 0x24, 0xb3, 0x40, 0x76, 0x5e,
+	0x1c, 0x3d, 0x61, 0x39, 0x83, 0x0e, 0xa0, 0xe4, 0xde, 0xa5, 0xe4, 0xc8, 0x9b, 0x88, 0x09, 0xc3,
+	0x85, 0x2a, 0x8e, 0x9e, 0xf8, 0x39, 0xa1, 0x4f, 0x40, 0x20, 0xe2, 0x84, 0xee, 0x34, 0x85, 0xbb,
+	0xc6, 0x35, 0x43, 0x77, 0x4a, 0xd0, 0x3b, 0xd0, 0xe2, 0xe8, 0xc9, 0x99, 0xf0, 0xe5, 0x45, 0xe9,
+	0x68, 0xad, 0xdd, 0x1c, 0x9b, 0xd2, 0xe4, 0x30, 0xc4, 0xa9, 0x98, 0x18, 0xef, 0x01, 0x96, 0x64,
+	0xf8, 0xd8, 0x22, 0x3f, 0x60, 0xf0, 0x91, 0xc0, 0x4b, 0xe3, 0xaf, 0xcb, 0x94, 0x79, 0x04, 0x2c,
+	0xe7, 0x18, 0x10, 0x63, 0x76, 0xda, 0x67, 0xd4, 0xf7, 0xfe, 0x0b, 0x8e, 0x20, 0x50, 0xef, 0xa9,
+	0xef, 0x71, 0x72, 0xd4, 0x30, 0x97, 0x8d, 0x2f, 0xa0, 0x74, 0xc3, 0xc3, 0xbd, 0x03, 0x8d, 0x5b,
+	0x39, 0x4c, 0x9d, 0x16, 0x4d, 0x6e, 0x9b, 0xd9, 0xd2, 0x18, 0x92, 0x54, 0x4c, 0x8c, 0x36, 0x6c,
+	0x5c, 0xca, 0x65, 0xb9, 0xc1, 0xb7, 0xcf, 0xcb, 0xf8, 0x6b, 0x11, 0x2a, 0x17, 0xd1, 0x3c, 0x0e,
+	0xdd, 0x00, 0xd5, 0xa1, 0xe8, 0x7b, 0xdc, 0x4f, 0xc1, 0x45, 0xdf, 0x43, 0xbf, 0x86, 0xfa, 0xd4,
+	0xbf, 0x8f, 0x5d, 0xc6, 0x07, 0x41, 0x6d, 0x51, 0x9d, 0xdf, 0x5d, 0xcd, 0x6c, 0x90, 0x5a, 0x70,
+	0x7e, 0x6f, 0x4c, 0x57, 0x87, 0x2b, 0x8c, 0x55, 0x72, 0x8c, 0xfd, 0x0c, 0xea, 0x41, 0x34, 0x71,
+	0x03, 0x27, 0xeb, 0x97, 0x2a, 0x4f, 0x6a, 0x83, 0x6b, 0xaf, 0xd2, 0xa6, 0xf9, 0x02, 0x97, 0xd2,
+	0x1b, 0x71, 0x41, 0x9f, 0xc3, 0xfa, 0xcc, 0x8d, 0xa9, 0x3f, 0xf1, 0x67, 0x2e, 0xfb, 0xe3, 0x28,
+	0x73, 0xc7, 0x5c, 0xda, 0x39, 0xdc, 0x70, 0xce, 0x1c, 0x7d, 0x0a, 0xeb, 0x31, 0x59, 0x90, 0x38,
+	0x21, 0x9e, 0xc3, 0xd6, 0xad, 0x1c, 0x28, 0x47, 0x0a, 0xd6, 0x52, 0x5d, 0xdf, 0x4b, 0x8c, 0x7f,
+	0x16, 0xa1, 0x7c, 0x23, 0xd8, 0x75, 0x0c, 0x2a, 0xc7, 0x46, 0xfc, 0x4d, 0xec, 0xad, 0x2e, 0x22,
+	0x2c, 0x38, 0x30, 0xdc, 0x06, 0x7d, 0x0f, 0x6a, 0xd4, 0x9f, 0x92, 0x84, 0xba, 0xd3, 0x19, 0x07,
+	0x53, 0xc1, 0x4b, 0xc5, 0xd7, 0x71, 0x84, 0xfd, 0x32, 0xb0, 0x62, 0x15, 0xf0, 0x30, 0x11, 0xfd,
+	0x14, 0x6a, 0xac, 0x26, 0xf8, 0x1f, 0x4e, 0xa3, 0xc4, 0x8b, 0x6c, 0xe7, 0x45, 0x45, 0xf0, 0x65,
+	0x71, 0x35, 0x4e, 0xab, 0xec, 0x97, 0xa0, 0x71, 0x16, 0x4b, 0x27, 0xd1, 0x25, 0xf6, 0xf2, 0x5d,
+	0x22, 0xad, 0x16, 0x0c, 0xcb, 0xc6, 0x8a, 0x0e, 0xa1, 0xb4, 0xe0, 0x29, 0x55, 0xe4, 0x9f, 0xd6,
+	0xea, 0xe6, 0x38, 0xec, 0x62, 0x9e, 0x5d, 0x63, 0xbf, 0x15, 0x2c, 0x6a, 0x54, 0x5f, 0x5f, 0x63,
+	0x92, 0x60, 0x38, 0xb5, 0x61, 0x08, 0x4f, 0xe6, 0x71, 0xcc, 0xff, 0xe4, 0xfc, 0x29, 0x69, 0xec,
+	0x70, 0x28, 0x34, 0xa9, 0xb3, 0xfd, 0x29, 0x31, 0xfe, 0x50, 0x84, 0xfa, 0x8d, 0xb8, 0xeb, 0xd2,
+	0xfb, 0xf5, 0x0b, 0xd8, 0x26, 0x77, 0x77, 0x64, 0x42, 0xfd, 0x05, 0x71, 0x26, 0x6e, 0x10, 0x90,
+	0xd8, 0x91, 0x84, 0xd5, 0x5a, 0x9b, 0x4d, 0xf1, 0xcf, 0xdb, 0xe5, 0xfa, 0x7e, 0x0f, 0x6f, 0x65,
+	0xb6, 0x52, 0xe5, 0x21, 0x13, 0xb6, 0xfd, 0xe9, 0x94, 0x78, 0xbe, 0x4b, 0x57, 0x03, 0x88, 0x4e,
+	0xb5, 0x2b, 0xcb, 0xfe, 0xc6, 0x3e, 0x73, 0x29, 0x59, 0x86, 0xc9, 0x3c, 0xb2, 0x30, 0x9f, 0x31,
+	0x56, 0xc7, 0xf7, 0xd9, 0x95, 0xbd, 0x21, 0x3d, 0x6d, 0xae, 0xc4, 0x72, 0x32, 0xf7, 0x3b, 0xa0,
+	0xbe, 0xf8, 0x1d, 0x58, 0xb6, 0xec, 0xd2, 0xc7, 0x5a, 0xb6, 0xf1, 0x39, 0x6c, 0x66, 0x40, 0xc8,
+	0xeb, 0xfe, 0x18, 0xca, 0xfc, 0x28, 0xd3, 0x5e, 0x81, 0x5e, 0xb3, 0x0e, 0x4b, 0x0b, 0xe3, 0xf7,
+	0x45, 0x40, 0xa9, 0x7f, 0xf4, 0x94, 0xfc, 0x9f, 0x82, 0xb9, 0x03, 0x25, 0xae, 0x97, 0x48, 0x8a,
+	0x01, 0xc3, 0x21, 0x70, 0x13, 0x3a, 0x7b, 0xcc, 0x60, 0x14, 0xce, 0xef, 0xd9, 0x17, 0x93, 0x64,
+	0x1e, 0x50, 0x2c, 0x2d, 0x8c, 0xbf, 0x15, 0x60, 0x3b, 0x87, 0x83, 0xc4, 0x72, 0xd9, 0xfe, 0x0b,
+	0xff, 0xb9, 0xfd, 0xa3, 0x23, 0xa8, 0xce, 0x1e, 0xbf, 0xe1, 0x9a, 0xc8, 0x66, 0xbf, 0xb6, 0x8a,
+	0xbf, 0x0f, 0x6a, 0x1c, 0x3d, 0x25, 0x0d, 0x95, 0x7b, 0xae, 0xde, 0x89, 0x5c, 0xcf, 0x2e, 0xd6,
+	0xdc, 0x3e, 0x72, 0x17, 0xab, 0x98, 0x39, 0xfe, 0x15, 0x68, 0x2b, 0xf7, 0x33, 0xfb, 0x8d, 0xef,
+	0x9f, 0x0d, 0x47, 0xd8, 0xd4, 0xd7, 0x50, 0x15, 0xd4, 0xb1, 0x3d, 0xba, 0xd2, 0x0b, 0x4c, 0x32,
+	0x7f, 0x63, 0x76, 0xc5, 0xd3, 0x80, 0x49, 0x8e, 0x34, 0x52, 0x8e, 0xff, 0x51, 0x00, 0x58, 0x36,
+	0x24, 0xa4, 0x41, 0xe5, 0x7a, 0x78, 0x39, 0x1c, 0x7d, 0x39, 0x14, 0x01, 0xce, 0xec, 0x7e, 0x4f,
+	0x2f, 0xa0, 0x1a, 0x94, 0xc4, 0x5b, 0xa3, 0xc8, 0x56, 0x90, 0x0f, 0x0d, 0x85, 0xbd, 0x42, 0xb2,
+	0x57, 0x86, 0x8a, 0x2a, 0xa0, 0x64, 0x6f, 0x09, 0xf9, 0x78, 0x28, 0xb3, 0x80, 0xd8, 0xbc, 0xb2,
+	0xda, 0x5d, 0x53, 0xaf, 0xb0, 0x89, 0xec, 0x19, 0x01, 0x50, 0x4e, 0xdf, 0x10, 0xcc, 0x93, 0xbd,
+	0x3c, 0x80, 0xad, 0x33, 0xb2, 0xcf, 0x4d, 0xac, 0x6b, 0x4c, 0x87, 0x47, 0x5f, 0xea, 0xeb, 0x4c,
+	0x77, 0xda, 0x37, 0xad, 0x9e, 0xbe, 0xc1, 0x9e, 0x1e, 0xe7, 0x66, 0x1b, 0xdb, 0x1d, 0xb3, 0x6d,
+	0xeb, 0x75, 0x36, 0x73, 0xc3, 0x13, 0xdc, 0x64, 0xcb, 0x5c, 0x8c, 0xae, 0xf1, 0xb0, 0x6d, 0xe9,
+	0xfa, 0xf1, 0x21, 0x6c, 0xe4, 0xee, 0x1f, 0xb6, 0x96, 0xdd, 0xee, 0x58, 0xe6, 0x58, 0x5f, 0x63,
+	0xf2, 0xf8, 0xbc, 0x8d, 0x7b, 0x63, 0xbd, 0xd0, 0xf9, 0xd1, 0x57, 0x87, 0x0b, 0x9f, 0x92, 0x24,
+	0x69, 0xfa, 0xd1, 0x89, 0x90, 0x4e, 0xee, 0xa3, 0x93, 0x05, 0x3d, 0xe1, 0xcf, 0xe0, 0x93, 0x65,
+	0xf9, 0xdc, 0x96, 0xb9, 0xe6, 0x67, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x13, 0xef, 0x5d, 0xd6,
+	0x62, 0x0f, 0x00, 0x00,
 }

vendor/vitess.io/vitess/go/vt/proto/query/query.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: query.proto
 
-package query // import "vitess.io/vitess/go/vt/proto/query"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import topodata "vitess.io/vitess/go/vt/proto/topodata"
-import vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
+package query
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	topodata "vitess.io/vitess/go/vt/proto/topodata"
+	vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Flags sent from the MySQL C API
 type MySqlFlag int32
@@ -68,6 +70,7 @@ var MySqlFlag_name = map[int32]string{
 	65536:  "UNIQUE_FLAG",
 	131072: "BINCMP_FLAG",
 }
+
 var MySqlFlag_value = map[string]int32{
 	"EMPTY":                 0,
 	"NOT_NULL_FLAG":         1,
@@ -94,8 +97,9 @@ var MySqlFlag_value = map[string]int32{
 func (x MySqlFlag) String() string {
 	return proto.EnumName(MySqlFlag_name, int32(x))
 }
+
 func (MySqlFlag) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{0}
+	return fileDescriptor_5c6ac9b241082464, []int{0}
 }
 
 // Flag allows us to qualify types by their common properties.
@@ -120,6 +124,7 @@ var Flag_name = map[int32]string{
 	4096: "ISTEXT",
 	8192: "ISBINARY",
 }
+
 var Flag_value = map[string]int32{
 	"NONE":       0,
 	"ISINTEGRAL": 256,
@@ -133,8 +138,9 @@ var Flag_value = map[string]int32{
 func (x Flag) String() string {
 	return proto.EnumName(Flag_name, int32(x))
 }
+
 func (Flag) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{1}
+	return fileDescriptor_5c6ac9b241082464, []int{1}
 }
 
 // Type defines the various supported data types in bind vars
@@ -276,6 +282,7 @@ var Type_name = map[int32]string{
 	2078:  "JSON",
 	31:    "EXPRESSION",
 }
+
 var Type_value = map[string]int32{
 	"NULL_TYPE":  0,
 	"INT8":       257,
@@ -314,8 +321,9 @@ var Type_value = map[string]int32{
 func (x Type) String() string {
 	return proto.EnumName(Type_name, int32(x))
 }
+
 func (Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{2}
+	return fileDescriptor_5c6ac9b241082464, []int{2}
 }
 
 // TransactionState represents the state of a distributed transaction.
@@ -334,6 +342,7 @@ var TransactionState_name = map[int32]string{
 	2: "COMMIT",
 	3: "ROLLBACK",
 }
+
 var TransactionState_value = map[string]int32{
 	"UNKNOWN":  0,
 	"PREPARE":  1,
@@ -344,8 +353,9 @@ var TransactionState_value = map[string]int32{
 func (x TransactionState) String() string {
 	return proto.EnumName(TransactionState_name, int32(x))
 }
+
 func (TransactionState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{3}
+	return fileDescriptor_5c6ac9b241082464, []int{3}
 }
 
 type ExecuteOptions_IncludedFields int32
@@ -361,6 +371,7 @@ var ExecuteOptions_IncludedFields_name = map[int32]string{
 	1: "TYPE_ONLY",
 	2: "ALL",
 }
+
 var ExecuteOptions_IncludedFields_value = map[string]int32{
 	"TYPE_AND_NAME": 0,
 	"TYPE_ONLY":     1,
@@ -370,8 +381,9 @@ var ExecuteOptions_IncludedFields_value = map[string]int32{
 func (x ExecuteOptions_IncludedFields) String() string {
 	return proto.EnumName(ExecuteOptions_IncludedFields_name, int32(x))
 }
+
 func (ExecuteOptions_IncludedFields) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{6, 0}
+	return fileDescriptor_5c6ac9b241082464, []int{6, 0}
 }
 
 type ExecuteOptions_Workload int32
@@ -389,6 +401,7 @@ var ExecuteOptions_Workload_name = map[int32]string{
 	2: "OLAP",
 	3: "DBA",
 }
+
 var ExecuteOptions_Workload_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"OLTP":        1,
@@ -399,8 +412,9 @@ var ExecuteOptions_Workload_value = map[string]int32{
 func (x ExecuteOptions_Workload) String() string {
 	return proto.EnumName(ExecuteOptions_Workload_name, int32(x))
 }
+
 func (ExecuteOptions_Workload) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{6, 1}
+	return fileDescriptor_5c6ac9b241082464, []int{6, 1}
 }
 
 type ExecuteOptions_TransactionIsolation int32
@@ -428,6 +442,7 @@ var ExecuteOptions_TransactionIsolation_name = map[int32]string{
 	5: "CONSISTENT_SNAPSHOT_READ_ONLY",
 	6: "AUTOCOMMIT",
 }
+
 var ExecuteOptions_TransactionIsolation_value = map[string]int32{
 	"DEFAULT":                       0,
 	"REPEATABLE_READ":               1,
@@ -441,8 +456,9 @@ var ExecuteOptions_TransactionIsolation_value = map[string]int32{
 func (x ExecuteOptions_TransactionIsolation) String() string {
 	return proto.EnumName(ExecuteOptions_TransactionIsolation_name, int32(x))
 }
+
 func (ExecuteOptions_TransactionIsolation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{6, 2}
+	return fileDescriptor_5c6ac9b241082464, []int{6, 2}
 }
 
 // The category of one statement.
@@ -459,6 +475,7 @@ var StreamEvent_Statement_Category_name = map[int32]string{
 	1: "DML",
 	2: "DDL",
 }
+
 var StreamEvent_Statement_Category_value = map[string]int32{
 	"Error": 0,
 	"DML":   1,
@@ -468,8 +485,9 @@ var StreamEvent_Statement_Category_value = map[string]int32{
 func (x StreamEvent_Statement_Category) String() string {
 	return proto.EnumName(StreamEvent_Statement_Category_name, int32(x))
 }
+
 func (StreamEvent_Statement_Category) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{12, 0, 0}
+	return fileDescriptor_5c6ac9b241082464, []int{12, 0, 0}
 }
 
 type SplitQueryRequest_Algorithm int32
@@ -483,6 +501,7 @@ var SplitQueryRequest_Algorithm_name = map[int32]string{
 	0: "EQUAL_SPLITS",
 	1: "FULL_SCAN",
 }
+
 var SplitQueryRequest_Algorithm_value = map[string]int32{
 	"EQUAL_SPLITS": 0,
 	"FULL_SCAN":    1,
@@ -491,8 +510,9 @@ var SplitQueryRequest_Algorithm_value = map[string]int32{
 func (x SplitQueryRequest_Algorithm) String() string {
 	return proto.EnumName(SplitQueryRequest_Algorithm_name, int32(x))
 }
+
 func (SplitQueryRequest_Algorithm) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{50, 0}
+	return fileDescriptor_5c6ac9b241082464, []int{50, 0}
 }
 
 // Target describes what the client expects the tablet is.
@@ -513,16 +533,17 @@ func (m *Target) Reset()         { *m = Target{} }
 func (m *Target) String() string { return proto.CompactTextString(m) }
 func (*Target) ProtoMessage()    {}
 func (*Target) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{0}
+	return fileDescriptor_5c6ac9b241082464, []int{0}
 }
+
 func (m *Target) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Target.Unmarshal(m, b)
 }
 func (m *Target) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Target.Marshal(b, m, deterministic)
 }
-func (dst *Target) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Target.Merge(dst, src)
+func (m *Target) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target.Merge(m, src)
 }
 func (m *Target) XXX_Size() int {
 	return xxx_messageInfo_Target.Size(m)
@@ -581,16 +602,17 @@ func (m *VTGateCallerID) Reset()         { *m = VTGateCallerID{} }
 func (m *VTGateCallerID) String() string { return proto.CompactTextString(m) }
 func (*VTGateCallerID) ProtoMessage()    {}
 func (*VTGateCallerID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{1}
+	return fileDescriptor_5c6ac9b241082464, []int{1}
 }
+
 func (m *VTGateCallerID) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VTGateCallerID.Unmarshal(m, b)
 }
 func (m *VTGateCallerID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VTGateCallerID.Marshal(b, m, deterministic)
 }
-func (dst *VTGateCallerID) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VTGateCallerID.Merge(dst, src)
+func (m *VTGateCallerID) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VTGateCallerID.Merge(m, src)
 }
 func (m *VTGateCallerID) XXX_Size() int {
 	return xxx_messageInfo_VTGateCallerID.Size(m)
@@ -637,16 +659,17 @@ func (m *EventToken) Reset()         { *m = EventToken{} }
 func (m *EventToken) String() string { return proto.CompactTextString(m) }
 func (*EventToken) ProtoMessage()    {}
 func (*EventToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{2}
+	return fileDescriptor_5c6ac9b241082464, []int{2}
 }
+
 func (m *EventToken) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EventToken.Unmarshal(m, b)
 }
 func (m *EventToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EventToken.Marshal(b, m, deterministic)
 }
-func (dst *EventToken) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EventToken.Merge(dst, src)
+func (m *EventToken) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventToken.Merge(m, src)
 }
 func (m *EventToken) XXX_Size() int {
 	return xxx_messageInfo_EventToken.Size(m)
@@ -691,16 +714,17 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{3}
+	return fileDescriptor_5c6ac9b241082464, []int{3}
 }
+
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
 }
 func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
 }
-func (dst *Value) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Value.Merge(dst, src)
+func (m *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(m, src)
 }
 func (m *Value) XXX_Size() int {
 	return xxx_messageInfo_Value.Size(m)
@@ -740,16 +764,17 @@ func (m *BindVariable) Reset()         { *m = BindVariable{} }
 func (m *BindVariable) String() string { return proto.CompactTextString(m) }
 func (*BindVariable) ProtoMessage()    {}
 func (*BindVariable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{4}
+	return fileDescriptor_5c6ac9b241082464, []int{4}
 }
+
 func (m *BindVariable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BindVariable.Unmarshal(m, b)
 }
 func (m *BindVariable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BindVariable.Marshal(b, m, deterministic)
 }
-func (dst *BindVariable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BindVariable.Merge(dst, src)
+func (m *BindVariable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BindVariable.Merge(m, src)
 }
 func (m *BindVariable) XXX_Size() int {
 	return xxx_messageInfo_BindVariable.Size(m)
@@ -797,16 +822,17 @@ func (m *BoundQuery) Reset()         { *m = BoundQuery{} }
 func (m *BoundQuery) String() string { return proto.CompactTextString(m) }
 func (*BoundQuery) ProtoMessage()    {}
 func (*BoundQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{5}
+	return fileDescriptor_5c6ac9b241082464, []int{5}
 }
+
 func (m *BoundQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundQuery.Unmarshal(m, b)
 }
 func (m *BoundQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundQuery.Marshal(b, m, deterministic)
 }
-func (dst *BoundQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundQuery.Merge(dst, src)
+func (m *BoundQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundQuery.Merge(m, src)
 }
 func (m *BoundQuery) XXX_Size() int {
 	return xxx_messageInfo_BoundQuery.Size(m)
@@ -871,16 +897,17 @@ func (m *ExecuteOptions) Reset()         { *m = ExecuteOptions{} }
 func (m *ExecuteOptions) String() string { return proto.CompactTextString(m) }
 func (*ExecuteOptions) ProtoMessage()    {}
 func (*ExecuteOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{6}
+	return fileDescriptor_5c6ac9b241082464, []int{6}
 }
+
 func (m *ExecuteOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteOptions.Unmarshal(m, b)
 }
 func (m *ExecuteOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteOptions.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteOptions.Merge(dst, src)
+func (m *ExecuteOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteOptions.Merge(m, src)
 }
 func (m *ExecuteOptions) XXX_Size() int {
 	return xxx_messageInfo_ExecuteOptions.Size(m)
@@ -977,16 +1004,17 @@ func (m *Field) Reset()         { *m = Field{} }
 func (m *Field) String() string { return proto.CompactTextString(m) }
 func (*Field) ProtoMessage()    {}
 func (*Field) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{7}
+	return fileDescriptor_5c6ac9b241082464, []int{7}
 }
+
 func (m *Field) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Field.Unmarshal(m, b)
 }
 func (m *Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Field.Marshal(b, m, deterministic)
 }
-func (dst *Field) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Field.Merge(dst, src)
+func (m *Field) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Field.Merge(m, src)
 }
 func (m *Field) XXX_Size() int {
 	return xxx_messageInfo_Field.Size(m)
@@ -1085,16 +1113,17 @@ func (m *Row) Reset()         { *m = Row{} }
 func (m *Row) String() string { return proto.CompactTextString(m) }
 func (*Row) ProtoMessage()    {}
 func (*Row) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{8}
+	return fileDescriptor_5c6ac9b241082464, []int{8}
 }
+
 func (m *Row) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Row.Unmarshal(m, b)
 }
 func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Row.Marshal(b, m, deterministic)
 }
-func (dst *Row) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Row.Merge(dst, src)
+func (m *Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Row.Merge(m, src)
 }
 func (m *Row) XXX_Size() int {
 	return xxx_messageInfo_Row.Size(m)
@@ -1137,16 +1166,17 @@ func (m *ResultExtras) Reset()         { *m = ResultExtras{} }
 func (m *ResultExtras) String() string { return proto.CompactTextString(m) }
 func (*ResultExtras) ProtoMessage()    {}
 func (*ResultExtras) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{9}
+	return fileDescriptor_5c6ac9b241082464, []int{9}
 }
+
 func (m *ResultExtras) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResultExtras.Unmarshal(m, b)
 }
 func (m *ResultExtras) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResultExtras.Marshal(b, m, deterministic)
 }
-func (dst *ResultExtras) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResultExtras.Merge(dst, src)
+func (m *ResultExtras) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResultExtras.Merge(m, src)
 }
 func (m *ResultExtras) XXX_Size() int {
 	return xxx_messageInfo_ResultExtras.Size(m)
@@ -1195,16 +1225,17 @@ func (m *QueryResult) Reset()         { *m = QueryResult{} }
 func (m *QueryResult) String() string { return proto.CompactTextString(m) }
 func (*QueryResult) ProtoMessage()    {}
 func (*QueryResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{10}
+	return fileDescriptor_5c6ac9b241082464, []int{10}
 }
+
 func (m *QueryResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryResult.Unmarshal(m, b)
 }
 func (m *QueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryResult.Marshal(b, m, deterministic)
 }
-func (dst *QueryResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryResult.Merge(dst, src)
+func (m *QueryResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResult.Merge(m, src)
 }
 func (m *QueryResult) XXX_Size() int {
 	return xxx_messageInfo_QueryResult.Size(m)
@@ -1264,16 +1295,17 @@ func (m *QueryWarning) Reset()         { *m = QueryWarning{} }
 func (m *QueryWarning) String() string { return proto.CompactTextString(m) }
 func (*QueryWarning) ProtoMessage()    {}
 func (*QueryWarning) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{11}
+	return fileDescriptor_5c6ac9b241082464, []int{11}
 }
+
 func (m *QueryWarning) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryWarning.Unmarshal(m, b)
 }
 func (m *QueryWarning) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryWarning.Marshal(b, m, deterministic)
 }
-func (dst *QueryWarning) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryWarning.Merge(dst, src)
+func (m *QueryWarning) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryWarning.Merge(m, src)
 }
 func (m *QueryWarning) XXX_Size() int {
 	return xxx_messageInfo_QueryWarning.Size(m)
@@ -1315,16 +1347,17 @@ func (m *StreamEvent) Reset()         { *m = StreamEvent{} }
 func (m *StreamEvent) String() string { return proto.CompactTextString(m) }
 func (*StreamEvent) ProtoMessage()    {}
 func (*StreamEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{12}
+	return fileDescriptor_5c6ac9b241082464, []int{12}
 }
+
 func (m *StreamEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamEvent.Unmarshal(m, b)
 }
 func (m *StreamEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamEvent.Marshal(b, m, deterministic)
 }
-func (dst *StreamEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamEvent.Merge(dst, src)
+func (m *StreamEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamEvent.Merge(m, src)
 }
 func (m *StreamEvent) XXX_Size() int {
 	return xxx_messageInfo_StreamEvent.Size(m)
@@ -1368,16 +1401,17 @@ func (m *StreamEvent_Statement) Reset()         { *m = StreamEvent_Statement{} }
 func (m *StreamEvent_Statement) String() string { return proto.CompactTextString(m) }
 func (*StreamEvent_Statement) ProtoMessage()    {}
 func (*StreamEvent_Statement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{12, 0}
+	return fileDescriptor_5c6ac9b241082464, []int{12, 0}
 }
+
 func (m *StreamEvent_Statement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamEvent_Statement.Unmarshal(m, b)
 }
 func (m *StreamEvent_Statement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamEvent_Statement.Marshal(b, m, deterministic)
 }
-func (dst *StreamEvent_Statement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamEvent_Statement.Merge(dst, src)
+func (m *StreamEvent_Statement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamEvent_Statement.Merge(m, src)
 }
 func (m *StreamEvent_Statement) XXX_Size() int {
 	return xxx_messageInfo_StreamEvent_Statement.Size(m)
@@ -1440,16 +1474,17 @@ func (m *ExecuteRequest) Reset()         { *m = ExecuteRequest{} }
 func (m *ExecuteRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteRequest) ProtoMessage()    {}
 func (*ExecuteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{13}
+	return fileDescriptor_5c6ac9b241082464, []int{13}
 }
+
 func (m *ExecuteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteRequest.Unmarshal(m, b)
 }
 func (m *ExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteRequest.Merge(dst, src)
+func (m *ExecuteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteRequest.Merge(m, src)
 }
 func (m *ExecuteRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteRequest.Size(m)
@@ -1514,16 +1549,17 @@ func (m *ExecuteResponse) Reset()         { *m = ExecuteResponse{} }
 func (m *ExecuteResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteResponse) ProtoMessage()    {}
 func (*ExecuteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{14}
+	return fileDescriptor_5c6ac9b241082464, []int{14}
 }
+
 func (m *ExecuteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteResponse.Unmarshal(m, b)
 }
 func (m *ExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteResponse.Merge(dst, src)
+func (m *ExecuteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteResponse.Merge(m, src)
 }
 func (m *ExecuteResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteResponse.Size(m)
@@ -1558,16 +1594,17 @@ func (m *ResultWithError) Reset()         { *m = ResultWithError{} }
 func (m *ResultWithError) String() string { return proto.CompactTextString(m) }
 func (*ResultWithError) ProtoMessage()    {}
 func (*ResultWithError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{15}
+	return fileDescriptor_5c6ac9b241082464, []int{15}
 }
+
 func (m *ResultWithError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResultWithError.Unmarshal(m, b)
 }
 func (m *ResultWithError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResultWithError.Marshal(b, m, deterministic)
 }
-func (dst *ResultWithError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResultWithError.Merge(dst, src)
+func (m *ResultWithError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResultWithError.Merge(m, src)
 }
 func (m *ResultWithError) XXX_Size() int {
 	return xxx_messageInfo_ResultWithError.Size(m)
@@ -1610,16 +1647,17 @@ func (m *ExecuteBatchRequest) Reset()         { *m = ExecuteBatchRequest{} }
 func (m *ExecuteBatchRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchRequest) ProtoMessage()    {}
 func (*ExecuteBatchRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{16}
+	return fileDescriptor_5c6ac9b241082464, []int{16}
 }
+
 func (m *ExecuteBatchRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchRequest.Unmarshal(m, b)
 }
 func (m *ExecuteBatchRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchRequest.Merge(dst, src)
+func (m *ExecuteBatchRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchRequest.Merge(m, src)
 }
 func (m *ExecuteBatchRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchRequest.Size(m)
@@ -1691,16 +1729,17 @@ func (m *ExecuteBatchResponse) Reset()         { *m = ExecuteBatchResponse{} }
 func (m *ExecuteBatchResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchResponse) ProtoMessage()    {}
 func (*ExecuteBatchResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{17}
+	return fileDescriptor_5c6ac9b241082464, []int{17}
 }
+
 func (m *ExecuteBatchResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchResponse.Unmarshal(m, b)
 }
 func (m *ExecuteBatchResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchResponse.Merge(dst, src)
+func (m *ExecuteBatchResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchResponse.Merge(m, src)
 }
 func (m *ExecuteBatchResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchResponse.Size(m)
@@ -1735,16 +1774,17 @@ func (m *StreamExecuteRequest) Reset()         { *m = StreamExecuteRequest{} }
 func (m *StreamExecuteRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteRequest) ProtoMessage()    {}
 func (*StreamExecuteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{18}
+	return fileDescriptor_5c6ac9b241082464, []int{18}
 }
+
 func (m *StreamExecuteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteRequest.Unmarshal(m, b)
 }
 func (m *StreamExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteRequest.Merge(dst, src)
+func (m *StreamExecuteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteRequest.Merge(m, src)
 }
 func (m *StreamExecuteRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteRequest.Size(m)
@@ -1809,16 +1849,17 @@ func (m *StreamExecuteResponse) Reset()         { *m = StreamExecuteResponse{} }
 func (m *StreamExecuteResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteResponse) ProtoMessage()    {}
 func (*StreamExecuteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{19}
+	return fileDescriptor_5c6ac9b241082464, []int{19}
 }
+
 func (m *StreamExecuteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteResponse.Unmarshal(m, b)
 }
 func (m *StreamExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteResponse.Merge(dst, src)
+func (m *StreamExecuteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteResponse.Merge(m, src)
 }
 func (m *StreamExecuteResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteResponse.Size(m)
@@ -1851,16 +1892,17 @@ func (m *BeginRequest) Reset()         { *m = BeginRequest{} }
 func (m *BeginRequest) String() string { return proto.CompactTextString(m) }
 func (*BeginRequest) ProtoMessage()    {}
 func (*BeginRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{20}
+	return fileDescriptor_5c6ac9b241082464, []int{20}
 }
+
 func (m *BeginRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginRequest.Unmarshal(m, b)
 }
 func (m *BeginRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginRequest.Marshal(b, m, deterministic)
 }
-func (dst *BeginRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginRequest.Merge(dst, src)
+func (m *BeginRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginRequest.Merge(m, src)
 }
 func (m *BeginRequest) XXX_Size() int {
 	return xxx_messageInfo_BeginRequest.Size(m)
@@ -1911,16 +1953,17 @@ func (m *BeginResponse) Reset()         { *m = BeginResponse{} }
 func (m *BeginResponse) String() string { return proto.CompactTextString(m) }
 func (*BeginResponse) ProtoMessage()    {}
 func (*BeginResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{21}
+	return fileDescriptor_5c6ac9b241082464, []int{21}
 }
+
 func (m *BeginResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginResponse.Unmarshal(m, b)
 }
 func (m *BeginResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginResponse.Marshal(b, m, deterministic)
 }
-func (dst *BeginResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginResponse.Merge(dst, src)
+func (m *BeginResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginResponse.Merge(m, src)
 }
 func (m *BeginResponse) XXX_Size() int {
 	return xxx_messageInfo_BeginResponse.Size(m)
@@ -1953,16 +1996,17 @@ func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
 func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
 func (*CommitRequest) ProtoMessage()    {}
 func (*CommitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{22}
+	return fileDescriptor_5c6ac9b241082464, []int{22}
 }
+
 func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
 func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
 }
-func (dst *CommitRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitRequest.Merge(dst, src)
+func (m *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(m, src)
 }
 func (m *CommitRequest) XXX_Size() int {
 	return xxx_messageInfo_CommitRequest.Size(m)
@@ -2012,16 +2056,17 @@ func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
 func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
 func (*CommitResponse) ProtoMessage()    {}
 func (*CommitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{23}
+	return fileDescriptor_5c6ac9b241082464, []int{23}
 }
+
 func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
 }
 func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
 }
-func (dst *CommitResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResponse.Merge(dst, src)
+func (m *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(m, src)
 }
 func (m *CommitResponse) XXX_Size() int {
 	return xxx_messageInfo_CommitResponse.Size(m)
@@ -2047,16 +2092,17 @@ func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
 func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackRequest) ProtoMessage()    {}
 func (*RollbackRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{24}
+	return fileDescriptor_5c6ac9b241082464, []int{24}
 }
+
 func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
 }
 func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+func (m *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(m, src)
 }
 func (m *RollbackRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackRequest.Size(m)
@@ -2106,16 +2152,17 @@ func (m *RollbackResponse) Reset()         { *m = RollbackResponse{} }
 func (m *RollbackResponse) String() string { return proto.CompactTextString(m) }
 func (*RollbackResponse) ProtoMessage()    {}
 func (*RollbackResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{25}
+	return fileDescriptor_5c6ac9b241082464, []int{25}
 }
+
 func (m *RollbackResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackResponse.Unmarshal(m, b)
 }
 func (m *RollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackResponse.Marshal(b, m, deterministic)
 }
-func (dst *RollbackResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackResponse.Merge(dst, src)
+func (m *RollbackResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackResponse.Merge(m, src)
 }
 func (m *RollbackResponse) XXX_Size() int {
 	return xxx_messageInfo_RollbackResponse.Size(m)
@@ -2142,16 +2189,17 @@ func (m *PrepareRequest) Reset()         { *m = PrepareRequest{} }
 func (m *PrepareRequest) String() string { return proto.CompactTextString(m) }
 func (*PrepareRequest) ProtoMessage()    {}
 func (*PrepareRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{26}
+	return fileDescriptor_5c6ac9b241082464, []int{26}
 }
+
 func (m *PrepareRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrepareRequest.Unmarshal(m, b)
 }
 func (m *PrepareRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrepareRequest.Marshal(b, m, deterministic)
 }
-func (dst *PrepareRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrepareRequest.Merge(dst, src)
+func (m *PrepareRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrepareRequest.Merge(m, src)
 }
 func (m *PrepareRequest) XXX_Size() int {
 	return xxx_messageInfo_PrepareRequest.Size(m)
@@ -2208,16 +2256,17 @@ func (m *PrepareResponse) Reset()         { *m = PrepareResponse{} }
 func (m *PrepareResponse) String() string { return proto.CompactTextString(m) }
 func (*PrepareResponse) ProtoMessage()    {}
 func (*PrepareResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{27}
+	return fileDescriptor_5c6ac9b241082464, []int{27}
 }
+
 func (m *PrepareResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrepareResponse.Unmarshal(m, b)
 }
 func (m *PrepareResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrepareResponse.Marshal(b, m, deterministic)
 }
-func (dst *PrepareResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrepareResponse.Merge(dst, src)
+func (m *PrepareResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrepareResponse.Merge(m, src)
 }
 func (m *PrepareResponse) XXX_Size() int {
 	return xxx_messageInfo_PrepareResponse.Size(m)
@@ -2243,16 +2292,17 @@ func (m *CommitPreparedRequest) Reset()         { *m = CommitPreparedRequest{} }
 func (m *CommitPreparedRequest) String() string { return proto.CompactTextString(m) }
 func (*CommitPreparedRequest) ProtoMessage()    {}
 func (*CommitPreparedRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{28}
+	return fileDescriptor_5c6ac9b241082464, []int{28}
 }
+
 func (m *CommitPreparedRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitPreparedRequest.Unmarshal(m, b)
 }
 func (m *CommitPreparedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitPreparedRequest.Marshal(b, m, deterministic)
 }
-func (dst *CommitPreparedRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitPreparedRequest.Merge(dst, src)
+func (m *CommitPreparedRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitPreparedRequest.Merge(m, src)
 }
 func (m *CommitPreparedRequest) XXX_Size() int {
 	return xxx_messageInfo_CommitPreparedRequest.Size(m)
@@ -2302,16 +2352,17 @@ func (m *CommitPreparedResponse) Reset()         { *m = CommitPreparedResponse{}
 func (m *CommitPreparedResponse) String() string { return proto.CompactTextString(m) }
 func (*CommitPreparedResponse) ProtoMessage()    {}
 func (*CommitPreparedResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{29}
+	return fileDescriptor_5c6ac9b241082464, []int{29}
 }
+
 func (m *CommitPreparedResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitPreparedResponse.Unmarshal(m, b)
 }
 func (m *CommitPreparedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitPreparedResponse.Marshal(b, m, deterministic)
 }
-func (dst *CommitPreparedResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitPreparedResponse.Merge(dst, src)
+func (m *CommitPreparedResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitPreparedResponse.Merge(m, src)
 }
 func (m *CommitPreparedResponse) XXX_Size() int {
 	return xxx_messageInfo_CommitPreparedResponse.Size(m)
@@ -2338,16 +2389,17 @@ func (m *RollbackPreparedRequest) Reset()         { *m = RollbackPreparedRequest
 func (m *RollbackPreparedRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackPreparedRequest) ProtoMessage()    {}
 func (*RollbackPreparedRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{30}
+	return fileDescriptor_5c6ac9b241082464, []int{30}
 }
+
 func (m *RollbackPreparedRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackPreparedRequest.Unmarshal(m, b)
 }
 func (m *RollbackPreparedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackPreparedRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackPreparedRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackPreparedRequest.Merge(dst, src)
+func (m *RollbackPreparedRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackPreparedRequest.Merge(m, src)
 }
 func (m *RollbackPreparedRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackPreparedRequest.Size(m)
@@ -2404,16 +2456,17 @@ func (m *RollbackPreparedResponse) Reset()         { *m = RollbackPreparedRespon
 func (m *RollbackPreparedResponse) String() string { return proto.CompactTextString(m) }
 func (*RollbackPreparedResponse) ProtoMessage()    {}
 func (*RollbackPreparedResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{31}
+	return fileDescriptor_5c6ac9b241082464, []int{31}
 }
+
 func (m *RollbackPreparedResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackPreparedResponse.Unmarshal(m, b)
 }
 func (m *RollbackPreparedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackPreparedResponse.Marshal(b, m, deterministic)
 }
-func (dst *RollbackPreparedResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackPreparedResponse.Merge(dst, src)
+func (m *RollbackPreparedResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackPreparedResponse.Merge(m, src)
 }
 func (m *RollbackPreparedResponse) XXX_Size() int {
 	return xxx_messageInfo_RollbackPreparedResponse.Size(m)
@@ -2440,16 +2493,17 @@ func (m *CreateTransactionRequest) Reset()         { *m = CreateTransactionReque
 func (m *CreateTransactionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTransactionRequest) ProtoMessage()    {}
 func (*CreateTransactionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{32}
+	return fileDescriptor_5c6ac9b241082464, []int{32}
 }
+
 func (m *CreateTransactionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTransactionRequest.Unmarshal(m, b)
 }
 func (m *CreateTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTransactionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTransactionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTransactionRequest.Merge(dst, src)
+func (m *CreateTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTransactionRequest.Merge(m, src)
 }
 func (m *CreateTransactionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTransactionRequest.Size(m)
@@ -2506,16 +2560,17 @@ func (m *CreateTransactionResponse) Reset()         { *m = CreateTransactionResp
 func (m *CreateTransactionResponse) String() string { return proto.CompactTextString(m) }
 func (*CreateTransactionResponse) ProtoMessage()    {}
 func (*CreateTransactionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{33}
+	return fileDescriptor_5c6ac9b241082464, []int{33}
 }
+
 func (m *CreateTransactionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTransactionResponse.Unmarshal(m, b)
 }
 func (m *CreateTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTransactionResponse.Marshal(b, m, deterministic)
 }
-func (dst *CreateTransactionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTransactionResponse.Merge(dst, src)
+func (m *CreateTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTransactionResponse.Merge(m, src)
 }
 func (m *CreateTransactionResponse) XXX_Size() int {
 	return xxx_messageInfo_CreateTransactionResponse.Size(m)
@@ -2542,16 +2597,17 @@ func (m *StartCommitRequest) Reset()         { *m = StartCommitRequest{} }
 func (m *StartCommitRequest) String() string { return proto.CompactTextString(m) }
 func (*StartCommitRequest) ProtoMessage()    {}
 func (*StartCommitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{34}
+	return fileDescriptor_5c6ac9b241082464, []int{34}
 }
+
 func (m *StartCommitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StartCommitRequest.Unmarshal(m, b)
 }
 func (m *StartCommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StartCommitRequest.Marshal(b, m, deterministic)
 }
-func (dst *StartCommitRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StartCommitRequest.Merge(dst, src)
+func (m *StartCommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartCommitRequest.Merge(m, src)
 }
 func (m *StartCommitRequest) XXX_Size() int {
 	return xxx_messageInfo_StartCommitRequest.Size(m)
@@ -2608,16 +2664,17 @@ func (m *StartCommitResponse) Reset()         { *m = StartCommitResponse{} }
 func (m *StartCommitResponse) String() string { return proto.CompactTextString(m) }
 func (*StartCommitResponse) ProtoMessage()    {}
 func (*StartCommitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{35}
+	return fileDescriptor_5c6ac9b241082464, []int{35}
 }
+
 func (m *StartCommitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StartCommitResponse.Unmarshal(m, b)
 }
 func (m *StartCommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StartCommitResponse.Marshal(b, m, deterministic)
 }
-func (dst *StartCommitResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StartCommitResponse.Merge(dst, src)
+func (m *StartCommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartCommitResponse.Merge(m, src)
 }
 func (m *StartCommitResponse) XXX_Size() int {
 	return xxx_messageInfo_StartCommitResponse.Size(m)
@@ -2644,16 +2701,17 @@ func (m *SetRollbackRequest) Reset()         { *m = SetRollbackRequest{} }
 func (m *SetRollbackRequest) String() string { return proto.CompactTextString(m) }
 func (*SetRollbackRequest) ProtoMessage()    {}
 func (*SetRollbackRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{36}
+	return fileDescriptor_5c6ac9b241082464, []int{36}
 }
+
 func (m *SetRollbackRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetRollbackRequest.Unmarshal(m, b)
 }
 func (m *SetRollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetRollbackRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetRollbackRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetRollbackRequest.Merge(dst, src)
+func (m *SetRollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetRollbackRequest.Merge(m, src)
 }
 func (m *SetRollbackRequest) XXX_Size() int {
 	return xxx_messageInfo_SetRollbackRequest.Size(m)
@@ -2710,16 +2768,17 @@ func (m *SetRollbackResponse) Reset()         { *m = SetRollbackResponse{} }
 func (m *SetRollbackResponse) String() string { return proto.CompactTextString(m) }
 func (*SetRollbackResponse) ProtoMessage()    {}
 func (*SetRollbackResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{37}
+	return fileDescriptor_5c6ac9b241082464, []int{37}
 }
+
 func (m *SetRollbackResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetRollbackResponse.Unmarshal(m, b)
 }
 func (m *SetRollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetRollbackResponse.Marshal(b, m, deterministic)
 }
-func (dst *SetRollbackResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetRollbackResponse.Merge(dst, src)
+func (m *SetRollbackResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetRollbackResponse.Merge(m, src)
 }
 func (m *SetRollbackResponse) XXX_Size() int {
 	return xxx_messageInfo_SetRollbackResponse.Size(m)
@@ -2745,16 +2804,17 @@ func (m *ConcludeTransactionRequest) Reset()         { *m = ConcludeTransactionR
 func (m *ConcludeTransactionRequest) String() string { return proto.CompactTextString(m) }
 func (*ConcludeTransactionRequest) ProtoMessage()    {}
 func (*ConcludeTransactionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{38}
+	return fileDescriptor_5c6ac9b241082464, []int{38}
 }
+
 func (m *ConcludeTransactionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConcludeTransactionRequest.Unmarshal(m, b)
 }
 func (m *ConcludeTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConcludeTransactionRequest.Marshal(b, m, deterministic)
 }
-func (dst *ConcludeTransactionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConcludeTransactionRequest.Merge(dst, src)
+func (m *ConcludeTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConcludeTransactionRequest.Merge(m, src)
 }
 func (m *ConcludeTransactionRequest) XXX_Size() int {
 	return xxx_messageInfo_ConcludeTransactionRequest.Size(m)
@@ -2804,16 +2864,17 @@ func (m *ConcludeTransactionResponse) Reset()         { *m = ConcludeTransaction
 func (m *ConcludeTransactionResponse) String() string { return proto.CompactTextString(m) }
 func (*ConcludeTransactionResponse) ProtoMessage()    {}
 func (*ConcludeTransactionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{39}
+	return fileDescriptor_5c6ac9b241082464, []int{39}
 }
+
 func (m *ConcludeTransactionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConcludeTransactionResponse.Unmarshal(m, b)
 }
 func (m *ConcludeTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConcludeTransactionResponse.Marshal(b, m, deterministic)
 }
-func (dst *ConcludeTransactionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConcludeTransactionResponse.Merge(dst, src)
+func (m *ConcludeTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConcludeTransactionResponse.Merge(m, src)
 }
 func (m *ConcludeTransactionResponse) XXX_Size() int {
 	return xxx_messageInfo_ConcludeTransactionResponse.Size(m)
@@ -2839,16 +2900,17 @@ func (m *ReadTransactionRequest) Reset()         { *m = ReadTransactionRequest{}
 func (m *ReadTransactionRequest) String() string { return proto.CompactTextString(m) }
 func (*ReadTransactionRequest) ProtoMessage()    {}
 func (*ReadTransactionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{40}
+	return fileDescriptor_5c6ac9b241082464, []int{40}
 }
+
 func (m *ReadTransactionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadTransactionRequest.Unmarshal(m, b)
 }
 func (m *ReadTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadTransactionRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReadTransactionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadTransactionRequest.Merge(dst, src)
+func (m *ReadTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadTransactionRequest.Merge(m, src)
 }
 func (m *ReadTransactionRequest) XXX_Size() int {
 	return xxx_messageInfo_ReadTransactionRequest.Size(m)
@@ -2899,16 +2961,17 @@ func (m *ReadTransactionResponse) Reset()         { *m = ReadTransactionResponse
 func (m *ReadTransactionResponse) String() string { return proto.CompactTextString(m) }
 func (*ReadTransactionResponse) ProtoMessage()    {}
 func (*ReadTransactionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{41}
+	return fileDescriptor_5c6ac9b241082464, []int{41}
 }
+
 func (m *ReadTransactionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadTransactionResponse.Unmarshal(m, b)
 }
 func (m *ReadTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadTransactionResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReadTransactionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadTransactionResponse.Merge(dst, src)
+func (m *ReadTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadTransactionResponse.Merge(m, src)
 }
 func (m *ReadTransactionResponse) XXX_Size() int {
 	return xxx_messageInfo_ReadTransactionResponse.Size(m)
@@ -2942,16 +3005,17 @@ func (m *BeginExecuteRequest) Reset()         { *m = BeginExecuteRequest{} }
 func (m *BeginExecuteRequest) String() string { return proto.CompactTextString(m) }
 func (*BeginExecuteRequest) ProtoMessage()    {}
 func (*BeginExecuteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{42}
+	return fileDescriptor_5c6ac9b241082464, []int{42}
 }
+
 func (m *BeginExecuteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginExecuteRequest.Unmarshal(m, b)
 }
 func (m *BeginExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginExecuteRequest.Marshal(b, m, deterministic)
 }
-func (dst *BeginExecuteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginExecuteRequest.Merge(dst, src)
+func (m *BeginExecuteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginExecuteRequest.Merge(m, src)
 }
 func (m *BeginExecuteRequest) XXX_Size() int {
 	return xxx_messageInfo_BeginExecuteRequest.Size(m)
@@ -3015,16 +3079,17 @@ func (m *BeginExecuteResponse) Reset()         { *m = BeginExecuteResponse{} }
 func (m *BeginExecuteResponse) String() string { return proto.CompactTextString(m) }
 func (*BeginExecuteResponse) ProtoMessage()    {}
 func (*BeginExecuteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{43}
+	return fileDescriptor_5c6ac9b241082464, []int{43}
 }
+
 func (m *BeginExecuteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginExecuteResponse.Unmarshal(m, b)
 }
 func (m *BeginExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginExecuteResponse.Marshal(b, m, deterministic)
 }
-func (dst *BeginExecuteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginExecuteResponse.Merge(dst, src)
+func (m *BeginExecuteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginExecuteResponse.Merge(m, src)
 }
 func (m *BeginExecuteResponse) XXX_Size() int {
 	return xxx_messageInfo_BeginExecuteResponse.Size(m)
@@ -3073,16 +3138,17 @@ func (m *BeginExecuteBatchRequest) Reset()         { *m = BeginExecuteBatchReque
 func (m *BeginExecuteBatchRequest) String() string { return proto.CompactTextString(m) }
 func (*BeginExecuteBatchRequest) ProtoMessage()    {}
 func (*BeginExecuteBatchRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{44}
+	return fileDescriptor_5c6ac9b241082464, []int{44}
 }
+
 func (m *BeginExecuteBatchRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginExecuteBatchRequest.Unmarshal(m, b)
 }
 func (m *BeginExecuteBatchRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginExecuteBatchRequest.Marshal(b, m, deterministic)
 }
-func (dst *BeginExecuteBatchRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginExecuteBatchRequest.Merge(dst, src)
+func (m *BeginExecuteBatchRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginExecuteBatchRequest.Merge(m, src)
 }
 func (m *BeginExecuteBatchRequest) XXX_Size() int {
 	return xxx_messageInfo_BeginExecuteBatchRequest.Size(m)
@@ -3153,16 +3219,17 @@ func (m *BeginExecuteBatchResponse) Reset()         { *m = BeginExecuteBatchResp
 func (m *BeginExecuteBatchResponse) String() string { return proto.CompactTextString(m) }
 func (*BeginExecuteBatchResponse) ProtoMessage()    {}
 func (*BeginExecuteBatchResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{45}
+	return fileDescriptor_5c6ac9b241082464, []int{45}
 }
+
 func (m *BeginExecuteBatchResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginExecuteBatchResponse.Unmarshal(m, b)
 }
 func (m *BeginExecuteBatchResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginExecuteBatchResponse.Marshal(b, m, deterministic)
 }
-func (dst *BeginExecuteBatchResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginExecuteBatchResponse.Merge(dst, src)
+func (m *BeginExecuteBatchResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginExecuteBatchResponse.Merge(m, src)
 }
 func (m *BeginExecuteBatchResponse) XXX_Size() int {
 	return xxx_messageInfo_BeginExecuteBatchResponse.Size(m)
@@ -3210,16 +3277,17 @@ func (m *MessageStreamRequest) Reset()         { *m = MessageStreamRequest{} }
 func (m *MessageStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*MessageStreamRequest) ProtoMessage()    {}
 func (*MessageStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{46}
+	return fileDescriptor_5c6ac9b241082464, []int{46}
 }
+
 func (m *MessageStreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageStreamRequest.Unmarshal(m, b)
 }
 func (m *MessageStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MessageStreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *MessageStreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MessageStreamRequest.Merge(dst, src)
+func (m *MessageStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageStreamRequest.Merge(m, src)
 }
 func (m *MessageStreamRequest) XXX_Size() int {
 	return xxx_messageInfo_MessageStreamRequest.Size(m)
@@ -3270,16 +3338,17 @@ func (m *MessageStreamResponse) Reset()         { *m = MessageStreamResponse{} }
 func (m *MessageStreamResponse) String() string { return proto.CompactTextString(m) }
 func (*MessageStreamResponse) ProtoMessage()    {}
 func (*MessageStreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{47}
+	return fileDescriptor_5c6ac9b241082464, []int{47}
 }
+
 func (m *MessageStreamResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageStreamResponse.Unmarshal(m, b)
 }
 func (m *MessageStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MessageStreamResponse.Marshal(b, m, deterministic)
 }
-func (dst *MessageStreamResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MessageStreamResponse.Merge(dst, src)
+func (m *MessageStreamResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageStreamResponse.Merge(m, src)
 }
 func (m *MessageStreamResponse) XXX_Size() int {
 	return xxx_messageInfo_MessageStreamResponse.Size(m)
@@ -3314,16 +3383,17 @@ func (m *MessageAckRequest) Reset()         { *m = MessageAckRequest{} }
 func (m *MessageAckRequest) String() string { return proto.CompactTextString(m) }
 func (*MessageAckRequest) ProtoMessage()    {}
 func (*MessageAckRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{48}
+	return fileDescriptor_5c6ac9b241082464, []int{48}
 }
+
 func (m *MessageAckRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageAckRequest.Unmarshal(m, b)
 }
 func (m *MessageAckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MessageAckRequest.Marshal(b, m, deterministic)
 }
-func (dst *MessageAckRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MessageAckRequest.Merge(dst, src)
+func (m *MessageAckRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageAckRequest.Merge(m, src)
 }
 func (m *MessageAckRequest) XXX_Size() int {
 	return xxx_messageInfo_MessageAckRequest.Size(m)
@@ -3384,16 +3454,17 @@ func (m *MessageAckResponse) Reset()         { *m = MessageAckResponse{} }
 func (m *MessageAckResponse) String() string { return proto.CompactTextString(m) }
 func (*MessageAckResponse) ProtoMessage()    {}
 func (*MessageAckResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{49}
+	return fileDescriptor_5c6ac9b241082464, []int{49}
 }
+
 func (m *MessageAckResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageAckResponse.Unmarshal(m, b)
 }
 func (m *MessageAckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MessageAckResponse.Marshal(b, m, deterministic)
 }
-func (dst *MessageAckResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MessageAckResponse.Merge(dst, src)
+func (m *MessageAckResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageAckResponse.Merge(m, src)
 }
 func (m *MessageAckResponse) XXX_Size() int {
 	return xxx_messageInfo_MessageAckResponse.Size(m)
@@ -3432,16 +3503,17 @@ func (m *SplitQueryRequest) Reset()         { *m = SplitQueryRequest{} }
 func (m *SplitQueryRequest) String() string { return proto.CompactTextString(m) }
 func (*SplitQueryRequest) ProtoMessage()    {}
 func (*SplitQueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{50}
+	return fileDescriptor_5c6ac9b241082464, []int{50}
 }
+
 func (m *SplitQueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SplitQueryRequest.Unmarshal(m, b)
 }
 func (m *SplitQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SplitQueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *SplitQueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SplitQueryRequest.Merge(dst, src)
+func (m *SplitQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SplitQueryRequest.Merge(m, src)
 }
 func (m *SplitQueryRequest) XXX_Size() int {
 	return xxx_messageInfo_SplitQueryRequest.Size(m)
@@ -3523,16 +3595,17 @@ func (m *QuerySplit) Reset()         { *m = QuerySplit{} }
 func (m *QuerySplit) String() string { return proto.CompactTextString(m) }
 func (*QuerySplit) ProtoMessage()    {}
 func (*QuerySplit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{51}
+	return fileDescriptor_5c6ac9b241082464, []int{51}
 }
+
 func (m *QuerySplit) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QuerySplit.Unmarshal(m, b)
 }
 func (m *QuerySplit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QuerySplit.Marshal(b, m, deterministic)
 }
-func (dst *QuerySplit) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QuerySplit.Merge(dst, src)
+func (m *QuerySplit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuerySplit.Merge(m, src)
 }
 func (m *QuerySplit) XXX_Size() int {
 	return xxx_messageInfo_QuerySplit.Size(m)
@@ -3570,16 +3643,17 @@ func (m *SplitQueryResponse) Reset()         { *m = SplitQueryResponse{} }
 func (m *SplitQueryResponse) String() string { return proto.CompactTextString(m) }
 func (*SplitQueryResponse) ProtoMessage()    {}
 func (*SplitQueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{52}
+	return fileDescriptor_5c6ac9b241082464, []int{52}
 }
+
 func (m *SplitQueryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SplitQueryResponse.Unmarshal(m, b)
 }
 func (m *SplitQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SplitQueryResponse.Marshal(b, m, deterministic)
 }
-func (dst *SplitQueryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SplitQueryResponse.Merge(dst, src)
+func (m *SplitQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SplitQueryResponse.Merge(m, src)
 }
 func (m *SplitQueryResponse) XXX_Size() int {
 	return xxx_messageInfo_SplitQueryResponse.Size(m)
@@ -3608,16 +3682,17 @@ func (m *StreamHealthRequest) Reset()         { *m = StreamHealthRequest{} }
 func (m *StreamHealthRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamHealthRequest) ProtoMessage()    {}
 func (*StreamHealthRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{53}
+	return fileDescriptor_5c6ac9b241082464, []int{53}
 }
+
 func (m *StreamHealthRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamHealthRequest.Unmarshal(m, b)
 }
 func (m *StreamHealthRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamHealthRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamHealthRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamHealthRequest.Merge(dst, src)
+func (m *StreamHealthRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamHealthRequest.Merge(m, src)
 }
 func (m *StreamHealthRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamHealthRequest.Size(m)
@@ -3667,16 +3742,17 @@ func (m *RealtimeStats) Reset()         { *m = RealtimeStats{} }
 func (m *RealtimeStats) String() string { return proto.CompactTextString(m) }
 func (*RealtimeStats) ProtoMessage()    {}
 func (*RealtimeStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{54}
+	return fileDescriptor_5c6ac9b241082464, []int{54}
 }
+
 func (m *RealtimeStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RealtimeStats.Unmarshal(m, b)
 }
 func (m *RealtimeStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RealtimeStats.Marshal(b, m, deterministic)
 }
-func (dst *RealtimeStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RealtimeStats.Merge(dst, src)
+func (m *RealtimeStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RealtimeStats.Merge(m, src)
 }
 func (m *RealtimeStats) XXX_Size() int {
 	return xxx_messageInfo_RealtimeStats.Size(m)
@@ -3755,16 +3831,17 @@ func (m *AggregateStats) Reset()         { *m = AggregateStats{} }
 func (m *AggregateStats) String() string { return proto.CompactTextString(m) }
 func (*AggregateStats) ProtoMessage()    {}
 func (*AggregateStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{55}
+	return fileDescriptor_5c6ac9b241082464, []int{55}
 }
+
 func (m *AggregateStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AggregateStats.Unmarshal(m, b)
 }
 func (m *AggregateStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AggregateStats.Marshal(b, m, deterministic)
 }
-func (dst *AggregateStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AggregateStats.Merge(dst, src)
+func (m *AggregateStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AggregateStats.Merge(m, src)
 }
 func (m *AggregateStats) XXX_Size() int {
 	return xxx_messageInfo_AggregateStats.Size(m)
@@ -3850,7 +3927,7 @@ type StreamHealthResponse struct {
 	// realtime_stats contains information about the tablet status.
 	// It is only filled in if the information is about a tablet.
 	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 constrains information about the group of tablet status.
 	// 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,proto3" json:"aggregate_stats,omitempty"`
 	// tablet_alias is the alias of the sending tablet. The discovery/healthcheck.go
@@ -3867,16 +3944,17 @@ func (m *StreamHealthResponse) Reset()         { *m = StreamHealthResponse{} }
 func (m *StreamHealthResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamHealthResponse) ProtoMessage()    {}
 func (*StreamHealthResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{56}
+	return fileDescriptor_5c6ac9b241082464, []int{56}
 }
+
 func (m *StreamHealthResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamHealthResponse.Unmarshal(m, b)
 }
 func (m *StreamHealthResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamHealthResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamHealthResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamHealthResponse.Merge(dst, src)
+func (m *StreamHealthResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamHealthResponse.Merge(m, src)
 }
 func (m *StreamHealthResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamHealthResponse.Size(m)
@@ -3951,16 +4029,17 @@ func (m *UpdateStreamRequest) Reset()         { *m = UpdateStreamRequest{} }
 func (m *UpdateStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateStreamRequest) ProtoMessage()    {}
 func (*UpdateStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{57}
+	return fileDescriptor_5c6ac9b241082464, []int{57}
 }
+
 func (m *UpdateStreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateStreamRequest.Unmarshal(m, b)
 }
 func (m *UpdateStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateStreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateStreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateStreamRequest.Merge(dst, src)
+func (m *UpdateStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateStreamRequest.Merge(m, src)
 }
 func (m *UpdateStreamRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateStreamRequest.Size(m)
@@ -4018,16 +4097,17 @@ func (m *UpdateStreamResponse) Reset()         { *m = UpdateStreamResponse{} }
 func (m *UpdateStreamResponse) String() string { return proto.CompactTextString(m) }
 func (*UpdateStreamResponse) ProtoMessage()    {}
 func (*UpdateStreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{58}
+	return fileDescriptor_5c6ac9b241082464, []int{58}
 }
+
 func (m *UpdateStreamResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateStreamResponse.Unmarshal(m, b)
 }
 func (m *UpdateStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateStreamResponse.Marshal(b, m, deterministic)
 }
-func (dst *UpdateStreamResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateStreamResponse.Merge(dst, src)
+func (m *UpdateStreamResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateStreamResponse.Merge(m, src)
 }
 func (m *UpdateStreamResponse) XXX_Size() int {
 	return xxx_messageInfo_UpdateStreamResponse.Size(m)
@@ -4060,16 +4140,17 @@ func (m *TransactionMetadata) Reset()         { *m = TransactionMetadata{} }
 func (m *TransactionMetadata) String() string { return proto.CompactTextString(m) }
 func (*TransactionMetadata) ProtoMessage()    {}
 func (*TransactionMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_1f9acea6b6c417bb, []int{59}
+	return fileDescriptor_5c6ac9b241082464, []int{59}
 }
+
 func (m *TransactionMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionMetadata.Unmarshal(m, b)
 }
 func (m *TransactionMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TransactionMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionMetadata.Merge(dst, src)
+func (m *TransactionMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionMetadata.Merge(m, src)
 }
 func (m *TransactionMetadata) XXX_Size() int {
 	return xxx_messageInfo_TransactionMetadata.Size(m)
@@ -4109,6 +4190,15 @@ func (m *TransactionMetadata) GetParticipants() []*Target {
 }
 
 func init() {
+	proto.RegisterEnum("query.MySqlFlag", MySqlFlag_name, MySqlFlag_value)
+	proto.RegisterEnum("query.Flag", Flag_name, Flag_value)
+	proto.RegisterEnum("query.Type", Type_name, Type_value)
+	proto.RegisterEnum("query.TransactionState", TransactionState_name, TransactionState_value)
+	proto.RegisterEnum("query.ExecuteOptions_IncludedFields", ExecuteOptions_IncludedFields_name, ExecuteOptions_IncludedFields_value)
+	proto.RegisterEnum("query.ExecuteOptions_Workload", ExecuteOptions_Workload_name, ExecuteOptions_Workload_value)
+	proto.RegisterEnum("query.ExecuteOptions_TransactionIsolation", ExecuteOptions_TransactionIsolation_name, ExecuteOptions_TransactionIsolation_value)
+	proto.RegisterEnum("query.StreamEvent_Statement_Category", StreamEvent_Statement_Category_name, StreamEvent_Statement_Category_value)
+	proto.RegisterEnum("query.SplitQueryRequest_Algorithm", SplitQueryRequest_Algorithm_name, SplitQueryRequest_Algorithm_value)
 	proto.RegisterType((*Target)(nil), "query.Target")
 	proto.RegisterType((*VTGateCallerID)(nil), "query.VTGateCallerID")
 	proto.RegisterType((*EventToken)(nil), "query.EventToken")
@@ -4171,20 +4261,11 @@ func init() {
 	proto.RegisterType((*UpdateStreamRequest)(nil), "query.UpdateStreamRequest")
 	proto.RegisterType((*UpdateStreamResponse)(nil), "query.UpdateStreamResponse")
 	proto.RegisterType((*TransactionMetadata)(nil), "query.TransactionMetadata")
-	proto.RegisterEnum("query.MySqlFlag", MySqlFlag_name, MySqlFlag_value)
-	proto.RegisterEnum("query.Flag", Flag_name, Flag_value)
-	proto.RegisterEnum("query.Type", Type_name, Type_value)
-	proto.RegisterEnum("query.TransactionState", TransactionState_name, TransactionState_value)
-	proto.RegisterEnum("query.ExecuteOptions_IncludedFields", ExecuteOptions_IncludedFields_name, ExecuteOptions_IncludedFields_value)
-	proto.RegisterEnum("query.ExecuteOptions_Workload", ExecuteOptions_Workload_name, ExecuteOptions_Workload_value)
-	proto.RegisterEnum("query.ExecuteOptions_TransactionIsolation", ExecuteOptions_TransactionIsolation_name, ExecuteOptions_TransactionIsolation_value)
-	proto.RegisterEnum("query.StreamEvent_Statement_Category", StreamEvent_Statement_Category_name, StreamEvent_Statement_Category_value)
-	proto.RegisterEnum("query.SplitQueryRequest_Algorithm", SplitQueryRequest_Algorithm_name, SplitQueryRequest_Algorithm_value)
 }
 
-func init() { proto.RegisterFile("query.proto", fileDescriptor_query_1f9acea6b6c417bb) }
+func init() { proto.RegisterFile("query.proto", fileDescriptor_5c6ac9b241082464) }
 
-var fileDescriptor_query_1f9acea6b6c417bb = []byte{
+var fileDescriptor_5c6ac9b241082464 = []byte{
 	// 3270 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcb, 0x73, 0x1b, 0xc9,
 	0x79, 0xd7, 0xe0, 0x45, 0xe0, 0x03, 0x01, 0x36, 0x1b, 0xa4, 0x84, 0xe5, 0xbe, 0xe8, 0xb1, 0xd7,

vendor/vitess.io/vitess/go/vt/proto/topodata/topodata.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: topodata.proto
 
-package topodata // import "vitess.io/vitess/go/vt/proto/topodata"
+package topodata
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	vttime "vitess.io/vitess/go/vt/proto/vttime"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +20,35 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+// KeyspaceType describes the type of the keyspace
+type KeyspaceType int32
+
+const (
+	// NORMAL is the default value
+	KeyspaceType_NORMAL KeyspaceType = 0
+	// SNAPSHOT is when we are creating a snapshot keyspace
+	KeyspaceType_SNAPSHOT KeyspaceType = 1
+)
+
+var KeyspaceType_name = map[int32]string{
+	0: "NORMAL",
+	1: "SNAPSHOT",
+}
+
+var KeyspaceType_value = map[string]int32{
+	"NORMAL":   0,
+	"SNAPSHOT": 1,
+}
+
+func (x KeyspaceType) String() string {
+	return proto.EnumName(KeyspaceType_name, int32(x))
+}
+
+func (KeyspaceType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_52c350cb619f972e, []int{0}
+}
 
 // KeyspaceIdType describes the type of the sharding key for a
 // range-based sharded keyspace.
@@ -38,6 +70,7 @@ var KeyspaceIdType_name = map[int32]string{
 	1: "UINT64",
 	2: "BYTES",
 }
+
 var KeyspaceIdType_value = map[string]int32{
 	"UNSET":  0,
 	"UINT64": 1,
@@ -47,8 +80,9 @@ var KeyspaceIdType_value = map[string]int32{
 func (x KeyspaceIdType) String() string {
 	return proto.EnumName(KeyspaceIdType_name, int32(x))
 }
+
 func (KeyspaceIdType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{0}
+	return fileDescriptor_52c350cb619f972e, []int{1}
 }
 
 // TabletType represents the type of a given tablet.
@@ -100,6 +134,7 @@ var TabletType_name = map[int32]string{
 	7: "RESTORE",
 	8: "DRAINED",
 }
+
 var TabletType_value = map[string]int32{
 	"UNKNOWN":      0,
 	"MASTER":       1,
@@ -116,8 +151,9 @@ var TabletType_value = map[string]int32{
 func (x TabletType) String() string {
 	return proto.EnumName(TabletType_name, int32(x))
 }
+
 func (TabletType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{1}
+	return fileDescriptor_52c350cb619f972e, []int{2}
 }
 
 // KeyRange describes a range of sharding keys, when range-based
@@ -134,16 +170,17 @@ func (m *KeyRange) Reset()         { *m = KeyRange{} }
 func (m *KeyRange) String() string { return proto.CompactTextString(m) }
 func (*KeyRange) ProtoMessage()    {}
 func (*KeyRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{0}
+	return fileDescriptor_52c350cb619f972e, []int{0}
 }
+
 func (m *KeyRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeyRange.Unmarshal(m, b)
 }
 func (m *KeyRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeyRange.Marshal(b, m, deterministic)
 }
-func (dst *KeyRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeyRange.Merge(dst, src)
+func (m *KeyRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeyRange.Merge(m, src)
 }
 func (m *KeyRange) XXX_Size() int {
 	return xxx_messageInfo_KeyRange.Size(m)
@@ -184,16 +221,17 @@ func (m *TabletAlias) Reset()         { *m = TabletAlias{} }
 func (m *TabletAlias) String() string { return proto.CompactTextString(m) }
 func (*TabletAlias) ProtoMessage()    {}
 func (*TabletAlias) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{1}
+	return fileDescriptor_52c350cb619f972e, []int{1}
 }
+
 func (m *TabletAlias) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TabletAlias.Unmarshal(m, b)
 }
 func (m *TabletAlias) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TabletAlias.Marshal(b, m, deterministic)
 }
-func (dst *TabletAlias) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TabletAlias.Merge(dst, src)
+func (m *TabletAlias) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TabletAlias.Merge(m, src)
 }
 func (m *TabletAlias) XXX_Size() int {
 	return xxx_messageInfo_TabletAlias.Size(m)
@@ -260,16 +298,17 @@ func (m *Tablet) Reset()         { *m = Tablet{} }
 func (m *Tablet) String() string { return proto.CompactTextString(m) }
 func (*Tablet) ProtoMessage()    {}
 func (*Tablet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{2}
+	return fileDescriptor_52c350cb619f972e, []int{2}
 }
+
 func (m *Tablet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Tablet.Unmarshal(m, b)
 }
 func (m *Tablet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Tablet.Marshal(b, m, deterministic)
 }
-func (dst *Tablet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Tablet.Merge(dst, src)
+func (m *Tablet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Tablet.Merge(m, src)
 }
 func (m *Tablet) XXX_Size() int {
 	return xxx_messageInfo_Tablet.Size(m)
@@ -395,16 +434,17 @@ func (m *Shard) Reset()         { *m = Shard{} }
 func (m *Shard) String() string { return proto.CompactTextString(m) }
 func (*Shard) ProtoMessage()    {}
 func (*Shard) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{3}
+	return fileDescriptor_52c350cb619f972e, []int{3}
 }
+
 func (m *Shard) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Shard.Unmarshal(m, b)
 }
 func (m *Shard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Shard.Marshal(b, m, deterministic)
 }
-func (dst *Shard) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Shard.Merge(dst, src)
+func (m *Shard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Shard.Merge(m, src)
 }
 func (m *Shard) XXX_Size() int {
 	return xxx_messageInfo_Shard.Size(m)
@@ -470,16 +510,17 @@ func (m *Shard_ServedType) Reset()         { *m = Shard_ServedType{} }
 func (m *Shard_ServedType) String() string { return proto.CompactTextString(m) }
 func (*Shard_ServedType) ProtoMessage()    {}
 func (*Shard_ServedType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{3, 0}
+	return fileDescriptor_52c350cb619f972e, []int{3, 0}
 }
+
 func (m *Shard_ServedType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Shard_ServedType.Unmarshal(m, b)
 }
 func (m *Shard_ServedType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Shard_ServedType.Marshal(b, m, deterministic)
 }
-func (dst *Shard_ServedType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Shard_ServedType.Merge(dst, src)
+func (m *Shard_ServedType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Shard_ServedType.Merge(m, src)
 }
 func (m *Shard_ServedType) XXX_Size() int {
 	return xxx_messageInfo_Shard_ServedType.Size(m)
@@ -527,16 +568,17 @@ func (m *Shard_SourceShard) Reset()         { *m = Shard_SourceShard{} }
 func (m *Shard_SourceShard) String() string { return proto.CompactTextString(m) }
 func (*Shard_SourceShard) ProtoMessage()    {}
 func (*Shard_SourceShard) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{3, 1}
+	return fileDescriptor_52c350cb619f972e, []int{3, 1}
 }
+
 func (m *Shard_SourceShard) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Shard_SourceShard.Unmarshal(m, b)
 }
 func (m *Shard_SourceShard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Shard_SourceShard.Marshal(b, m, deterministic)
 }
-func (dst *Shard_SourceShard) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Shard_SourceShard.Merge(dst, src)
+func (m *Shard_SourceShard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Shard_SourceShard.Merge(m, src)
 }
 func (m *Shard_SourceShard) XXX_Size() int {
 	return xxx_messageInfo_Shard_SourceShard.Size(m)
@@ -600,16 +642,17 @@ func (m *Shard_TabletControl) Reset()         { *m = Shard_TabletControl{} }
 func (m *Shard_TabletControl) String() string { return proto.CompactTextString(m) }
 func (*Shard_TabletControl) ProtoMessage()    {}
 func (*Shard_TabletControl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{3, 2}
+	return fileDescriptor_52c350cb619f972e, []int{3, 2}
 }
+
 func (m *Shard_TabletControl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Shard_TabletControl.Unmarshal(m, b)
 }
 func (m *Shard_TabletControl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Shard_TabletControl.Marshal(b, m, deterministic)
 }
-func (dst *Shard_TabletControl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Shard_TabletControl.Merge(dst, src)
+func (m *Shard_TabletControl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Shard_TabletControl.Merge(m, src)
 }
 func (m *Shard_TabletControl) XXX_Size() int {
 	return xxx_messageInfo_Shard_TabletControl.Size(m)
@@ -658,26 +701,39 @@ type Keyspace struct {
 	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
 	// another keyspace.
-	ServedFroms          []*Keyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_froms,json=servedFroms,proto3" json:"served_froms,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
-	XXX_unrecognized     []byte                 `json:"-"`
-	XXX_sizecache        int32                  `json:"-"`
+	ServedFroms []*Keyspace_ServedFrom `protobuf:"bytes,4,rep,name=served_froms,json=servedFroms,proto3" json:"served_froms,omitempty"`
+	// keyspace_type will determine how this keyspace is treated by
+	// vtgate / vschema. Normal keyspaces are routable by
+	// any query. Snapshot keyspaces are only accessible
+	// by explicit addresssing or by calling "use keyspace" first
+	KeyspaceType KeyspaceType `protobuf:"varint,5,opt,name=keyspace_type,json=keyspaceType,proto3,enum=topodata.KeyspaceType" json:"keyspace_type,omitempty"`
+	// base_keyspace is the base keyspace from which a snapshot
+	// keyspace is created. empty for normal keyspaces
+	BaseKeyspace string `protobuf:"bytes,6,opt,name=base_keyspace,json=baseKeyspace,proto3" json:"base_keyspace,omitempty"`
+	// snapshot_time (in UTC) is a property of snapshot
+	// keyspaces which tells us what point in time
+	// the snapshot is of
+	SnapshotTime         *vttime.Time `protobuf:"bytes,7,opt,name=snapshot_time,json=snapshotTime,proto3" json:"snapshot_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
 func (m *Keyspace) Reset()         { *m = Keyspace{} }
 func (m *Keyspace) String() string { return proto.CompactTextString(m) }
 func (*Keyspace) ProtoMessage()    {}
 func (*Keyspace) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{4}
+	return fileDescriptor_52c350cb619f972e, []int{4}
 }
+
 func (m *Keyspace) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Keyspace.Unmarshal(m, b)
 }
 func (m *Keyspace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Keyspace.Marshal(b, m, deterministic)
 }
-func (dst *Keyspace) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Keyspace.Merge(dst, src)
+func (m *Keyspace) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Keyspace.Merge(m, src)
 }
 func (m *Keyspace) XXX_Size() int {
 	return xxx_messageInfo_Keyspace.Size(m)
@@ -709,6 +765,27 @@ func (m *Keyspace) GetServedFroms() []*Keyspace_ServedFrom {
 	return nil
 }
 
+func (m *Keyspace) GetKeyspaceType() KeyspaceType {
+	if m != nil {
+		return m.KeyspaceType
+	}
+	return KeyspaceType_NORMAL
+}
+
+func (m *Keyspace) GetBaseKeyspace() string {
+	if m != nil {
+		return m.BaseKeyspace
+	}
+	return ""
+}
+
+func (m *Keyspace) GetSnapshotTime() *vttime.Time {
+	if m != nil {
+		return m.SnapshotTime
+	}
+	return nil
+}
+
 // ServedFrom indicates a relationship between a TabletType and the
 // keyspace name that's serving it.
 type Keyspace_ServedFrom struct {
@@ -727,16 +804,17 @@ func (m *Keyspace_ServedFrom) Reset()         { *m = Keyspace_ServedFrom{} }
 func (m *Keyspace_ServedFrom) String() string { return proto.CompactTextString(m) }
 func (*Keyspace_ServedFrom) ProtoMessage()    {}
 func (*Keyspace_ServedFrom) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{4, 0}
+	return fileDescriptor_52c350cb619f972e, []int{4, 0}
 }
+
 func (m *Keyspace_ServedFrom) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Keyspace_ServedFrom.Unmarshal(m, b)
 }
 func (m *Keyspace_ServedFrom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Keyspace_ServedFrom.Marshal(b, m, deterministic)
 }
-func (dst *Keyspace_ServedFrom) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Keyspace_ServedFrom.Merge(dst, src)
+func (m *Keyspace_ServedFrom) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Keyspace_ServedFrom.Merge(m, src)
 }
 func (m *Keyspace_ServedFrom) XXX_Size() int {
 	return xxx_messageInfo_Keyspace_ServedFrom.Size(m)
@@ -783,16 +861,17 @@ func (m *ShardReplication) Reset()         { *m = ShardReplication{} }
 func (m *ShardReplication) String() string { return proto.CompactTextString(m) }
 func (*ShardReplication) ProtoMessage()    {}
 func (*ShardReplication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{5}
+	return fileDescriptor_52c350cb619f972e, []int{5}
 }
+
 func (m *ShardReplication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShardReplication.Unmarshal(m, b)
 }
 func (m *ShardReplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShardReplication.Marshal(b, m, deterministic)
 }
-func (dst *ShardReplication) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShardReplication.Merge(dst, src)
+func (m *ShardReplication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShardReplication.Merge(m, src)
 }
 func (m *ShardReplication) XXX_Size() int {
 	return xxx_messageInfo_ShardReplication.Size(m)
@@ -822,16 +901,17 @@ func (m *ShardReplication_Node) Reset()         { *m = ShardReplication_Node{} }
 func (m *ShardReplication_Node) String() string { return proto.CompactTextString(m) }
 func (*ShardReplication_Node) ProtoMessage()    {}
 func (*ShardReplication_Node) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{5, 0}
+	return fileDescriptor_52c350cb619f972e, []int{5, 0}
 }
+
 func (m *ShardReplication_Node) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShardReplication_Node.Unmarshal(m, b)
 }
 func (m *ShardReplication_Node) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShardReplication_Node.Marshal(b, m, deterministic)
 }
-func (dst *ShardReplication_Node) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShardReplication_Node.Merge(dst, src)
+func (m *ShardReplication_Node) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShardReplication_Node.Merge(m, src)
 }
 func (m *ShardReplication_Node) XXX_Size() int {
 	return xxx_messageInfo_ShardReplication_Node.Size(m)
@@ -863,16 +943,17 @@ func (m *ShardReference) Reset()         { *m = ShardReference{} }
 func (m *ShardReference) String() string { return proto.CompactTextString(m) }
 func (*ShardReference) ProtoMessage()    {}
 func (*ShardReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{6}
+	return fileDescriptor_52c350cb619f972e, []int{6}
 }
+
 func (m *ShardReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShardReference.Unmarshal(m, b)
 }
 func (m *ShardReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShardReference.Marshal(b, m, deterministic)
 }
-func (dst *ShardReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShardReference.Merge(dst, src)
+func (m *ShardReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShardReference.Merge(m, src)
 }
 func (m *ShardReference) XXX_Size() int {
 	return xxx_messageInfo_ShardReference.Size(m)
@@ -913,16 +994,17 @@ func (m *ShardTabletControl) Reset()         { *m = ShardTabletControl{} }
 func (m *ShardTabletControl) String() string { return proto.CompactTextString(m) }
 func (*ShardTabletControl) ProtoMessage()    {}
 func (*ShardTabletControl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{7}
+	return fileDescriptor_52c350cb619f972e, []int{7}
 }
+
 func (m *ShardTabletControl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShardTabletControl.Unmarshal(m, b)
 }
 func (m *ShardTabletControl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShardTabletControl.Marshal(b, m, deterministic)
 }
-func (dst *ShardTabletControl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShardTabletControl.Merge(dst, src)
+func (m *ShardTabletControl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShardTabletControl.Merge(m, src)
 }
 func (m *ShardTabletControl) XXX_Size() int {
 	return xxx_messageInfo_ShardTabletControl.Size(m)
@@ -971,16 +1053,17 @@ func (m *SrvKeyspace) Reset()         { *m = SrvKeyspace{} }
 func (m *SrvKeyspace) String() string { return proto.CompactTextString(m) }
 func (*SrvKeyspace) ProtoMessage()    {}
 func (*SrvKeyspace) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{8}
+	return fileDescriptor_52c350cb619f972e, []int{8}
 }
+
 func (m *SrvKeyspace) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SrvKeyspace.Unmarshal(m, b)
 }
 func (m *SrvKeyspace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SrvKeyspace.Marshal(b, m, deterministic)
 }
-func (dst *SrvKeyspace) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SrvKeyspace.Merge(dst, src)
+func (m *SrvKeyspace) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SrvKeyspace.Merge(m, src)
 }
 func (m *SrvKeyspace) XXX_Size() int {
 	return xxx_messageInfo_SrvKeyspace.Size(m)
@@ -1035,16 +1118,17 @@ func (m *SrvKeyspace_KeyspacePartition) Reset()         { *m = SrvKeyspace_Keysp
 func (m *SrvKeyspace_KeyspacePartition) String() string { return proto.CompactTextString(m) }
 func (*SrvKeyspace_KeyspacePartition) ProtoMessage()    {}
 func (*SrvKeyspace_KeyspacePartition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{8, 0}
+	return fileDescriptor_52c350cb619f972e, []int{8, 0}
 }
+
 func (m *SrvKeyspace_KeyspacePartition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SrvKeyspace_KeyspacePartition.Unmarshal(m, b)
 }
 func (m *SrvKeyspace_KeyspacePartition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SrvKeyspace_KeyspacePartition.Marshal(b, m, deterministic)
 }
-func (dst *SrvKeyspace_KeyspacePartition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SrvKeyspace_KeyspacePartition.Merge(dst, src)
+func (m *SrvKeyspace_KeyspacePartition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SrvKeyspace_KeyspacePartition.Merge(m, src)
 }
 func (m *SrvKeyspace_KeyspacePartition) XXX_Size() int {
 	return xxx_messageInfo_SrvKeyspace_KeyspacePartition.Size(m)
@@ -1092,16 +1176,17 @@ func (m *SrvKeyspace_ServedFrom) Reset()         { *m = SrvKeyspace_ServedFrom{}
 func (m *SrvKeyspace_ServedFrom) String() string { return proto.CompactTextString(m) }
 func (*SrvKeyspace_ServedFrom) ProtoMessage()    {}
 func (*SrvKeyspace_ServedFrom) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{8, 1}
+	return fileDescriptor_52c350cb619f972e, []int{8, 1}
 }
+
 func (m *SrvKeyspace_ServedFrom) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SrvKeyspace_ServedFrom.Unmarshal(m, b)
 }
 func (m *SrvKeyspace_ServedFrom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SrvKeyspace_ServedFrom.Marshal(b, m, deterministic)
 }
-func (dst *SrvKeyspace_ServedFrom) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SrvKeyspace_ServedFrom.Merge(dst, src)
+func (m *SrvKeyspace_ServedFrom) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SrvKeyspace_ServedFrom.Merge(m, src)
 }
 func (m *SrvKeyspace_ServedFrom) XXX_Size() int {
 	return xxx_messageInfo_SrvKeyspace_ServedFrom.Size(m)
@@ -1147,16 +1232,17 @@ func (m *CellInfo) Reset()         { *m = CellInfo{} }
 func (m *CellInfo) String() string { return proto.CompactTextString(m) }
 func (*CellInfo) ProtoMessage()    {}
 func (*CellInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{9}
+	return fileDescriptor_52c350cb619f972e, []int{9}
 }
+
 func (m *CellInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CellInfo.Unmarshal(m, b)
 }
 func (m *CellInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CellInfo.Marshal(b, m, deterministic)
 }
-func (dst *CellInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CellInfo.Merge(dst, src)
+func (m *CellInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CellInfo.Merge(m, src)
 }
 func (m *CellInfo) XXX_Size() int {
 	return xxx_messageInfo_CellInfo.Size(m)
@@ -1194,16 +1280,17 @@ func (m *CellsAlias) Reset()         { *m = CellsAlias{} }
 func (m *CellsAlias) String() string { return proto.CompactTextString(m) }
 func (*CellsAlias) ProtoMessage()    {}
 func (*CellsAlias) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topodata_5ff7209b363fe950, []int{10}
+	return fileDescriptor_52c350cb619f972e, []int{10}
 }
+
 func (m *CellsAlias) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CellsAlias.Unmarshal(m, b)
 }
 func (m *CellsAlias) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CellsAlias.Marshal(b, m, deterministic)
 }
-func (dst *CellsAlias) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CellsAlias.Merge(dst, src)
+func (m *CellsAlias) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CellsAlias.Merge(m, src)
 }
 func (m *CellsAlias) XXX_Size() int {
 	return xxx_messageInfo_CellsAlias.Size(m)
@@ -1222,6 +1309,9 @@ func (m *CellsAlias) GetCells() []string {
 }
 
 func init() {
+	proto.RegisterEnum("topodata.KeyspaceType", KeyspaceType_name, KeyspaceType_value)
+	proto.RegisterEnum("topodata.KeyspaceIdType", KeyspaceIdType_name, KeyspaceIdType_value)
+	proto.RegisterEnum("topodata.TabletType", TabletType_name, TabletType_value)
 	proto.RegisterType((*KeyRange)(nil), "topodata.KeyRange")
 	proto.RegisterType((*TabletAlias)(nil), "topodata.TabletAlias")
 	proto.RegisterType((*Tablet)(nil), "topodata.Tablet")
@@ -1242,89 +1332,93 @@ func init() {
 	proto.RegisterType((*SrvKeyspace_ServedFrom)(nil), "topodata.SrvKeyspace.ServedFrom")
 	proto.RegisterType((*CellInfo)(nil), "topodata.CellInfo")
 	proto.RegisterType((*CellsAlias)(nil), "topodata.CellsAlias")
-	proto.RegisterEnum("topodata.KeyspaceIdType", KeyspaceIdType_name, KeyspaceIdType_value)
-	proto.RegisterEnum("topodata.TabletType", TabletType_name, TabletType_value)
 }
 
-func init() { proto.RegisterFile("topodata.proto", fileDescriptor_topodata_5ff7209b363fe950) }
+func init() { proto.RegisterFile("topodata.proto", fileDescriptor_52c350cb619f972e) }
 
-var fileDescriptor_topodata_5ff7209b363fe950 = []byte{
-	// 1218 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_52c350cb619f972e = []byte{
+	// 1314 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xe1, 0x6e, 0x1b, 0x45,
-	0x10, 0xe6, 0xec, 0xb3, 0x63, 0x8f, 0x1d, 0xe7, 0xba, 0xa4, 0xd5, 0xe9, 0xa0, 0x22, 0xb2, 0x54,
-	0x11, 0x15, 0xe1, 0xa0, 0xb4, 0x85, 0xa8, 0x12, 0x52, 0x5d, 0xc7, 0xa5, 0x69, 0x1a, 0xc7, 0x5a,
-	0x3b, 0x82, 0xf2, 0xe7, 0x74, 0xf1, 0x6d, 0xd2, 0x53, 0xce, 0xb7, 0xee, 0xee, 0x26, 0x92, 0x79,
-	0x05, 0x7e, 0x00, 0x7f, 0x79, 0x03, 0x1e, 0x81, 0x27, 0xe0, 0x39, 0xe0, 0x49, 0xd0, 0xce, 0xde,
-	0xd9, 0x67, 0xbb, 0x2d, 0x29, 0xca, 0xbf, 0x99, 0xdd, 0x99, 0xb9, 0x99, 0x6f, 0xe6, 0x9b, 0xb5,
-	0xa1, 0xa1, 0xf8, 0x84, 0x87, 0x81, 0x0a, 0x5a, 0x13, 0xc1, 0x15, 0x27, 0x95, 0x4c, 0x6f, 0xee,
-	0x42, 0xe5, 0x90, 0x4d, 0x69, 0x90, 0x9c, 0x33, 0xb2, 0x09, 0x25, 0xa9, 0x02, 0xa1, 0x5c, 0x6b,
-	0xcb, 0xda, 0xae, 0x53, 0xa3, 0x10, 0x07, 0x8a, 0x2c, 0x09, 0xdd, 0x02, 0x9e, 0x69, 0xb1, 0xf9,
-	0x00, 0x6a, 0xc3, 0xe0, 0x34, 0x66, 0xaa, 0x1d, 0x47, 0x81, 0x24, 0x04, 0xec, 0x11, 0x8b, 0x63,
-	0xf4, 0xaa, 0x52, 0x94, 0xb5, 0xd3, 0x65, 0x64, 0x9c, 0xd6, 0xa9, 0x16, 0x9b, 0x7f, 0xda, 0x50,
-	0x36, 0x5e, 0xe4, 0x0b, 0x28, 0x05, 0xda, 0x13, 0x3d, 0x6a, 0xbb, 0xb7, 0x5b, 0xb3, 0xec, 0x72,
-	0x61, 0xa9, 0xb1, 0x21, 0x1e, 0x54, 0x5e, 0x73, 0xa9, 0x92, 0x60, 0xcc, 0x30, 0x5c, 0x95, 0xce,
-	0x74, 0xb2, 0x07, 0x95, 0x09, 0x17, 0xca, 0x1f, 0x07, 0x13, 0xd7, 0xde, 0x2a, 0x6e, 0xd7, 0x76,
-	0xef, 0x2e, 0xc7, 0x6a, 0xf5, 0xb9, 0x50, 0x47, 0xc1, 0xa4, 0x9b, 0x28, 0x31, 0xa5, 0x6b, 0x13,
-	0xa3, 0xe9, 0xa8, 0x17, 0x6c, 0x2a, 0x27, 0xc1, 0x88, 0xb9, 0x25, 0x13, 0x35, 0xd3, 0x11, 0x86,
-	0xd7, 0x81, 0x08, 0xdd, 0x32, 0x5e, 0x18, 0x85, 0xec, 0x40, 0xf5, 0x82, 0x4d, 0x7d, 0xa1, 0x91,
-	0x72, 0xd7, 0x30, 0x71, 0x32, 0xff, 0x58, 0x86, 0x21, 0x86, 0x31, 0x68, 0x6e, 0x83, 0xad, 0xa6,
-	0x13, 0xe6, 0x56, 0xb6, 0xac, 0xed, 0xc6, 0xee, 0xe6, 0x72, 0x62, 0xc3, 0xe9, 0x84, 0x51, 0xb4,
-	0x20, 0xdb, 0xe0, 0x84, 0xa7, 0xbe, 0xae, 0xc8, 0xe7, 0x57, 0x4c, 0x88, 0x28, 0x64, 0x6e, 0x15,
-	0xbf, 0xdd, 0x08, 0x4f, 0x7b, 0xc1, 0x98, 0x1d, 0xa7, 0xa7, 0xa4, 0x05, 0xb6, 0x0a, 0xce, 0xa5,
-	0x0b, 0x58, 0xac, 0xb7, 0x52, 0xec, 0x30, 0x38, 0x97, 0xa6, 0x52, 0xb4, 0x23, 0xf7, 0xa0, 0x31,
-	0x9e, 0xca, 0x37, 0xb1, 0x3f, 0x83, 0xb0, 0x8e, 0x71, 0xd7, 0xf1, 0xf4, 0x79, 0x86, 0xe3, 0x5d,
-	0x00, 0x63, 0xa6, 0xe1, 0x71, 0xd7, 0xb7, 0xac, 0xed, 0x12, 0xad, 0xe2, 0x89, 0x46, 0xcf, 0x7b,
-	0x0c, 0xf5, 0x3c, 0x8a, 0xba, 0xb9, 0x17, 0x6c, 0x9a, 0xf6, 0x5b, 0x8b, 0x1a, 0xb2, 0xab, 0x20,
-	0xbe, 0x34, 0x1d, 0x2a, 0x51, 0xa3, 0x3c, 0x2e, 0xec, 0x59, 0xde, 0x37, 0x50, 0x9d, 0x25, 0xf5,
-	0x5f, 0x8e, 0xd5, 0x9c, 0xe3, 0x0b, 0xbb, 0x52, 0x74, 0xec, 0x17, 0x76, 0xa5, 0xe6, 0xd4, 0x9b,
-	0xbf, 0x95, 0xa1, 0x34, 0xc0, 0x2e, 0xec, 0x41, 0x7d, 0x1c, 0x48, 0xc5, 0x84, 0x7f, 0x8d, 0x09,
-	0xaa, 0x19, 0x53, 0x33, 0xa5, 0x0b, 0xfd, 0x2b, 0x5c, 0xa3, 0x7f, 0xdf, 0x42, 0x5d, 0x32, 0x71,
-	0xc5, 0x42, 0x5f, 0x37, 0x49, 0xba, 0xc5, 0x65, 0xcc, 0x31, 0xa3, 0xd6, 0x00, 0x6d, 0xb0, 0x9b,
-	0x35, 0x39, 0x93, 0x25, 0x79, 0x02, 0xeb, 0x92, 0x5f, 0x8a, 0x11, 0xf3, 0x71, 0x7e, 0x64, 0x3a,
-	0xa0, 0x9f, 0xac, 0xf8, 0xa3, 0x11, 0xca, 0xb4, 0x2e, 0xe7, 0x8a, 0x24, 0xcf, 0x60, 0x43, 0x61,
-	0x35, 0xfe, 0x88, 0x27, 0x4a, 0xf0, 0x58, 0xba, 0xe5, 0xe5, 0x21, 0x37, 0x31, 0x4c, 0xd1, 0x1d,
-	0x63, 0x45, 0x1b, 0x2a, 0xaf, 0x4a, 0x72, 0x1f, 0x6e, 0x45, 0xd2, 0x4f, 0x61, 0xd3, 0x29, 0x46,
-	0xc9, 0x39, 0x4e, 0x70, 0x85, 0x6e, 0x44, 0xf2, 0x08, 0xcf, 0x07, 0xe6, 0xd8, 0x7b, 0x05, 0x30,
-	0x2f, 0x88, 0x3c, 0x82, 0x5a, 0x9a, 0x01, 0x4e, 0xb2, 0xf5, 0x9e, 0x49, 0x06, 0x35, 0x93, 0x75,
-	0x53, 0xf5, 0x12, 0x90, 0x6e, 0x61, 0xab, 0xa8, 0x9b, 0x8a, 0x8a, 0xf7, 0xbb, 0x05, 0xb5, 0x5c,
-	0xb1, 0xd9, 0x8a, 0xb0, 0x66, 0x2b, 0x62, 0x81, 0x94, 0x85, 0x77, 0x91, 0xb2, 0xf8, 0x4e, 0x52,
-	0xda, 0xd7, 0x68, 0xea, 0x1d, 0x28, 0x63, 0xa2, 0xd2, 0x2d, 0x61, 0x6e, 0xa9, 0xe6, 0xfd, 0x61,
-	0xc1, 0xfa, 0x02, 0x8a, 0x37, 0x5a, 0x3b, 0xf9, 0x12, 0xc8, 0x69, 0x1c, 0x8c, 0x2e, 0xe2, 0x48,
-	0x2a, 0x3d, 0x50, 0x26, 0x05, 0x1b, 0x4d, 0x6e, 0xe5, 0x6e, 0x30, 0xa8, 0xd4, 0x59, 0x9e, 0x09,
-	0xfe, 0x13, 0x4b, 0x70, 0x37, 0x55, 0x68, 0xaa, 0xcd, 0x38, 0x51, 0x72, 0xca, 0xcd, 0xbf, 0x0a,
-	0xb8, 0xb9, 0x0d, 0x3a, 0x5f, 0xc1, 0x26, 0x02, 0x12, 0x25, 0xe7, 0xfe, 0x88, 0xc7, 0x97, 0xe3,
-	0x04, 0xd7, 0x49, 0xca, 0x34, 0x92, 0xdd, 0x75, 0xf0, 0x4a, 0x6f, 0x14, 0xf2, 0x62, 0xd5, 0x03,
-	0xeb, 0x2c, 0x60, 0x9d, 0xee, 0x02, 0x88, 0xf8, 0x8d, 0x03, 0x33, 0xe3, 0x4b, 0xb1, 0xb0, 0xe6,
-	0x27, 0x33, 0xa6, 0x9c, 0x09, 0x3e, 0x96, 0xab, 0xab, 0x38, 0x8b, 0x91, 0x92, 0xe5, 0x99, 0xe0,
-	0xe3, 0x8c, 0x2c, 0x5a, 0x96, 0xde, 0x65, 0x36, 0x76, 0x5a, 0xbd, 0x59, 0xe8, 0xf3, 0x43, 0x55,
-	0x5c, 0x1c, 0x2a, 0x83, 0x67, 0xf3, 0x67, 0x0b, 0x1c, 0xc3, 0x3f, 0x36, 0x89, 0xa3, 0x51, 0xa0,
-	0x22, 0x9e, 0x90, 0x47, 0x50, 0x4a, 0x78, 0xc8, 0xf4, 0x86, 0xd1, 0xc5, 0x7c, 0xb6, 0x44, 0xb9,
-	0x9c, 0x69, 0xab, 0xc7, 0x43, 0x46, 0x8d, 0xb5, 0xf7, 0x04, 0x6c, 0xad, 0xea, 0x3d, 0x95, 0x96,
-	0x70, 0x9d, 0x3d, 0xa5, 0xe6, 0x4a, 0xf3, 0x04, 0x1a, 0xe9, 0x17, 0xce, 0x98, 0x60, 0xc9, 0x88,
-	0xe9, 0xf7, 0x35, 0xd7, 0x4c, 0x94, 0x3f, 0x78, 0x9b, 0x35, 0x7f, 0xb1, 0x80, 0x60, 0xdc, 0xc5,
-	0x29, 0xbf, 0x89, 0xd8, 0xe4, 0x21, 0xdc, 0x79, 0x73, 0xc9, 0xc4, 0xd4, 0x2c, 0x97, 0x11, 0xf3,
-	0xc3, 0x48, 0xea, 0xaf, 0x18, 0xb2, 0x56, 0xe8, 0x26, 0xde, 0x0e, 0xcc, 0xe5, 0x7e, 0x7a, 0xd7,
-	0xfc, 0xc7, 0x86, 0xda, 0x40, 0x5c, 0xcd, 0x66, 0xf8, 0x3b, 0x80, 0x49, 0x20, 0x54, 0xa4, 0x31,
-	0xcd, 0x60, 0xff, 0x3c, 0x07, 0xfb, 0xdc, 0x74, 0x36, 0x4f, 0xfd, 0xcc, 0x9e, 0xe6, 0x5c, 0xdf,
-	0x49, 0x86, 0xc2, 0x07, 0x93, 0xa1, 0xf8, 0x3f, 0xc8, 0xd0, 0x86, 0x5a, 0x8e, 0x0c, 0x29, 0x17,
-	0xb6, 0xde, 0x5e, 0x47, 0x8e, 0x0e, 0x30, 0xa7, 0x83, 0xf7, 0xb7, 0x05, 0xb7, 0x56, 0x4a, 0xd4,
-	0xac, 0xc8, 0xbd, 0x47, 0xef, 0x67, 0xc5, 0xfc, 0x21, 0x22, 0x1d, 0x70, 0x30, 0x4b, 0x5f, 0x64,
-	0x03, 0x65, 0x08, 0x52, 0xcb, 0xd7, 0xb5, 0x38, 0x71, 0x74, 0x43, 0x2e, 0xe8, 0x92, 0xf4, 0xe1,
-	0xb6, 0x09, 0xb2, 0xfc, 0x20, 0x99, 0x47, 0xf1, 0xd3, 0xa5, 0x48, 0x8b, 0xef, 0xd1, 0xc7, 0x72,
-	0xe5, 0x4c, 0x7a, 0xfe, 0x4d, 0x30, 0xfe, 0x3d, 0x0f, 0x46, 0xba, 0x25, 0x0f, 0xa1, 0xd2, 0x61,
-	0x71, 0x7c, 0x90, 0x9c, 0x71, 0xfd, 0x63, 0x08, 0x71, 0x11, 0x7e, 0x10, 0x86, 0x82, 0x49, 0x99,
-	0x4e, 0xfd, 0xba, 0x39, 0x6d, 0x9b, 0x43, 0x4d, 0x09, 0xc1, 0xb9, 0x4a, 0x03, 0xa2, 0x9c, 0x2e,
-	0x8a, 0x26, 0x80, 0x0e, 0x26, 0xcd, 0x0f, 0x8a, 0xb7, 0xae, 0x9b, 0xfb, 0xbb, 0xd0, 0x58, 0x1c,
-	0x12, 0x52, 0x85, 0xd2, 0x49, 0x6f, 0xd0, 0x1d, 0x3a, 0x1f, 0x11, 0x80, 0xf2, 0xc9, 0x41, 0x6f,
-	0xf8, 0xf5, 0x43, 0xc7, 0xd2, 0xc7, 0x4f, 0x5f, 0x0d, 0xbb, 0x03, 0xa7, 0x70, 0xff, 0x57, 0x0b,
-	0x60, 0x5e, 0x21, 0xa9, 0xc1, 0xda, 0x49, 0xef, 0xb0, 0x77, 0xfc, 0x7d, 0xcf, 0xb8, 0x1c, 0xb5,
-	0x07, 0xc3, 0x2e, 0x75, 0x2c, 0x7d, 0x41, 0xbb, 0xfd, 0x97, 0x07, 0x9d, 0xb6, 0x53, 0xd0, 0x17,
-	0x74, 0xff, 0xb8, 0xf7, 0xf2, 0x95, 0x53, 0xc4, 0x58, 0xed, 0x61, 0xe7, 0xb9, 0x11, 0x07, 0xfd,
-	0x36, 0xed, 0x3a, 0x36, 0x71, 0xa0, 0xde, 0xfd, 0xa1, 0xdf, 0xa5, 0x07, 0x47, 0xdd, 0xde, 0xb0,
-	0xfd, 0xd2, 0x29, 0x69, 0x9f, 0xa7, 0xed, 0xce, 0xe1, 0x49, 0xdf, 0x29, 0x9b, 0x60, 0x83, 0xe1,
-	0x31, 0xed, 0x3a, 0x6b, 0x5a, 0xd9, 0xa7, 0xed, 0x83, 0x5e, 0x77, 0xdf, 0xa9, 0x78, 0x05, 0xc7,
-	0x7a, 0xba, 0x07, 0x1b, 0x11, 0x6f, 0x5d, 0x45, 0x8a, 0x49, 0x69, 0xfe, 0x33, 0xfc, 0x78, 0x2f,
-	0xd5, 0x22, 0xbe, 0x63, 0xa4, 0x9d, 0x73, 0xbe, 0x73, 0xa5, 0x76, 0xf0, 0x76, 0x27, 0x6b, 0xd5,
-	0x69, 0x19, 0xf5, 0x07, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x89, 0xf4, 0xf5, 0x28, 0x73, 0x0c,
+	0x10, 0xee, 0xd9, 0x67, 0xe7, 0x3c, 0x3e, 0x27, 0xd7, 0x25, 0xad, 0x4e, 0x07, 0x15, 0x91, 0x51,
+	0x85, 0x15, 0x84, 0x03, 0x69, 0x0b, 0x51, 0x11, 0x52, 0x5d, 0xc7, 0xa5, 0x69, 0x12, 0xc7, 0x5a,
+	0x3b, 0x82, 0xf2, 0xe7, 0x74, 0xb1, 0x37, 0xe9, 0x29, 0xe7, 0x3b, 0xf7, 0x76, 0x63, 0xc9, 0xbc,
+	0x02, 0x3f, 0x80, 0xbf, 0xbc, 0x01, 0x8f, 0xc0, 0xbb, 0xf0, 0x07, 0x9e, 0x04, 0xed, 0xec, 0xdd,
+	0xf9, 0x6c, 0xb7, 0x25, 0x45, 0xf9, 0xb7, 0x33, 0x3b, 0x33, 0x37, 0xf3, 0xcd, 0xcc, 0xb7, 0x36,
+	0xac, 0x8b, 0x68, 0x12, 0x8d, 0x3c, 0xe1, 0x35, 0x27, 0x71, 0x24, 0x22, 0x62, 0xa4, 0xb2, 0x03,
+	0xc2, 0x1f, 0x33, 0xa5, 0xad, 0xef, 0x82, 0x71, 0xc8, 0x66, 0xd4, 0x0b, 0x2f, 0x18, 0xd9, 0x84,
+	0x12, 0x17, 0x5e, 0x2c, 0x6c, 0x6d, 0x4b, 0x6b, 0x98, 0x54, 0x09, 0xc4, 0x82, 0x22, 0x0b, 0x47,
+	0x76, 0x01, 0x75, 0xf2, 0x58, 0x7f, 0x00, 0xd5, 0x81, 0x77, 0x16, 0x30, 0xd1, 0x0a, 0x7c, 0x8f,
+	0x13, 0x02, 0xfa, 0x90, 0x05, 0x01, 0x7a, 0x55, 0x28, 0x9e, 0xa5, 0xd3, 0x95, 0xaf, 0x9c, 0x6a,
+	0x54, 0x1e, 0xeb, 0x7f, 0xea, 0x50, 0x56, 0x5e, 0xe4, 0x33, 0x28, 0x79, 0xd2, 0x13, 0x3d, 0xaa,
+	0xbb, 0x77, 0x9a, 0x59, 0xa6, 0xb9, 0xb0, 0x54, 0xd9, 0x10, 0x07, 0x8c, 0x57, 0x11, 0x17, 0xa1,
+	0x37, 0x66, 0x18, 0xae, 0x42, 0x33, 0x99, 0xec, 0x81, 0x31, 0x89, 0x62, 0xe1, 0x8e, 0xbd, 0x89,
+	0xad, 0x6f, 0x15, 0x1b, 0xd5, 0xdd, 0x7b, 0xcb, 0xb1, 0x9a, 0xbd, 0x28, 0x16, 0xc7, 0xde, 0xa4,
+	0x13, 0x8a, 0x78, 0x46, 0xd7, 0x26, 0x4a, 0x92, 0x51, 0x2f, 0xd9, 0x8c, 0x4f, 0xbc, 0x21, 0xb3,
+	0x4b, 0x2a, 0x6a, 0x2a, 0x23, 0x0c, 0xaf, 0xbc, 0x78, 0x64, 0x97, 0xf1, 0x42, 0x09, 0x64, 0x07,
+	0x2a, 0x97, 0x6c, 0xe6, 0xc6, 0x12, 0x29, 0x7b, 0x0d, 0x13, 0x27, 0xf3, 0x8f, 0xa5, 0x18, 0x62,
+	0x18, 0x85, 0x66, 0x03, 0x74, 0x31, 0x9b, 0x30, 0xdb, 0xd8, 0xd2, 0x1a, 0xeb, 0xbb, 0x9b, 0xcb,
+	0x89, 0x0d, 0x66, 0x13, 0x46, 0xd1, 0x82, 0x34, 0xc0, 0x1a, 0x9d, 0xb9, 0xb2, 0x22, 0x37, 0x9a,
+	0xb2, 0x38, 0xf6, 0x47, 0xcc, 0xae, 0xe0, 0xb7, 0xd7, 0x47, 0x67, 0x5d, 0x6f, 0xcc, 0x4e, 0x12,
+	0x2d, 0x69, 0x82, 0x2e, 0xbc, 0x0b, 0x6e, 0x03, 0x16, 0xeb, 0xac, 0x14, 0x3b, 0xf0, 0x2e, 0xb8,
+	0xaa, 0x14, 0xed, 0xc8, 0x7d, 0x58, 0x1f, 0xcf, 0xf8, 0xeb, 0xc0, 0xcd, 0x20, 0x34, 0x31, 0x6e,
+	0x0d, 0xb5, 0xcf, 0x53, 0x1c, 0xef, 0x01, 0x28, 0x33, 0x09, 0x8f, 0x5d, 0xdb, 0xd2, 0x1a, 0x25,
+	0x5a, 0x41, 0x8d, 0x44, 0xcf, 0x79, 0x0c, 0x66, 0x1e, 0x45, 0xd9, 0xdc, 0x4b, 0x36, 0x4b, 0xfa,
+	0x2d, 0x8f, 0x12, 0xb2, 0xa9, 0x17, 0x5c, 0xa9, 0x0e, 0x95, 0xa8, 0x12, 0x1e, 0x17, 0xf6, 0x34,
+	0xe7, 0x6b, 0xa8, 0x64, 0x49, 0xfd, 0x97, 0x63, 0x25, 0xe7, 0xf8, 0x42, 0x37, 0x8a, 0x96, 0xfe,
+	0x42, 0x37, 0xaa, 0x96, 0x59, 0xff, 0xad, 0x0c, 0xa5, 0x3e, 0x76, 0x61, 0x0f, 0xcc, 0xb1, 0xc7,
+	0x05, 0x8b, 0xdd, 0x6b, 0x4c, 0x50, 0x55, 0x99, 0xaa, 0x29, 0x5d, 0xe8, 0x5f, 0xe1, 0x1a, 0xfd,
+	0xfb, 0x16, 0x4c, 0xce, 0xe2, 0x29, 0x1b, 0xb9, 0xb2, 0x49, 0xdc, 0x2e, 0x2e, 0x63, 0x8e, 0x19,
+	0x35, 0xfb, 0x68, 0x83, 0xdd, 0xac, 0xf2, 0xec, 0xcc, 0xc9, 0x13, 0xa8, 0xf1, 0xe8, 0x2a, 0x1e,
+	0x32, 0x17, 0xe7, 0x87, 0x27, 0x03, 0xfa, 0xe1, 0x8a, 0x3f, 0x1a, 0xe1, 0x99, 0x9a, 0x7c, 0x2e,
+	0x70, 0xf2, 0x0c, 0x36, 0x04, 0x56, 0xe3, 0x0e, 0xa3, 0x50, 0xc4, 0x51, 0xc0, 0xed, 0xf2, 0xf2,
+	0x90, 0xab, 0x18, 0xaa, 0xe8, 0xb6, 0xb2, 0xa2, 0xeb, 0x22, 0x2f, 0x72, 0xb2, 0x0d, 0xb7, 0x7d,
+	0xee, 0x26, 0xb0, 0xc9, 0x14, 0xfd, 0xf0, 0x02, 0x27, 0xd8, 0xa0, 0x1b, 0x3e, 0x3f, 0x46, 0x7d,
+	0x5f, 0xa9, 0x9d, 0x97, 0x00, 0xf3, 0x82, 0xc8, 0x23, 0xa8, 0x26, 0x19, 0xe0, 0x24, 0x6b, 0xef,
+	0x98, 0x64, 0x10, 0xd9, 0x59, 0x36, 0x55, 0x92, 0x00, 0xb7, 0x0b, 0x5b, 0x45, 0xd9, 0x54, 0x14,
+	0x9c, 0xdf, 0x35, 0xa8, 0xe6, 0x8a, 0x4d, 0x29, 0x42, 0xcb, 0x28, 0x62, 0x61, 0x29, 0x0b, 0x6f,
+	0x5b, 0xca, 0xe2, 0x5b, 0x97, 0x52, 0xbf, 0x46, 0x53, 0xef, 0x42, 0x19, 0x13, 0xe5, 0x76, 0x09,
+	0x73, 0x4b, 0x24, 0xe7, 0x0f, 0x0d, 0x6a, 0x0b, 0x28, 0xde, 0x68, 0xed, 0xe4, 0x73, 0x20, 0x67,
+	0x81, 0x37, 0xbc, 0x0c, 0x7c, 0x2e, 0xe4, 0x40, 0xa9, 0x14, 0x74, 0x34, 0xb9, 0x9d, 0xbb, 0xc1,
+	0xa0, 0x5c, 0x66, 0x79, 0x1e, 0x47, 0x3f, 0xb1, 0x10, 0xb9, 0xc9, 0xa0, 0x89, 0x94, 0xed, 0x44,
+	0xc9, 0x2a, 0xd7, 0xff, 0x2a, 0x22, 0x73, 0x2b, 0x74, 0xbe, 0x80, 0x4d, 0x04, 0xc4, 0x0f, 0x2f,
+	0xdc, 0x61, 0x14, 0x5c, 0x8d, 0x43, 0xa4, 0x93, 0x64, 0xd3, 0x48, 0x7a, 0xd7, 0xc6, 0x2b, 0xc9,
+	0x28, 0xe4, 0xc5, 0xaa, 0x07, 0xd6, 0x59, 0xc0, 0x3a, 0xed, 0x05, 0x10, 0xf1, 0x1b, 0x07, 0x6a,
+	0xc6, 0x97, 0x62, 0x61, 0xcd, 0x4f, 0xb2, 0x4d, 0x39, 0x8f, 0xa3, 0x31, 0x5f, 0xa5, 0xe2, 0x34,
+	0x46, 0xb2, 0x2c, 0xcf, 0xe2, 0x68, 0x9c, 0x2e, 0x8b, 0x3c, 0x73, 0xf2, 0x0d, 0xd4, 0xd2, 0x4e,
+	0xab, 0x34, 0x4a, 0x98, 0xc6, 0xdd, 0xd5, 0x10, 0x98, 0x84, 0x79, 0x99, 0x93, 0xc8, 0x27, 0x50,
+	0x3b, 0xf3, 0x38, 0x73, 0xb3, 0xd9, 0x51, 0xbc, 0x6d, 0x4a, 0x65, 0x86, 0xd0, 0x97, 0x50, 0xe3,
+	0xa1, 0x37, 0xe1, 0xaf, 0x22, 0xe1, 0xca, 0xe7, 0x2f, 0xa1, 0x70, 0xb3, 0x39, 0x15, 0xf8, 0x1a,
+	0x0e, 0xfc, 0x31, 0xa3, 0x66, 0x6a, 0x22, 0x25, 0xe7, 0x2a, 0xdd, 0x05, 0x99, 0xe3, 0xcd, 0xce,
+	0x43, 0x7e, 0xd2, 0x8b, 0x8b, 0x93, 0xae, 0x9a, 0x5c, 0xff, 0x59, 0x03, 0x4b, 0x91, 0x02, 0x9b,
+	0x04, 0xfe, 0xd0, 0x13, 0x7e, 0x14, 0x92, 0x47, 0x50, 0x0a, 0xa3, 0x11, 0x93, 0xb4, 0x27, 0x11,
+	0xfe, 0x78, 0x89, 0x07, 0x72, 0xa6, 0xcd, 0x6e, 0x34, 0x62, 0x54, 0x59, 0x3b, 0x4f, 0x40, 0x97,
+	0xa2, 0x24, 0xcf, 0xa4, 0x84, 0xeb, 0x90, 0xa7, 0x98, 0x0b, 0xf5, 0x53, 0x58, 0x4f, 0xbe, 0x70,
+	0xce, 0x62, 0x16, 0x0e, 0x99, 0x7c, 0xf4, 0x73, 0x13, 0x86, 0xe7, 0xf7, 0xa6, 0xd8, 0xfa, 0x2f,
+	0x1a, 0x10, 0x8c, 0xbb, 0xb8, 0x7a, 0x37, 0x11, 0x9b, 0x3c, 0x84, 0xbb, 0xaf, 0xaf, 0x58, 0x3c,
+	0x53, 0x8c, 0x37, 0x64, 0xee, 0xc8, 0xe7, 0xf2, 0x2b, 0x8a, 0x41, 0x0c, 0xba, 0x89, 0xb7, 0x7d,
+	0x75, 0xb9, 0x9f, 0xdc, 0xd5, 0xff, 0xd1, 0xa1, 0xda, 0x8f, 0xa7, 0xd9, 0xd8, 0x7c, 0x07, 0x30,
+	0xf1, 0x62, 0xe1, 0x4b, 0x4c, 0x53, 0xd8, 0x3f, 0xcd, 0xc1, 0x3e, 0x37, 0xcd, 0x26, 0xb4, 0x97,
+	0xda, 0xd3, 0x9c, 0xeb, 0x5b, 0x37, 0xb4, 0xf0, 0xde, 0x1b, 0x5a, 0xfc, 0x1f, 0x1b, 0xda, 0x82,
+	0x6a, 0x6e, 0x43, 0x93, 0x05, 0xdd, 0x7a, 0x73, 0x1d, 0xb9, 0x1d, 0x85, 0xf9, 0x8e, 0x3a, 0x7f,
+	0x6b, 0x70, 0x7b, 0xa5, 0x44, 0xb9, 0x15, 0xb9, 0x47, 0xf2, 0xdd, 0x5b, 0x31, 0x7f, 0x1d, 0x49,
+	0x1b, 0x2c, 0xcc, 0xd2, 0x8d, 0xd3, 0x81, 0x52, 0x0b, 0x52, 0xcd, 0xd7, 0xb5, 0x38, 0x71, 0x74,
+	0x83, 0x2f, 0xc8, 0x9c, 0xf4, 0xe0, 0x8e, 0x0a, 0xb2, 0xfc, 0x4a, 0xaa, 0x97, 0xfa, 0xa3, 0xa5,
+	0x48, 0x8b, 0x8f, 0xe4, 0x07, 0x7c, 0x45, 0xc7, 0x1d, 0xf7, 0x26, 0x36, 0xfe, 0x1d, 0xaf, 0x58,
+	0x42, 0xdd, 0x87, 0x60, 0xb4, 0x59, 0x10, 0x1c, 0x84, 0xe7, 0x91, 0xfc, 0x85, 0x86, 0xb8, 0xc4,
+	0xae, 0x37, 0x1a, 0xc5, 0x8c, 0xf3, 0x64, 0xea, 0x6b, 0x4a, 0xdb, 0x52, 0x4a, 0xb9, 0x12, 0x71,
+	0x14, 0x89, 0x24, 0x20, 0x9e, 0x13, 0xa2, 0xa8, 0x03, 0xc8, 0x60, 0x5c, 0xfd, 0xca, 0x79, 0x23,
+	0xdd, 0x6c, 0x37, 0xc0, 0xcc, 0xf3, 0x27, 0x01, 0x28, 0x77, 0x4f, 0xe8, 0x71, 0xeb, 0xc8, 0xba,
+	0x45, 0x4c, 0x30, 0xfa, 0xdd, 0x56, 0xaf, 0xff, 0xfc, 0x64, 0x60, 0x69, 0xdb, 0xbb, 0xb0, 0xbe,
+	0x38, 0x4e, 0xa4, 0x02, 0xa5, 0xd3, 0x6e, 0xbf, 0x33, 0xb0, 0x6e, 0x49, 0xb7, 0xd3, 0x83, 0xee,
+	0xe0, 0xab, 0x87, 0x96, 0x26, 0xd5, 0x4f, 0x5f, 0x0e, 0x3a, 0x7d, 0xab, 0xb0, 0xfd, 0xab, 0x06,
+	0x30, 0xc7, 0x82, 0x54, 0x61, 0xed, 0xb4, 0x7b, 0xd8, 0x3d, 0xf9, 0xbe, 0xab, 0x5c, 0x8e, 0x5b,
+	0xfd, 0x41, 0x87, 0x5a, 0x9a, 0xbc, 0xa0, 0x9d, 0xde, 0xd1, 0x41, 0xbb, 0x65, 0x15, 0xe4, 0x05,
+	0xdd, 0x3f, 0xe9, 0x1e, 0xbd, 0xb4, 0x8a, 0x18, 0xab, 0x35, 0x68, 0x3f, 0x57, 0xc7, 0x7e, 0xaf,
+	0x45, 0x3b, 0x96, 0x4e, 0x2c, 0x30, 0x3b, 0x3f, 0xf4, 0x3a, 0xf4, 0xe0, 0xb8, 0xd3, 0x1d, 0xb4,
+	0x8e, 0xac, 0x92, 0xf4, 0x79, 0xda, 0x6a, 0x1f, 0x9e, 0xf6, 0xac, 0xb2, 0x0a, 0xd6, 0x1f, 0x9c,
+	0xd0, 0x8e, 0xb5, 0x26, 0x85, 0x7d, 0xda, 0x3a, 0xe8, 0x76, 0xf6, 0x2d, 0xc3, 0x29, 0x58, 0xda,
+	0xd3, 0x3d, 0xd8, 0xf0, 0xa3, 0xe6, 0xd4, 0x17, 0x8c, 0x73, 0xf5, 0x47, 0xe7, 0xc7, 0xfb, 0x89,
+	0xe4, 0x47, 0x3b, 0xea, 0xb4, 0x73, 0x11, 0xed, 0x4c, 0xc5, 0x0e, 0xde, 0xee, 0xa4, 0x4d, 0x3d,
+	0x2b, 0xa3, 0xfc, 0xe0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x5c, 0xc8, 0x21, 0x3e, 0x0d,
 	0x00, 0x00,
 }

vendor/vitess.io/vitess/go/vt/proto/vtgate/vtgate.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: vtgate.proto
 
-package vtgate // import "vitess.io/vitess/go/vt/proto/vtgate"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
-import query "vitess.io/vitess/go/vt/proto/query"
-import topodata "vitess.io/vitess/go/vt/proto/topodata"
-import vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
+package vtgate
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
+	query "vitess.io/vitess/go/vt/proto/query"
+	topodata "vitess.io/vitess/go/vt/proto/topodata"
+	vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // TransactionMode controls the execution of distributed transaction
 // across multiple shards.
@@ -43,6 +45,7 @@ var TransactionMode_name = map[int32]string{
 	2: "MULTI",
 	3: "TWOPC",
 }
+
 var TransactionMode_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"SINGLE":      1,
@@ -53,8 +56,9 @@ var TransactionMode_value = map[string]int32{
 func (x TransactionMode) String() string {
 	return proto.EnumName(TransactionMode_name, int32(x))
 }
+
 func (TransactionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{0}
+	return fileDescriptor_aab96496ceaf1ebb, []int{0}
 }
 
 // CommitOrder is used to designate which of the ShardSessions
@@ -78,6 +82,7 @@ var CommitOrder_name = map[int32]string{
 	2: "POST",
 	3: "AUTOCOMMIT",
 }
+
 var CommitOrder_value = map[string]int32{
 	"NORMAL":     0,
 	"PRE":        1,
@@ -88,8 +93,9 @@ var CommitOrder_value = map[string]int32{
 func (x CommitOrder) String() string {
 	return proto.EnumName(CommitOrder_name, int32(x))
 }
+
 func (CommitOrder) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{1}
+	return fileDescriptor_aab96496ceaf1ebb, []int{1}
 }
 
 // Session objects are exchanged like cookies through various
@@ -138,16 +144,17 @@ func (m *Session) Reset()         { *m = Session{} }
 func (m *Session) String() string { return proto.CompactTextString(m) }
 func (*Session) ProtoMessage()    {}
 func (*Session) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{0}
+	return fileDescriptor_aab96496ceaf1ebb, []int{0}
 }
+
 func (m *Session) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Session.Unmarshal(m, b)
 }
 func (m *Session) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Session.Marshal(b, m, deterministic)
 }
-func (dst *Session) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Session.Merge(dst, src)
+func (m *Session) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Session.Merge(m, src)
 }
 func (m *Session) XXX_Size() int {
 	return xxx_messageInfo_Session.Size(m)
@@ -240,16 +247,17 @@ func (m *Session_ShardSession) Reset()         { *m = Session_ShardSession{} }
 func (m *Session_ShardSession) String() string { return proto.CompactTextString(m) }
 func (*Session_ShardSession) ProtoMessage()    {}
 func (*Session_ShardSession) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{0, 0}
+	return fileDescriptor_aab96496ceaf1ebb, []int{0, 0}
 }
+
 func (m *Session_ShardSession) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Session_ShardSession.Unmarshal(m, b)
 }
 func (m *Session_ShardSession) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Session_ShardSession.Marshal(b, m, deterministic)
 }
-func (dst *Session_ShardSession) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Session_ShardSession.Merge(dst, src)
+func (m *Session_ShardSession) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Session_ShardSession.Merge(m, src)
 }
 func (m *Session_ShardSession) XXX_Size() int {
 	return xxx_messageInfo_Session_ShardSession.Size(m)
@@ -298,16 +306,17 @@ func (m *ExecuteRequest) Reset()         { *m = ExecuteRequest{} }
 func (m *ExecuteRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteRequest) ProtoMessage()    {}
 func (*ExecuteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{1}
+	return fileDescriptor_aab96496ceaf1ebb, []int{1}
 }
+
 func (m *ExecuteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteRequest.Unmarshal(m, b)
 }
 func (m *ExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteRequest.Merge(dst, src)
+func (m *ExecuteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteRequest.Merge(m, src)
 }
 func (m *ExecuteRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteRequest.Size(m)
@@ -386,16 +395,17 @@ func (m *ExecuteResponse) Reset()         { *m = ExecuteResponse{} }
 func (m *ExecuteResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteResponse) ProtoMessage()    {}
 func (*ExecuteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{2}
+	return fileDescriptor_aab96496ceaf1ebb, []int{2}
 }
+
 func (m *ExecuteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteResponse.Unmarshal(m, b)
 }
 func (m *ExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteResponse.Merge(dst, src)
+func (m *ExecuteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteResponse.Merge(m, src)
 }
 func (m *ExecuteResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteResponse.Size(m)
@@ -456,16 +466,17 @@ func (m *ExecuteShardsRequest) Reset()         { *m = ExecuteShardsRequest{} }
 func (m *ExecuteShardsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteShardsRequest) ProtoMessage()    {}
 func (*ExecuteShardsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{3}
+	return fileDescriptor_aab96496ceaf1ebb, []int{3}
 }
+
 func (m *ExecuteShardsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteShardsRequest.Unmarshal(m, b)
 }
 func (m *ExecuteShardsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteShardsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteShardsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteShardsRequest.Merge(dst, src)
+func (m *ExecuteShardsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteShardsRequest.Merge(m, src)
 }
 func (m *ExecuteShardsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteShardsRequest.Size(m)
@@ -551,16 +562,17 @@ func (m *ExecuteShardsResponse) Reset()         { *m = ExecuteShardsResponse{} }
 func (m *ExecuteShardsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteShardsResponse) ProtoMessage()    {}
 func (*ExecuteShardsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{4}
+	return fileDescriptor_aab96496ceaf1ebb, []int{4}
 }
+
 func (m *ExecuteShardsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteShardsResponse.Unmarshal(m, b)
 }
 func (m *ExecuteShardsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteShardsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteShardsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteShardsResponse.Merge(dst, src)
+func (m *ExecuteShardsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteShardsResponse.Merge(m, src)
 }
 func (m *ExecuteShardsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteShardsResponse.Size(m)
@@ -622,16 +634,17 @@ func (m *ExecuteKeyspaceIdsRequest) Reset()         { *m = ExecuteKeyspaceIdsReq
 func (m *ExecuteKeyspaceIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteKeyspaceIdsRequest) ProtoMessage()    {}
 func (*ExecuteKeyspaceIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{5}
+	return fileDescriptor_aab96496ceaf1ebb, []int{5}
 }
+
 func (m *ExecuteKeyspaceIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteKeyspaceIdsRequest.Unmarshal(m, b)
 }
 func (m *ExecuteKeyspaceIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteKeyspaceIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteKeyspaceIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteKeyspaceIdsRequest.Merge(dst, src)
+func (m *ExecuteKeyspaceIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteKeyspaceIdsRequest.Merge(m, src)
 }
 func (m *ExecuteKeyspaceIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteKeyspaceIdsRequest.Size(m)
@@ -717,16 +730,17 @@ func (m *ExecuteKeyspaceIdsResponse) Reset()         { *m = ExecuteKeyspaceIdsRe
 func (m *ExecuteKeyspaceIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteKeyspaceIdsResponse) ProtoMessage()    {}
 func (*ExecuteKeyspaceIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{6}
+	return fileDescriptor_aab96496ceaf1ebb, []int{6}
 }
+
 func (m *ExecuteKeyspaceIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteKeyspaceIdsResponse.Unmarshal(m, b)
 }
 func (m *ExecuteKeyspaceIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteKeyspaceIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteKeyspaceIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteKeyspaceIdsResponse.Merge(dst, src)
+func (m *ExecuteKeyspaceIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteKeyspaceIdsResponse.Merge(m, src)
 }
 func (m *ExecuteKeyspaceIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteKeyspaceIdsResponse.Size(m)
@@ -788,16 +802,17 @@ func (m *ExecuteKeyRangesRequest) Reset()         { *m = ExecuteKeyRangesRequest
 func (m *ExecuteKeyRangesRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteKeyRangesRequest) ProtoMessage()    {}
 func (*ExecuteKeyRangesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{7}
+	return fileDescriptor_aab96496ceaf1ebb, []int{7}
 }
+
 func (m *ExecuteKeyRangesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteKeyRangesRequest.Unmarshal(m, b)
 }
 func (m *ExecuteKeyRangesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteKeyRangesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteKeyRangesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteKeyRangesRequest.Merge(dst, src)
+func (m *ExecuteKeyRangesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteKeyRangesRequest.Merge(m, src)
 }
 func (m *ExecuteKeyRangesRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteKeyRangesRequest.Size(m)
@@ -883,16 +898,17 @@ func (m *ExecuteKeyRangesResponse) Reset()         { *m = ExecuteKeyRangesRespon
 func (m *ExecuteKeyRangesResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteKeyRangesResponse) ProtoMessage()    {}
 func (*ExecuteKeyRangesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{8}
+	return fileDescriptor_aab96496ceaf1ebb, []int{8}
 }
+
 func (m *ExecuteKeyRangesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteKeyRangesResponse.Unmarshal(m, b)
 }
 func (m *ExecuteKeyRangesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteKeyRangesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteKeyRangesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteKeyRangesResponse.Merge(dst, src)
+func (m *ExecuteKeyRangesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteKeyRangesResponse.Merge(m, src)
 }
 func (m *ExecuteKeyRangesResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteKeyRangesResponse.Size(m)
@@ -956,16 +972,17 @@ func (m *ExecuteEntityIdsRequest) Reset()         { *m = ExecuteEntityIdsRequest
 func (m *ExecuteEntityIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteEntityIdsRequest) ProtoMessage()    {}
 func (*ExecuteEntityIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{9}
+	return fileDescriptor_aab96496ceaf1ebb, []int{9}
 }
+
 func (m *ExecuteEntityIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteEntityIdsRequest.Unmarshal(m, b)
 }
 func (m *ExecuteEntityIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteEntityIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteEntityIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteEntityIdsRequest.Merge(dst, src)
+func (m *ExecuteEntityIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteEntityIdsRequest.Merge(m, src)
 }
 func (m *ExecuteEntityIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteEntityIdsRequest.Size(m)
@@ -1055,16 +1072,17 @@ func (m *ExecuteEntityIdsRequest_EntityId) Reset()         { *m = ExecuteEntityI
 func (m *ExecuteEntityIdsRequest_EntityId) String() string { return proto.CompactTextString(m) }
 func (*ExecuteEntityIdsRequest_EntityId) ProtoMessage()    {}
 func (*ExecuteEntityIdsRequest_EntityId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{9, 0}
+	return fileDescriptor_aab96496ceaf1ebb, []int{9, 0}
 }
+
 func (m *ExecuteEntityIdsRequest_EntityId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Unmarshal(m, b)
 }
 func (m *ExecuteEntityIdsRequest_EntityId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteEntityIdsRequest_EntityId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Merge(dst, src)
+func (m *ExecuteEntityIdsRequest_EntityId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Merge(m, src)
 }
 func (m *ExecuteEntityIdsRequest_EntityId) XXX_Size() int {
 	return xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Size(m)
@@ -1115,16 +1133,17 @@ func (m *ExecuteEntityIdsResponse) Reset()         { *m = ExecuteEntityIdsRespon
 func (m *ExecuteEntityIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteEntityIdsResponse) ProtoMessage()    {}
 func (*ExecuteEntityIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{10}
+	return fileDescriptor_aab96496ceaf1ebb, []int{10}
 }
+
 func (m *ExecuteEntityIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteEntityIdsResponse.Unmarshal(m, b)
 }
 func (m *ExecuteEntityIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteEntityIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteEntityIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteEntityIdsResponse.Merge(dst, src)
+func (m *ExecuteEntityIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteEntityIdsResponse.Merge(m, src)
 }
 func (m *ExecuteEntityIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteEntityIdsResponse.Size(m)
@@ -1180,16 +1199,17 @@ func (m *ExecuteBatchRequest) Reset()         { *m = ExecuteBatchRequest{} }
 func (m *ExecuteBatchRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchRequest) ProtoMessage()    {}
 func (*ExecuteBatchRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{11}
+	return fileDescriptor_aab96496ceaf1ebb, []int{11}
 }
+
 func (m *ExecuteBatchRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchRequest.Unmarshal(m, b)
 }
 func (m *ExecuteBatchRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchRequest.Merge(dst, src)
+func (m *ExecuteBatchRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchRequest.Merge(m, src)
 }
 func (m *ExecuteBatchRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchRequest.Size(m)
@@ -1268,16 +1288,17 @@ func (m *ExecuteBatchResponse) Reset()         { *m = ExecuteBatchResponse{} }
 func (m *ExecuteBatchResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchResponse) ProtoMessage()    {}
 func (*ExecuteBatchResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{12}
+	return fileDescriptor_aab96496ceaf1ebb, []int{12}
 }
+
 func (m *ExecuteBatchResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchResponse.Unmarshal(m, b)
 }
 func (m *ExecuteBatchResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchResponse.Merge(dst, src)
+func (m *ExecuteBatchResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchResponse.Merge(m, src)
 }
 func (m *ExecuteBatchResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchResponse.Size(m)
@@ -1328,16 +1349,17 @@ func (m *BoundShardQuery) Reset()         { *m = BoundShardQuery{} }
 func (m *BoundShardQuery) String() string { return proto.CompactTextString(m) }
 func (*BoundShardQuery) ProtoMessage()    {}
 func (*BoundShardQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{13}
+	return fileDescriptor_aab96496ceaf1ebb, []int{13}
 }
+
 func (m *BoundShardQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundShardQuery.Unmarshal(m, b)
 }
 func (m *BoundShardQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundShardQuery.Marshal(b, m, deterministic)
 }
-func (dst *BoundShardQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundShardQuery.Merge(dst, src)
+func (m *BoundShardQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundShardQuery.Merge(m, src)
 }
 func (m *BoundShardQuery) XXX_Size() int {
 	return xxx_messageInfo_BoundShardQuery.Size(m)
@@ -1396,16 +1418,17 @@ func (m *ExecuteBatchShardsRequest) Reset()         { *m = ExecuteBatchShardsReq
 func (m *ExecuteBatchShardsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchShardsRequest) ProtoMessage()    {}
 func (*ExecuteBatchShardsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{14}
+	return fileDescriptor_aab96496ceaf1ebb, []int{14}
 }
+
 func (m *ExecuteBatchShardsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchShardsRequest.Unmarshal(m, b)
 }
 func (m *ExecuteBatchShardsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchShardsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchShardsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchShardsRequest.Merge(dst, src)
+func (m *ExecuteBatchShardsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchShardsRequest.Merge(m, src)
 }
 func (m *ExecuteBatchShardsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchShardsRequest.Size(m)
@@ -1477,16 +1500,17 @@ func (m *ExecuteBatchShardsResponse) Reset()         { *m = ExecuteBatchShardsRe
 func (m *ExecuteBatchShardsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchShardsResponse) ProtoMessage()    {}
 func (*ExecuteBatchShardsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{15}
+	return fileDescriptor_aab96496ceaf1ebb, []int{15}
 }
+
 func (m *ExecuteBatchShardsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchShardsResponse.Unmarshal(m, b)
 }
 func (m *ExecuteBatchShardsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchShardsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchShardsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchShardsResponse.Merge(dst, src)
+func (m *ExecuteBatchShardsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchShardsResponse.Merge(m, src)
 }
 func (m *ExecuteBatchShardsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchShardsResponse.Size(m)
@@ -1538,16 +1562,17 @@ func (m *BoundKeyspaceIdQuery) Reset()         { *m = BoundKeyspaceIdQuery{} }
 func (m *BoundKeyspaceIdQuery) String() string { return proto.CompactTextString(m) }
 func (*BoundKeyspaceIdQuery) ProtoMessage()    {}
 func (*BoundKeyspaceIdQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{16}
+	return fileDescriptor_aab96496ceaf1ebb, []int{16}
 }
+
 func (m *BoundKeyspaceIdQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundKeyspaceIdQuery.Unmarshal(m, b)
 }
 func (m *BoundKeyspaceIdQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundKeyspaceIdQuery.Marshal(b, m, deterministic)
 }
-func (dst *BoundKeyspaceIdQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundKeyspaceIdQuery.Merge(dst, src)
+func (m *BoundKeyspaceIdQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundKeyspaceIdQuery.Merge(m, src)
 }
 func (m *BoundKeyspaceIdQuery) XXX_Size() int {
 	return xxx_messageInfo_BoundKeyspaceIdQuery.Size(m)
@@ -1605,16 +1630,17 @@ func (m *ExecuteBatchKeyspaceIdsRequest) Reset()         { *m = ExecuteBatchKeys
 func (m *ExecuteBatchKeyspaceIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchKeyspaceIdsRequest) ProtoMessage()    {}
 func (*ExecuteBatchKeyspaceIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{17}
+	return fileDescriptor_aab96496ceaf1ebb, []int{17}
 }
+
 func (m *ExecuteBatchKeyspaceIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Unmarshal(m, b)
 }
 func (m *ExecuteBatchKeyspaceIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchKeyspaceIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Merge(dst, src)
+func (m *ExecuteBatchKeyspaceIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Merge(m, src)
 }
 func (m *ExecuteBatchKeyspaceIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Size(m)
@@ -1686,16 +1712,17 @@ func (m *ExecuteBatchKeyspaceIdsResponse) Reset()         { *m = ExecuteBatchKey
 func (m *ExecuteBatchKeyspaceIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchKeyspaceIdsResponse) ProtoMessage()    {}
 func (*ExecuteBatchKeyspaceIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{18}
+	return fileDescriptor_aab96496ceaf1ebb, []int{18}
 }
+
 func (m *ExecuteBatchKeyspaceIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Unmarshal(m, b)
 }
 func (m *ExecuteBatchKeyspaceIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchKeyspaceIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Merge(dst, src)
+func (m *ExecuteBatchKeyspaceIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Merge(m, src)
 }
 func (m *ExecuteBatchKeyspaceIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Size(m)
@@ -1750,16 +1777,17 @@ func (m *StreamExecuteRequest) Reset()         { *m = StreamExecuteRequest{} }
 func (m *StreamExecuteRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteRequest) ProtoMessage()    {}
 func (*StreamExecuteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{19}
+	return fileDescriptor_aab96496ceaf1ebb, []int{19}
 }
+
 func (m *StreamExecuteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteRequest.Unmarshal(m, b)
 }
 func (m *StreamExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteRequest.Merge(dst, src)
+func (m *StreamExecuteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteRequest.Merge(m, src)
 }
 func (m *StreamExecuteRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteRequest.Size(m)
@@ -1829,16 +1857,17 @@ func (m *StreamExecuteResponse) Reset()         { *m = StreamExecuteResponse{} }
 func (m *StreamExecuteResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteResponse) ProtoMessage()    {}
 func (*StreamExecuteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{20}
+	return fileDescriptor_aab96496ceaf1ebb, []int{20}
 }
+
 func (m *StreamExecuteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteResponse.Unmarshal(m, b)
 }
 func (m *StreamExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteResponse.Merge(dst, src)
+func (m *StreamExecuteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteResponse.Merge(m, src)
 }
 func (m *StreamExecuteResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteResponse.Size(m)
@@ -1880,16 +1909,17 @@ func (m *StreamExecuteShardsRequest) Reset()         { *m = StreamExecuteShardsR
 func (m *StreamExecuteShardsRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteShardsRequest) ProtoMessage()    {}
 func (*StreamExecuteShardsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{21}
+	return fileDescriptor_aab96496ceaf1ebb, []int{21}
 }
+
 func (m *StreamExecuteShardsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteShardsRequest.Unmarshal(m, b)
 }
 func (m *StreamExecuteShardsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteShardsRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteShardsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteShardsRequest.Merge(dst, src)
+func (m *StreamExecuteShardsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteShardsRequest.Merge(m, src)
 }
 func (m *StreamExecuteShardsRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteShardsRequest.Size(m)
@@ -1957,16 +1987,17 @@ func (m *StreamExecuteShardsResponse) Reset()         { *m = StreamExecuteShards
 func (m *StreamExecuteShardsResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteShardsResponse) ProtoMessage()    {}
 func (*StreamExecuteShardsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{22}
+	return fileDescriptor_aab96496ceaf1ebb, []int{22}
 }
+
 func (m *StreamExecuteShardsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteShardsResponse.Unmarshal(m, b)
 }
 func (m *StreamExecuteShardsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteShardsResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteShardsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteShardsResponse.Merge(dst, src)
+func (m *StreamExecuteShardsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteShardsResponse.Merge(m, src)
 }
 func (m *StreamExecuteShardsResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteShardsResponse.Size(m)
@@ -2009,16 +2040,17 @@ func (m *StreamExecuteKeyspaceIdsRequest) Reset()         { *m = StreamExecuteKe
 func (m *StreamExecuteKeyspaceIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteKeyspaceIdsRequest) ProtoMessage()    {}
 func (*StreamExecuteKeyspaceIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{23}
+	return fileDescriptor_aab96496ceaf1ebb, []int{23}
 }
+
 func (m *StreamExecuteKeyspaceIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Unmarshal(m, b)
 }
 func (m *StreamExecuteKeyspaceIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteKeyspaceIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Merge(dst, src)
+func (m *StreamExecuteKeyspaceIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Merge(m, src)
 }
 func (m *StreamExecuteKeyspaceIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Size(m)
@@ -2086,16 +2118,17 @@ func (m *StreamExecuteKeyspaceIdsResponse) Reset()         { *m = StreamExecuteK
 func (m *StreamExecuteKeyspaceIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteKeyspaceIdsResponse) ProtoMessage()    {}
 func (*StreamExecuteKeyspaceIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{24}
+	return fileDescriptor_aab96496ceaf1ebb, []int{24}
 }
+
 func (m *StreamExecuteKeyspaceIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Unmarshal(m, b)
 }
 func (m *StreamExecuteKeyspaceIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteKeyspaceIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Merge(dst, src)
+func (m *StreamExecuteKeyspaceIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Merge(m, src)
 }
 func (m *StreamExecuteKeyspaceIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Size(m)
@@ -2138,16 +2171,17 @@ func (m *StreamExecuteKeyRangesRequest) Reset()         { *m = StreamExecuteKeyR
 func (m *StreamExecuteKeyRangesRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteKeyRangesRequest) ProtoMessage()    {}
 func (*StreamExecuteKeyRangesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{25}
+	return fileDescriptor_aab96496ceaf1ebb, []int{25}
 }
+
 func (m *StreamExecuteKeyRangesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteKeyRangesRequest.Unmarshal(m, b)
 }
 func (m *StreamExecuteKeyRangesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteKeyRangesRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteKeyRangesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteKeyRangesRequest.Merge(dst, src)
+func (m *StreamExecuteKeyRangesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteKeyRangesRequest.Merge(m, src)
 }
 func (m *StreamExecuteKeyRangesRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteKeyRangesRequest.Size(m)
@@ -2215,16 +2249,17 @@ func (m *StreamExecuteKeyRangesResponse) Reset()         { *m = StreamExecuteKey
 func (m *StreamExecuteKeyRangesResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamExecuteKeyRangesResponse) ProtoMessage()    {}
 func (*StreamExecuteKeyRangesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{26}
+	return fileDescriptor_aab96496ceaf1ebb, []int{26}
 }
+
 func (m *StreamExecuteKeyRangesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamExecuteKeyRangesResponse.Unmarshal(m, b)
 }
 func (m *StreamExecuteKeyRangesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamExecuteKeyRangesResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamExecuteKeyRangesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamExecuteKeyRangesResponse.Merge(dst, src)
+func (m *StreamExecuteKeyRangesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamExecuteKeyRangesResponse.Merge(m, src)
 }
 func (m *StreamExecuteKeyRangesResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamExecuteKeyRangesResponse.Size(m)
@@ -2261,16 +2296,17 @@ func (m *BeginRequest) Reset()         { *m = BeginRequest{} }
 func (m *BeginRequest) String() string { return proto.CompactTextString(m) }
 func (*BeginRequest) ProtoMessage()    {}
 func (*BeginRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{27}
+	return fileDescriptor_aab96496ceaf1ebb, []int{27}
 }
+
 func (m *BeginRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginRequest.Unmarshal(m, b)
 }
 func (m *BeginRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginRequest.Marshal(b, m, deterministic)
 }
-func (dst *BeginRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginRequest.Merge(dst, src)
+func (m *BeginRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginRequest.Merge(m, src)
 }
 func (m *BeginRequest) XXX_Size() int {
 	return xxx_messageInfo_BeginRequest.Size(m)
@@ -2308,16 +2344,17 @@ func (m *BeginResponse) Reset()         { *m = BeginResponse{} }
 func (m *BeginResponse) String() string { return proto.CompactTextString(m) }
 func (*BeginResponse) ProtoMessage()    {}
 func (*BeginResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{28}
+	return fileDescriptor_aab96496ceaf1ebb, []int{28}
 }
+
 func (m *BeginResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginResponse.Unmarshal(m, b)
 }
 func (m *BeginResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginResponse.Marshal(b, m, deterministic)
 }
-func (dst *BeginResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginResponse.Merge(dst, src)
+func (m *BeginResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginResponse.Merge(m, src)
 }
 func (m *BeginResponse) XXX_Size() int {
 	return xxx_messageInfo_BeginResponse.Size(m)
@@ -2356,16 +2393,17 @@ func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
 func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
 func (*CommitRequest) ProtoMessage()    {}
 func (*CommitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{29}
+	return fileDescriptor_aab96496ceaf1ebb, []int{29}
 }
+
 func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
 func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
 }
-func (dst *CommitRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitRequest.Merge(dst, src)
+func (m *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(m, src)
 }
 func (m *CommitRequest) XXX_Size() int {
 	return xxx_messageInfo_CommitRequest.Size(m)
@@ -2408,16 +2446,17 @@ func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
 func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
 func (*CommitResponse) ProtoMessage()    {}
 func (*CommitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{30}
+	return fileDescriptor_aab96496ceaf1ebb, []int{30}
 }
+
 func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
 }
 func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
 }
-func (dst *CommitResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResponse.Merge(dst, src)
+func (m *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(m, src)
 }
 func (m *CommitResponse) XXX_Size() int {
 	return xxx_messageInfo_CommitResponse.Size(m)
@@ -2444,16 +2483,17 @@ func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
 func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackRequest) ProtoMessage()    {}
 func (*RollbackRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{31}
+	return fileDescriptor_aab96496ceaf1ebb, []int{31}
 }
+
 func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
 }
 func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+func (m *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(m, src)
 }
 func (m *RollbackRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackRequest.Size(m)
@@ -2489,16 +2529,17 @@ func (m *RollbackResponse) Reset()         { *m = RollbackResponse{} }
 func (m *RollbackResponse) String() string { return proto.CompactTextString(m) }
 func (*RollbackResponse) ProtoMessage()    {}
 func (*RollbackResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{32}
+	return fileDescriptor_aab96496ceaf1ebb, []int{32}
 }
+
 func (m *RollbackResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackResponse.Unmarshal(m, b)
 }
 func (m *RollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackResponse.Marshal(b, m, deterministic)
 }
-func (dst *RollbackResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackResponse.Merge(dst, src)
+func (m *RollbackResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackResponse.Merge(m, src)
 }
 func (m *RollbackResponse) XXX_Size() int {
 	return xxx_messageInfo_RollbackResponse.Size(m)
@@ -2525,16 +2566,17 @@ func (m *ResolveTransactionRequest) Reset()         { *m = ResolveTransactionReq
 func (m *ResolveTransactionRequest) String() string { return proto.CompactTextString(m) }
 func (*ResolveTransactionRequest) ProtoMessage()    {}
 func (*ResolveTransactionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{33}
+	return fileDescriptor_aab96496ceaf1ebb, []int{33}
 }
+
 func (m *ResolveTransactionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResolveTransactionRequest.Unmarshal(m, b)
 }
 func (m *ResolveTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResolveTransactionRequest.Marshal(b, m, deterministic)
 }
-func (dst *ResolveTransactionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResolveTransactionRequest.Merge(dst, src)
+func (m *ResolveTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResolveTransactionRequest.Merge(m, src)
 }
 func (m *ResolveTransactionRequest) XXX_Size() int {
 	return xxx_messageInfo_ResolveTransactionRequest.Size(m)
@@ -2581,16 +2623,17 @@ func (m *MessageStreamRequest) Reset()         { *m = MessageStreamRequest{} }
 func (m *MessageStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*MessageStreamRequest) ProtoMessage()    {}
 func (*MessageStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{34}
+	return fileDescriptor_aab96496ceaf1ebb, []int{34}
 }
+
 func (m *MessageStreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageStreamRequest.Unmarshal(m, b)
 }
 func (m *MessageStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MessageStreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *MessageStreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MessageStreamRequest.Merge(dst, src)
+func (m *MessageStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageStreamRequest.Merge(m, src)
 }
 func (m *MessageStreamRequest) XXX_Size() int {
 	return xxx_messageInfo_MessageStreamRequest.Size(m)
@@ -2656,16 +2699,17 @@ func (m *MessageAckRequest) Reset()         { *m = MessageAckRequest{} }
 func (m *MessageAckRequest) String() string { return proto.CompactTextString(m) }
 func (*MessageAckRequest) ProtoMessage()    {}
 func (*MessageAckRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{35}
+	return fileDescriptor_aab96496ceaf1ebb, []int{35}
 }
+
 func (m *MessageAckRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageAckRequest.Unmarshal(m, b)
 }
 func (m *MessageAckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MessageAckRequest.Marshal(b, m, deterministic)
 }
-func (dst *MessageAckRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MessageAckRequest.Merge(dst, src)
+func (m *MessageAckRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageAckRequest.Merge(m, src)
 }
 func (m *MessageAckRequest) XXX_Size() int {
 	return xxx_messageInfo_MessageAckRequest.Size(m)
@@ -2720,16 +2764,17 @@ func (m *IdKeyspaceId) Reset()         { *m = IdKeyspaceId{} }
 func (m *IdKeyspaceId) String() string { return proto.CompactTextString(m) }
 func (*IdKeyspaceId) ProtoMessage()    {}
 func (*IdKeyspaceId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{36}
+	return fileDescriptor_aab96496ceaf1ebb, []int{36}
 }
+
 func (m *IdKeyspaceId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IdKeyspaceId.Unmarshal(m, b)
 }
 func (m *IdKeyspaceId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IdKeyspaceId.Marshal(b, m, deterministic)
 }
-func (dst *IdKeyspaceId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IdKeyspaceId.Merge(dst, src)
+func (m *IdKeyspaceId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IdKeyspaceId.Merge(m, src)
 }
 func (m *IdKeyspaceId) XXX_Size() int {
 	return xxx_messageInfo_IdKeyspaceId.Size(m)
@@ -2773,16 +2818,17 @@ func (m *MessageAckKeyspaceIdsRequest) Reset()         { *m = MessageAckKeyspace
 func (m *MessageAckKeyspaceIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*MessageAckKeyspaceIdsRequest) ProtoMessage()    {}
 func (*MessageAckKeyspaceIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{37}
+	return fileDescriptor_aab96496ceaf1ebb, []int{37}
 }
+
 func (m *MessageAckKeyspaceIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageAckKeyspaceIdsRequest.Unmarshal(m, b)
 }
 func (m *MessageAckKeyspaceIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MessageAckKeyspaceIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MessageAckKeyspaceIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MessageAckKeyspaceIdsRequest.Merge(dst, src)
+func (m *MessageAckKeyspaceIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageAckKeyspaceIdsRequest.Merge(m, src)
 }
 func (m *MessageAckKeyspaceIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_MessageAckKeyspaceIdsRequest.Size(m)
@@ -2832,16 +2878,17 @@ func (m *ResolveTransactionResponse) Reset()         { *m = ResolveTransactionRe
 func (m *ResolveTransactionResponse) String() string { return proto.CompactTextString(m) }
 func (*ResolveTransactionResponse) ProtoMessage()    {}
 func (*ResolveTransactionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{38}
+	return fileDescriptor_aab96496ceaf1ebb, []int{38}
 }
+
 func (m *ResolveTransactionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResolveTransactionResponse.Unmarshal(m, b)
 }
 func (m *ResolveTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResolveTransactionResponse.Marshal(b, m, deterministic)
 }
-func (dst *ResolveTransactionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResolveTransactionResponse.Merge(dst, src)
+func (m *ResolveTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResolveTransactionResponse.Merge(m, src)
 }
 func (m *ResolveTransactionResponse) XXX_Size() int {
 	return xxx_messageInfo_ResolveTransactionResponse.Size(m)
@@ -2950,16 +2997,17 @@ func (m *SplitQueryRequest) Reset()         { *m = SplitQueryRequest{} }
 func (m *SplitQueryRequest) String() string { return proto.CompactTextString(m) }
 func (*SplitQueryRequest) ProtoMessage()    {}
 func (*SplitQueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{39}
+	return fileDescriptor_aab96496ceaf1ebb, []int{39}
 }
+
 func (m *SplitQueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SplitQueryRequest.Unmarshal(m, b)
 }
 func (m *SplitQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SplitQueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *SplitQueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SplitQueryRequest.Merge(dst, src)
+func (m *SplitQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SplitQueryRequest.Merge(m, src)
 }
 func (m *SplitQueryRequest) XXX_Size() int {
 	return xxx_messageInfo_SplitQueryRequest.Size(m)
@@ -3039,16 +3087,17 @@ func (m *SplitQueryResponse) Reset()         { *m = SplitQueryResponse{} }
 func (m *SplitQueryResponse) String() string { return proto.CompactTextString(m) }
 func (*SplitQueryResponse) ProtoMessage()    {}
 func (*SplitQueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{40}
+	return fileDescriptor_aab96496ceaf1ebb, []int{40}
 }
+
 func (m *SplitQueryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SplitQueryResponse.Unmarshal(m, b)
 }
 func (m *SplitQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SplitQueryResponse.Marshal(b, m, deterministic)
 }
-func (dst *SplitQueryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SplitQueryResponse.Merge(dst, src)
+func (m *SplitQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SplitQueryResponse.Merge(m, src)
 }
 func (m *SplitQueryResponse) XXX_Size() int {
 	return xxx_messageInfo_SplitQueryResponse.Size(m)
@@ -3080,16 +3129,17 @@ func (m *SplitQueryResponse_KeyRangePart) Reset()         { *m = SplitQueryRespo
 func (m *SplitQueryResponse_KeyRangePart) String() string { return proto.CompactTextString(m) }
 func (*SplitQueryResponse_KeyRangePart) ProtoMessage()    {}
 func (*SplitQueryResponse_KeyRangePart) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{40, 0}
+	return fileDescriptor_aab96496ceaf1ebb, []int{40, 0}
 }
+
 func (m *SplitQueryResponse_KeyRangePart) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SplitQueryResponse_KeyRangePart.Unmarshal(m, b)
 }
 func (m *SplitQueryResponse_KeyRangePart) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SplitQueryResponse_KeyRangePart.Marshal(b, m, deterministic)
 }
-func (dst *SplitQueryResponse_KeyRangePart) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SplitQueryResponse_KeyRangePart.Merge(dst, src)
+func (m *SplitQueryResponse_KeyRangePart) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SplitQueryResponse_KeyRangePart.Merge(m, src)
 }
 func (m *SplitQueryResponse_KeyRangePart) XXX_Size() int {
 	return xxx_messageInfo_SplitQueryResponse_KeyRangePart.Size(m)
@@ -3128,16 +3178,17 @@ func (m *SplitQueryResponse_ShardPart) Reset()         { *m = SplitQueryResponse
 func (m *SplitQueryResponse_ShardPart) String() string { return proto.CompactTextString(m) }
 func (*SplitQueryResponse_ShardPart) ProtoMessage()    {}
 func (*SplitQueryResponse_ShardPart) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{40, 1}
+	return fileDescriptor_aab96496ceaf1ebb, []int{40, 1}
 }
+
 func (m *SplitQueryResponse_ShardPart) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SplitQueryResponse_ShardPart.Unmarshal(m, b)
 }
 func (m *SplitQueryResponse_ShardPart) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SplitQueryResponse_ShardPart.Marshal(b, m, deterministic)
 }
-func (dst *SplitQueryResponse_ShardPart) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SplitQueryResponse_ShardPart.Merge(dst, src)
+func (m *SplitQueryResponse_ShardPart) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SplitQueryResponse_ShardPart.Merge(m, src)
 }
 func (m *SplitQueryResponse_ShardPart) XXX_Size() int {
 	return xxx_messageInfo_SplitQueryResponse_ShardPart.Size(m)
@@ -3181,16 +3232,17 @@ func (m *SplitQueryResponse_Part) Reset()         { *m = SplitQueryResponse_Part
 func (m *SplitQueryResponse_Part) String() string { return proto.CompactTextString(m) }
 func (*SplitQueryResponse_Part) ProtoMessage()    {}
 func (*SplitQueryResponse_Part) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{40, 2}
+	return fileDescriptor_aab96496ceaf1ebb, []int{40, 2}
 }
+
 func (m *SplitQueryResponse_Part) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SplitQueryResponse_Part.Unmarshal(m, b)
 }
 func (m *SplitQueryResponse_Part) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SplitQueryResponse_Part.Marshal(b, m, deterministic)
 }
-func (dst *SplitQueryResponse_Part) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SplitQueryResponse_Part.Merge(dst, src)
+func (m *SplitQueryResponse_Part) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SplitQueryResponse_Part.Merge(m, src)
 }
 func (m *SplitQueryResponse_Part) XXX_Size() int {
 	return xxx_messageInfo_SplitQueryResponse_Part.Size(m)
@@ -3242,16 +3294,17 @@ func (m *GetSrvKeyspaceRequest) Reset()         { *m = GetSrvKeyspaceRequest{} }
 func (m *GetSrvKeyspaceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSrvKeyspaceRequest) ProtoMessage()    {}
 func (*GetSrvKeyspaceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{41}
+	return fileDescriptor_aab96496ceaf1ebb, []int{41}
 }
+
 func (m *GetSrvKeyspaceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSrvKeyspaceRequest.Unmarshal(m, b)
 }
 func (m *GetSrvKeyspaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSrvKeyspaceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSrvKeyspaceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSrvKeyspaceRequest.Merge(dst, src)
+func (m *GetSrvKeyspaceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSrvKeyspaceRequest.Merge(m, src)
 }
 func (m *GetSrvKeyspaceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSrvKeyspaceRequest.Size(m)
@@ -3282,16 +3335,17 @@ func (m *GetSrvKeyspaceResponse) Reset()         { *m = GetSrvKeyspaceResponse{}
 func (m *GetSrvKeyspaceResponse) String() string { return proto.CompactTextString(m) }
 func (*GetSrvKeyspaceResponse) ProtoMessage()    {}
 func (*GetSrvKeyspaceResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{42}
+	return fileDescriptor_aab96496ceaf1ebb, []int{42}
 }
+
 func (m *GetSrvKeyspaceResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSrvKeyspaceResponse.Unmarshal(m, b)
 }
 func (m *GetSrvKeyspaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSrvKeyspaceResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetSrvKeyspaceResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSrvKeyspaceResponse.Merge(dst, src)
+func (m *GetSrvKeyspaceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSrvKeyspaceResponse.Merge(m, src)
 }
 func (m *GetSrvKeyspaceResponse) XXX_Size() int {
 	return xxx_messageInfo_GetSrvKeyspaceResponse.Size(m)
@@ -3327,16 +3381,17 @@ func (m *VStreamRequest) Reset()         { *m = VStreamRequest{} }
 func (m *VStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*VStreamRequest) ProtoMessage()    {}
 func (*VStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{43}
+	return fileDescriptor_aab96496ceaf1ebb, []int{43}
 }
+
 func (m *VStreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VStreamRequest.Unmarshal(m, b)
 }
 func (m *VStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VStreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *VStreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VStreamRequest.Merge(dst, src)
+func (m *VStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VStreamRequest.Merge(m, src)
 }
 func (m *VStreamRequest) XXX_Size() int {
 	return xxx_messageInfo_VStreamRequest.Size(m)
@@ -3387,16 +3442,17 @@ func (m *VStreamResponse) Reset()         { *m = VStreamResponse{} }
 func (m *VStreamResponse) String() string { return proto.CompactTextString(m) }
 func (*VStreamResponse) ProtoMessage()    {}
 func (*VStreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{44}
+	return fileDescriptor_aab96496ceaf1ebb, []int{44}
 }
+
 func (m *VStreamResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VStreamResponse.Unmarshal(m, b)
 }
 func (m *VStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VStreamResponse.Marshal(b, m, deterministic)
 }
-func (dst *VStreamResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VStreamResponse.Merge(dst, src)
+func (m *VStreamResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VStreamResponse.Merge(m, src)
 }
 func (m *VStreamResponse) XXX_Size() int {
 	return xxx_messageInfo_VStreamResponse.Size(m)
@@ -3445,16 +3501,17 @@ func (m *UpdateStreamRequest) Reset()         { *m = UpdateStreamRequest{} }
 func (m *UpdateStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateStreamRequest) ProtoMessage()    {}
 func (*UpdateStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{45}
+	return fileDescriptor_aab96496ceaf1ebb, []int{45}
 }
+
 func (m *UpdateStreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateStreamRequest.Unmarshal(m, b)
 }
 func (m *UpdateStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateStreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateStreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateStreamRequest.Merge(dst, src)
+func (m *UpdateStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateStreamRequest.Merge(m, src)
 }
 func (m *UpdateStreamRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateStreamRequest.Size(m)
@@ -3533,16 +3590,17 @@ func (m *UpdateStreamResponse) Reset()         { *m = UpdateStreamResponse{} }
 func (m *UpdateStreamResponse) String() string { return proto.CompactTextString(m) }
 func (*UpdateStreamResponse) ProtoMessage()    {}
 func (*UpdateStreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtgate_339c92b13a08c8a7, []int{46}
+	return fileDescriptor_aab96496ceaf1ebb, []int{46}
 }
+
 func (m *UpdateStreamResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateStreamResponse.Unmarshal(m, b)
 }
 func (m *UpdateStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateStreamResponse.Marshal(b, m, deterministic)
 }
-func (dst *UpdateStreamResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateStreamResponse.Merge(dst, src)
+func (m *UpdateStreamResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateStreamResponse.Merge(m, src)
 }
 func (m *UpdateStreamResponse) XXX_Size() int {
 	return xxx_messageInfo_UpdateStreamResponse.Size(m)
@@ -3568,6 +3626,8 @@ func (m *UpdateStreamResponse) GetResumeTimestamp() int64 {
 }
 
 func init() {
+	proto.RegisterEnum("vtgate.TransactionMode", TransactionMode_name, TransactionMode_value)
+	proto.RegisterEnum("vtgate.CommitOrder", CommitOrder_name, CommitOrder_value)
 	proto.RegisterType((*Session)(nil), "vtgate.Session")
 	proto.RegisterType((*Session_ShardSession)(nil), "vtgate.Session.ShardSession")
 	proto.RegisterType((*ExecuteRequest)(nil), "vtgate.ExecuteRequest")
@@ -3620,13 +3680,11 @@ func init() {
 	proto.RegisterType((*VStreamResponse)(nil), "vtgate.VStreamResponse")
 	proto.RegisterType((*UpdateStreamRequest)(nil), "vtgate.UpdateStreamRequest")
 	proto.RegisterType((*UpdateStreamResponse)(nil), "vtgate.UpdateStreamResponse")
-	proto.RegisterEnum("vtgate.TransactionMode", TransactionMode_name, TransactionMode_value)
-	proto.RegisterEnum("vtgate.CommitOrder", CommitOrder_name, CommitOrder_value)
 }
 
-func init() { proto.RegisterFile("vtgate.proto", fileDescriptor_vtgate_339c92b13a08c8a7) }
+func init() { proto.RegisterFile("vtgate.proto", fileDescriptor_aab96496ceaf1ebb) }
 
-var fileDescriptor_vtgate_339c92b13a08c8a7 = []byte{
+var fileDescriptor_aab96496ceaf1ebb = []byte{
 	// 2041 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x8f, 0x23, 0x47,
 	0x15, 0x4f, 0x77, 0xfb, 0xf3, 0xf9, 0x73, 0x6b, 0xbc, 0x1b, 0xc7, 0x19, 0x76, 0x26, 0x1d, 0x46,

vendor/vitess.io/vitess/go/vt/proto/vtrpc/vtrpc.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: vtrpc.proto
 
-package vtrpc // import "vitess.io/vitess/go/vt/proto/vtrpc"
+package vtrpc
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +18,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Code represents canonical error codes. The names, numbers and comments
 // must match the ones defined by grpc:
@@ -144,6 +146,7 @@ var Code_name = map[int32]string{
 	14: "UNAVAILABLE",
 	15: "DATA_LOSS",
 }
+
 var Code_value = map[string]int32{
 	"OK":                  0,
 	"CANCELED":            1,
@@ -167,8 +170,9 @@ var Code_value = map[string]int32{
 func (x Code) String() string {
 	return proto.EnumName(Code_name, int32(x))
 }
+
 func (Code) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_vtrpc_88a14d8f1bc03cf5, []int{0}
+	return fileDescriptor_750b4cf641561858, []int{0}
 }
 
 // LegacyErrorCode is the enum values for Errors. This type is deprecated.
@@ -256,6 +260,7 @@ var LegacyErrorCode_name = map[int32]string{
 	11: "TRANSIENT_ERROR_LEGACY",
 	12: "UNAUTHENTICATED_LEGACY",
 }
+
 var LegacyErrorCode_value = map[string]int32{
 	"SUCCESS_LEGACY":            0,
 	"CANCELLED_LEGACY":          1,
@@ -275,8 +280,9 @@ var LegacyErrorCode_value = map[string]int32{
 func (x LegacyErrorCode) String() string {
 	return proto.EnumName(LegacyErrorCode_name, int32(x))
 }
+
 func (LegacyErrorCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_vtrpc_88a14d8f1bc03cf5, []int{1}
+	return fileDescriptor_750b4cf641561858, []int{1}
 }
 
 // CallerID is passed along RPCs to identify the originating client
@@ -311,16 +317,17 @@ func (m *CallerID) Reset()         { *m = CallerID{} }
 func (m *CallerID) String() string { return proto.CompactTextString(m) }
 func (*CallerID) ProtoMessage()    {}
 func (*CallerID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtrpc_88a14d8f1bc03cf5, []int{0}
+	return fileDescriptor_750b4cf641561858, []int{0}
 }
+
 func (m *CallerID) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallerID.Unmarshal(m, b)
 }
 func (m *CallerID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallerID.Marshal(b, m, deterministic)
 }
-func (dst *CallerID) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallerID.Merge(dst, src)
+func (m *CallerID) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallerID.Merge(m, src)
 }
 func (m *CallerID) XXX_Size() int {
 	return xxx_messageInfo_CallerID.Size(m)
@@ -369,16 +376,17 @@ func (m *RPCError) Reset()         { *m = RPCError{} }
 func (m *RPCError) String() string { return proto.CompactTextString(m) }
 func (*RPCError) ProtoMessage()    {}
 func (*RPCError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vtrpc_88a14d8f1bc03cf5, []int{1}
+	return fileDescriptor_750b4cf641561858, []int{1}
 }
+
 func (m *RPCError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RPCError.Unmarshal(m, b)
 }
 func (m *RPCError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RPCError.Marshal(b, m, deterministic)
 }
-func (dst *RPCError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RPCError.Merge(dst, src)
+func (m *RPCError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RPCError.Merge(m, src)
 }
 func (m *RPCError) XXX_Size() int {
 	return xxx_messageInfo_RPCError.Size(m)
@@ -411,15 +419,15 @@ func (m *RPCError) GetCode() Code {
 }
 
 func init() {
-	proto.RegisterType((*CallerID)(nil), "vtrpc.CallerID")
-	proto.RegisterType((*RPCError)(nil), "vtrpc.RPCError")
 	proto.RegisterEnum("vtrpc.Code", Code_name, Code_value)
 	proto.RegisterEnum("vtrpc.LegacyErrorCode", LegacyErrorCode_name, LegacyErrorCode_value)
+	proto.RegisterType((*CallerID)(nil), "vtrpc.CallerID")
+	proto.RegisterType((*RPCError)(nil), "vtrpc.RPCError")
 }
 
-func init() { proto.RegisterFile("vtrpc.proto", fileDescriptor_vtrpc_88a14d8f1bc03cf5) }
+func init() { proto.RegisterFile("vtrpc.proto", fileDescriptor_750b4cf641561858) }
 
-var fileDescriptor_vtrpc_88a14d8f1bc03cf5 = []byte{
+var fileDescriptor_750b4cf641561858 = []byte{
 	// 605 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x93, 0x4d, 0x4f, 0x1b, 0x3b,
 	0x14, 0x86, 0xc9, 0x07, 0xf9, 0x38, 0x13, 0x88, 0x31, 0x5f, 0xe1, 0x5e, 0xae, 0xee, 0x55, 0x56,

vendor/vitess.io/vitess/go/vt/proto/vttime/time.pb.go

+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: time.proto
+
+package vttime
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+// Time represents a time stamp in nanoseconds. In go, use logutil library
+// to convert times.
+type Time struct {
+	Seconds              int64    `protobuf:"varint,1,opt,name=seconds,proto3" json:"seconds,omitempty"`
+	Nanoseconds          int32    `protobuf:"varint,2,opt,name=nanoseconds,proto3" json:"nanoseconds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Time) Reset()         { *m = Time{} }
+func (m *Time) String() string { return proto.CompactTextString(m) }
+func (*Time) ProtoMessage()    {}
+func (*Time) Descriptor() ([]byte, []int) {
+	return fileDescriptor_49a92d779a28c7fd, []int{0}
+}
+
+func (m *Time) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Time.Unmarshal(m, b)
+}
+func (m *Time) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Time.Marshal(b, m, deterministic)
+}
+func (m *Time) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Time.Merge(m, src)
+}
+func (m *Time) XXX_Size() int {
+	return xxx_messageInfo_Time.Size(m)
+}
+func (m *Time) XXX_DiscardUnknown() {
+	xxx_messageInfo_Time.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Time proto.InternalMessageInfo
+
+func (m *Time) GetSeconds() int64 {
+	if m != nil {
+		return m.Seconds
+	}
+	return 0
+}
+
+func (m *Time) GetNanoseconds() int32 {
+	if m != nil {
+		return m.Nanoseconds
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*Time)(nil), "vttime.Time")
+}
+
+func init() { proto.RegisterFile("time.proto", fileDescriptor_49a92d779a28c7fd) }
+
+var fileDescriptor_49a92d779a28c7fd = []byte{
+	// 120 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2a, 0xc9, 0xcc, 0x4d,
+	0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2b, 0x2b, 0x01, 0xf1, 0x94, 0x9c, 0xb8, 0x58,
+	0x42, 0x32, 0x73, 0x53, 0x85, 0x24, 0xb8, 0xd8, 0x8b, 0x53, 0x93, 0xf3, 0xf3, 0x52, 0x8a, 0x25,
+	0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0x60, 0x5c, 0x21, 0x05, 0x2e, 0xee, 0xbc, 0xc4, 0xbc, 0x7c,
+	0x98, 0x2c, 0x93, 0x02, 0xa3, 0x06, 0x6b, 0x10, 0xb2, 0x90, 0x93, 0x6a, 0x94, 0x72, 0x59, 0x66,
+	0x49, 0x6a, 0x71, 0xb1, 0x5e, 0x66, 0xbe, 0x3e, 0x84, 0xa5, 0x9f, 0x9e, 0xaf, 0x5f, 0x56, 0xa2,
+	0x0f, 0xb6, 0x4b, 0x1f, 0x62, 0x55, 0x12, 0x1b, 0x98, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff,
+	0xb4, 0x42, 0xf5, 0xf7, 0x87, 0x00, 0x00, 0x00,
+}

vendor/vitess.io/vitess/go/vt/sqlparser/analyzer.go

@@ -30,10 +30,13 @@ import (
 	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
 )
 
+// StatementType encodes the type of a SQL statement
+type StatementType int
+
 // These constants are used to identify the SQL statement type.
 // Changing this list will require reviewing all calls to Preview.
 const (
-	StmtSelect = iota
+	StmtSelect StatementType = iota
 	StmtStream
 	StmtInsert
 	StmtReplace
@@ -53,7 +56,7 @@ const (
 
 // Preview analyzes the beginning of the query using a simpler and faster
 // textual comparison to identify the statement type.
-func Preview(sql string) int {
+func Preview(sql string) StatementType {
 	trimmed := StripLeadingComments(sql)
 
 	if strings.Index(trimmed, "/*!") == 0 {
@@ -111,9 +114,8 @@ func Preview(sql string) int {
 	return StmtUnknown
 }
 
-// StmtType returns the statement type as a string
-func StmtType(stmtType int) string {
-	switch stmtType {
+func (s StatementType) String() string {
+	switch s {
 	case StmtSelect:
 		return "SELECT"
 	case StmtStream:

vendor/vitess.io/vitess/go/vt/sqlparser/ast.go

@@ -2007,7 +2007,7 @@ func (node TableName) walkSubtree(visit Visit) error {
 
 // IsEmpty returns true if TableName is nil or empty.
 func (node TableName) IsEmpty() bool {
-	// If Name is empty, Qualifer is also empty.
+	// If Name is empty, Qualifier is also empty.
 	return node.Name.IsEmpty()
 }