diff --git a/go/vt/proto/vtgate/vtgate.pb.go b/go/vt/proto/vtgate/vtgate.pb.go index e082eb0ba4b..199d82cd0f6 100644 --- a/go/vt/proto/vtgate/vtgate.pb.go +++ b/go/vt/proto/vtgate/vtgate.pb.go @@ -155,7 +155,9 @@ type Session struct { // read_after_write tracks the ReadAfterWrite settings for this session. ReadAfterWrite *ReadAfterWrite `protobuf:"bytes,20,opt,name=read_after_write,json=readAfterWrite,proto3" json:"read_after_write,omitempty"` // DDL strategy - DDLStrategy string `protobuf:"bytes,21,opt,name=DDLStrategy,proto3" json:"DDLStrategy,omitempty"` + DDLStrategy string `protobuf:"bytes,21,opt,name=DDLStrategy,proto3" json:"DDLStrategy,omitempty"` + // Session UUID + SessionUUID string `protobuf:"bytes,22,opt,name=SessionUUID,proto3" json:"SessionUUID,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -326,6 +328,13 @@ func (m *Session) GetDDLStrategy() string { return "" } +func (m *Session) GetSessionUUID() string { + if m != nil { + return m.SessionUUID + } + return "" +} + type Session_ShardSession struct { Target *query.Target `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"` TransactionId int64 `protobuf:"varint,2,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"` @@ -1093,90 +1102,90 @@ func init() { func init() { proto.RegisterFile("vtgate.proto", fileDescriptor_aab96496ceaf1ebb) } var fileDescriptor_aab96496ceaf1ebb = []byte{ - // 1346 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x6e, 0x1b, 0xb7, - 0x12, 0xce, 0xea, 0x5f, 0xa3, 0xbf, 0x35, 0x6d, 0xe7, 0x6c, 0x7c, 0x72, 0xce, 0x11, 0x94, 0x04, - 0x51, 0x72, 0x0a, 0xa9, 0x75, 0xd1, 0x36, 0x28, 0x5a, 0xb4, 0xb6, 0xac, 0xa4, 0x0a, 0xec, 0xc8, - 0xa5, 0x64, 0x1b, 0x28, 0x5a, 0x2c, 0x68, 0x2d, 0x2d, 0x13, 0x96, 0x97, 0x0a, 0x49, 0xc9, 0xd5, - 0x53, 0xf4, 0xbe, 0x2f, 0xd0, 0x9b, 0xde, 0xf7, 0x1d, 0x7a, 0xd7, 0xc7, 0xe9, 0x5d, 0x41, 0xee, - 0xae, 0xb4, 0x52, 0xdc, 0xc6, 0x49, 0x90, 0x1b, 0x61, 0x67, 0xbe, 0xe1, 0x70, 0x38, 0xdf, 0x0c, - 0x87, 0x82, 0xe2, 0x54, 0x0d, 0x89, 0xa2, 0x8d, 0xb1, 0xe0, 0x8a, 0xa3, 0x4c, 0x20, 0x6d, 0xd9, - 0xa7, 0xcc, 0x1f, 0xf1, 0xa1, 0x47, 0x14, 0x09, 0x90, 0xad, 0xc2, 0xcb, 0x09, 0x15, 0xb3, 0x50, - 0x28, 0x2b, 0x3e, 0xe6, 0x71, 0x70, 0xaa, 0xc4, 0x78, 0x10, 0x08, 0xb5, 0x3f, 0x01, 0xb2, 0x3d, - 0x2a, 0x25, 0xe3, 0x3e, 0x7a, 0x00, 0x65, 0xe6, 0xbb, 0x4a, 0x10, 0x5f, 0x92, 0x81, 0x62, 0xdc, - 0x77, 0xac, 0xaa, 0x55, 0xcf, 0xe1, 0x12, 0xf3, 0xfb, 0x0b, 0x25, 0x6a, 0x41, 0x59, 0x9e, 0x13, - 0xe1, 0xb9, 0x32, 0x58, 0x27, 0x9d, 0x44, 0x35, 0x59, 0x2f, 0x6c, 0xdf, 0x6d, 0x84, 0xd1, 0x85, - 0xfe, 0x1a, 0x3d, 0x6d, 0x15, 0x0a, 0xb8, 0x24, 0x63, 0x92, 0x44, 0xff, 0x05, 0x20, 0x13, 0xc5, - 0x07, 0xfc, 0xf2, 0x92, 0x29, 0x27, 0x65, 0xf6, 0x89, 0x69, 0xd0, 0x3d, 0x28, 0x29, 0x22, 0x86, - 0x54, 0xb9, 0x52, 0x09, 0xe6, 0x0f, 0x9d, 0x74, 0xd5, 0xaa, 0xe7, 0x71, 0x31, 0x50, 0xf6, 0x8c, - 0x0e, 0x35, 0x21, 0xcb, 0xc7, 0xca, 0x84, 0x90, 0xa9, 0x5a, 0xf5, 0xc2, 0xf6, 0x66, 0x23, 0x38, - 0x78, 0xfb, 0x47, 0x3a, 0x98, 0x28, 0xda, 0x0d, 0x40, 0x1c, 0x59, 0xa1, 0x5d, 0xb0, 0x63, 0xc7, - 0x73, 0x2f, 0xb9, 0x47, 0x9d, 0x6c, 0xd5, 0xaa, 0x97, 0xb7, 0xff, 0x15, 0x05, 0x1f, 0x3b, 0xe9, - 0x01, 0xf7, 0x28, 0xae, 0xa8, 0x65, 0x05, 0x6a, 0x42, 0xee, 0x8a, 0x08, 0x9f, 0xf9, 0x43, 0xe9, - 0xe4, 0xcc, 0xc1, 0xd7, 0xc3, 0x5d, 0xbf, 0xd5, 0xbf, 0x27, 0x01, 0x86, 0xe7, 0x46, 0xe8, 0x2b, - 0x28, 0x8e, 0x05, 0x5d, 0x64, 0x2b, 0x7f, 0x83, 0x6c, 0x15, 0xc6, 0x82, 0xce, 0x73, 0xb5, 0x03, - 0xa5, 0x31, 0x97, 0x6a, 0xe1, 0x01, 0x6e, 0xe0, 0xa1, 0xa8, 0x97, 0xcc, 0x5d, 0xdc, 0x87, 0xf2, - 0x88, 0x48, 0xe5, 0x32, 0x5f, 0x52, 0xa1, 0x5c, 0xe6, 0x39, 0x85, 0xaa, 0x55, 0x4f, 0xe1, 0xa2, - 0xd6, 0x76, 0x8c, 0xb2, 0xe3, 0xa1, 0xff, 0x00, 0x9c, 0xf1, 0x89, 0xef, 0xb9, 0x82, 0x5f, 0x49, - 0xa7, 0x68, 0x2c, 0xf2, 0x46, 0x83, 0xf9, 0x95, 0x44, 0x2e, 0xdc, 0x9e, 0x48, 0x2a, 0x5c, 0x8f, - 0x9e, 0x31, 0x9f, 0x7a, 0xee, 0x94, 0x08, 0x46, 0x4e, 0x47, 0x54, 0x3a, 0x25, 0x13, 0xd0, 0xa3, - 0xd5, 0x80, 0x8e, 0x24, 0x15, 0x7b, 0x81, 0xf1, 0x71, 0x64, 0xdb, 0xf6, 0x95, 0x98, 0xe1, 0x8d, - 0xc9, 0x35, 0x10, 0xea, 0x82, 0x2d, 0x67, 0x52, 0xd1, 0xcb, 0x98, 0xeb, 0xb2, 0x71, 0x7d, 0xff, - 0x95, 0xb3, 0x1a, 0xbb, 0x15, 0xaf, 0x15, 0xb9, 0xac, 0x45, 0xff, 0x86, 0xbc, 0xe0, 0x57, 0xee, - 0x80, 0x4f, 0x7c, 0xe5, 0x54, 0xaa, 0x56, 0x3d, 0x89, 0x73, 0x82, 0x5f, 0xb5, 0xb4, 0xac, 0x4b, - 0x50, 0x92, 0x29, 0x1d, 0x73, 0xe6, 0x2b, 0xe9, 0xd8, 0xd5, 0x64, 0x3d, 0x8f, 0x63, 0x1a, 0x54, - 0x07, 0x9b, 0xf9, 0xae, 0xa0, 0x92, 0x8a, 0x29, 0xf5, 0xdc, 0x01, 0xf7, 0x7d, 0x67, 0xcd, 0x14, - 0x6a, 0x99, 0xf9, 0x38, 0x54, 0xb7, 0xb8, 0xef, 0x6b, 0x86, 0x47, 0x7c, 0x70, 0x11, 0x11, 0xe4, - 0x20, 0x53, 0x8c, 0xaf, 0x61, 0x58, 0xaf, 0x88, 0x3a, 0xaf, 0x01, 0xeb, 0x86, 0x1e, 0xe3, 0xe5, - 0x9c, 0x12, 0xa1, 0x4e, 0x29, 0x51, 0xce, 0xba, 0x89, 0x78, 0x4d, 0x43, 0xfb, 0x7c, 0x70, 0xf1, - 0x4d, 0x04, 0xa0, 0xaf, 0xc1, 0x16, 0x94, 0x78, 0x2e, 0x39, 0x53, 0x54, 0xb8, 0x57, 0x82, 0x29, - 0xea, 0x6c, 0x98, 0x4d, 0x6f, 0x47, 0x9b, 0x62, 0x4a, 0xbc, 0x1d, 0x0d, 0x9f, 0x68, 0x14, 0x97, - 0xc5, 0x92, 0x8c, 0xaa, 0x50, 0xd8, 0xdb, 0xdb, 0xef, 0x29, 0x41, 0x14, 0x1d, 0xce, 0x9c, 0x4d, - 0xd3, 0x5d, 0x71, 0xd5, 0xd6, 0x6f, 0x16, 0x14, 0xe3, 0x11, 0xa3, 0x07, 0x90, 0x09, 0xba, 0xcf, - 0x5c, 0x0b, 0x85, 0xed, 0x52, 0x58, 0xf6, 0x7d, 0xa3, 0xc4, 0x21, 0xa8, 0x6f, 0x91, 0x78, 0x8f, - 0x31, 0xcf, 0x49, 0x98, 0x63, 0x94, 0x62, 0xda, 0x8e, 0x87, 0x9e, 0x40, 0x51, 0x69, 0x92, 0x94, - 0x4b, 0x46, 0x8c, 0x48, 0x27, 0x19, 0x36, 0xf0, 0xfc, 0xb2, 0xea, 0x1b, 0x74, 0x47, 0x83, 0xb8, - 0xa0, 0x16, 0x02, 0xfa, 0x1f, 0x14, 0xe6, 0xa4, 0x30, 0xcf, 0xdc, 0x1d, 0x49, 0x0c, 0x91, 0xaa, - 0xe3, 0x6d, 0x7d, 0x0f, 0x77, 0xfe, 0xb6, 0xf2, 0x90, 0x0d, 0xc9, 0x0b, 0x3a, 0x33, 0x47, 0xc8, - 0x63, 0xfd, 0x89, 0x1e, 0x41, 0x7a, 0x4a, 0x46, 0x13, 0x6a, 0xe2, 0x5c, 0x74, 0xf3, 0x2e, 0xf3, - 0xe7, 0x6b, 0x71, 0x60, 0xf1, 0x79, 0xe2, 0x89, 0xb5, 0xb5, 0x0b, 0x1b, 0xd7, 0x15, 0xdf, 0x35, - 0x8e, 0x37, 0xe2, 0x8e, 0xf3, 0x31, 0x1f, 0xcf, 0x53, 0xb9, 0xa4, 0x9d, 0xaa, 0xfd, 0x6a, 0x41, - 0x79, 0x99, 0x26, 0xf4, 0x11, 0x6c, 0xae, 0x12, 0xeb, 0x0e, 0x15, 0xf3, 0x42, 0xb7, 0x68, 0x99, - 0xc5, 0x67, 0x8a, 0x79, 0xe8, 0x33, 0x70, 0x5e, 0x59, 0xa2, 0xd8, 0x25, 0xe5, 0x13, 0x65, 0x36, - 0xb6, 0xf0, 0xe6, 0xf2, 0xaa, 0x7e, 0x00, 0xea, 0xa2, 0x0b, 0x0b, 0x56, 0xdf, 0xf9, 0x83, 0x0b, - 0xb3, 0x51, 0x40, 0x44, 0x0e, 0xaf, 0x85, 0x50, 0x5f, 0x23, 0x7a, 0x1f, 0x59, 0xfb, 0x25, 0x01, - 0xe5, 0xf0, 0x62, 0xc5, 0xf4, 0xe5, 0x84, 0x4a, 0x85, 0x3e, 0x80, 0xfc, 0x80, 0x8c, 0x46, 0x54, - 0xb8, 0x61, 0x88, 0x85, 0xed, 0x4a, 0x23, 0x18, 0x2f, 0x2d, 0xa3, 0xef, 0xec, 0xe1, 0x5c, 0x60, - 0xd1, 0xf1, 0xd0, 0x23, 0xc8, 0x46, 0x1d, 0x92, 0x98, 0xdb, 0xc6, 0x3b, 0x04, 0x47, 0x38, 0x7a, - 0x08, 0x69, 0xc3, 0x42, 0x58, 0x16, 0x6b, 0x11, 0x27, 0xfa, 0x2e, 0x32, 0xd7, 0x2c, 0x0e, 0x70, - 0xf4, 0x09, 0x84, 0xb5, 0xe1, 0xaa, 0xd9, 0x98, 0x9a, 0x62, 0x28, 0x6f, 0x6f, 0xac, 0x56, 0x51, - 0x7f, 0x36, 0xa6, 0x18, 0xd4, 0xfc, 0x5b, 0x17, 0xe9, 0x05, 0x9d, 0xc9, 0x31, 0x19, 0x50, 0xd7, - 0x0c, 0x26, 0x33, 0x40, 0xf2, 0xb8, 0x14, 0x69, 0x4d, 0xe5, 0xc7, 0x07, 0x4c, 0xf6, 0x26, 0x03, - 0xe6, 0x79, 0x2a, 0x97, 0xb6, 0x33, 0xb5, 0x9f, 0x2c, 0xa8, 0xcc, 0x33, 0x25, 0xc7, 0xdc, 0x97, - 0x7a, 0xc7, 0x34, 0x15, 0x82, 0x8b, 0x95, 0x34, 0xe1, 0xc3, 0x56, 0x5b, 0xab, 0x71, 0x80, 0xbe, - 0x49, 0x8e, 0x1e, 0x43, 0x46, 0x50, 0x39, 0x19, 0xa9, 0x30, 0x49, 0x28, 0x3e, 0x86, 0xb0, 0x41, - 0x70, 0x68, 0x51, 0xfb, 0x23, 0x01, 0xeb, 0x61, 0x44, 0xbb, 0x44, 0x0d, 0xce, 0xdf, 0x3b, 0x81, - 0xff, 0x87, 0xac, 0x8e, 0x86, 0x51, 0x5d, 0x50, 0xc9, 0xeb, 0x29, 0x8c, 0x2c, 0xde, 0x81, 0x44, - 0x22, 0x97, 0xde, 0x2b, 0xe9, 0xe0, 0xbd, 0x42, 0x64, 0xfc, 0xbd, 0xf2, 0x9e, 0xb8, 0xae, 0xfd, - 0x6c, 0xc1, 0xc6, 0x72, 0x4e, 0xdf, 0x1b, 0xd5, 0x1f, 0x42, 0x36, 0x20, 0x32, 0xca, 0xe6, 0xed, - 0x30, 0xb6, 0x80, 0xe6, 0x13, 0xa6, 0xce, 0x03, 0xd7, 0x91, 0x99, 0x6e, 0xd6, 0x8d, 0x9e, 0x12, - 0x94, 0x5c, 0xbe, 0x53, 0xcb, 0xce, 0xfb, 0x30, 0xf1, 0x66, 0x7d, 0x98, 0x7c, 0xeb, 0x3e, 0x4c, - 0xbd, 0x86, 0x9b, 0xf4, 0x8d, 0x1e, 0x7a, 0xb1, 0xdc, 0x66, 0xfe, 0x39, 0xb7, 0xb5, 0x16, 0x6c, - 0xae, 0x24, 0x2a, 0xa4, 0x71, 0xd1, 0x5f, 0xd6, 0x6b, 0xfb, 0xeb, 0x07, 0xb8, 0x83, 0xa9, 0xe4, - 0xa3, 0x29, 0x8d, 0x55, 0xde, 0xdb, 0xa5, 0x1c, 0x41, 0xca, 0x53, 0xe1, 0xd4, 0xcc, 0x63, 0xf3, - 0x5d, 0xbb, 0x0b, 0x5b, 0xd7, 0xb9, 0x0f, 0x02, 0xad, 0xfd, 0x6e, 0x41, 0xf9, 0x38, 0x38, 0xc3, - 0xdb, 0x6d, 0xb9, 0x42, 0x5e, 0xe2, 0x86, 0xe4, 0x3d, 0x84, 0xf4, 0xd4, 0x0c, 0xa7, 0xe8, 0x92, - 0x8e, 0xfd, 0x0f, 0x39, 0xd6, 0x33, 0x03, 0x07, 0xb8, 0xce, 0xe4, 0x19, 0x1b, 0x29, 0x2a, 0x0c, - 0xbb, 0x3a, 0x93, 0x31, 0xcb, 0xa7, 0x06, 0xc1, 0xa1, 0x45, 0xed, 0x4b, 0xa8, 0xcc, 0xcf, 0xb2, - 0x20, 0x82, 0x4e, 0xa9, 0x7e, 0xa4, 0x59, 0xa6, 0xf8, 0x97, 0x96, 0x1f, 0xb7, 0x35, 0x84, 0x43, - 0x8b, 0xc7, 0x7b, 0x50, 0x59, 0x79, 0xc1, 0xa3, 0x0a, 0x14, 0x8e, 0x5e, 0xf4, 0x0e, 0xdb, 0xad, - 0xce, 0xd3, 0x4e, 0x7b, 0xcf, 0xbe, 0x85, 0x00, 0x32, 0xbd, 0xce, 0x8b, 0x67, 0xfb, 0x6d, 0xdb, - 0x42, 0x79, 0x48, 0x1f, 0x1c, 0xed, 0xf7, 0x3b, 0x76, 0x42, 0x7f, 0xf6, 0x4f, 0xba, 0x87, 0x2d, - 0x3b, 0xf9, 0xf8, 0x0b, 0x28, 0xb4, 0xcc, 0xff, 0x90, 0xae, 0xf0, 0xa8, 0xd0, 0x0b, 0x5e, 0x74, - 0xf1, 0xc1, 0xce, 0xbe, 0x7d, 0x0b, 0x65, 0x21, 0x79, 0x88, 0xf5, 0xca, 0x1c, 0xa4, 0x0e, 0xbb, - 0xbd, 0xbe, 0x9d, 0x40, 0x65, 0x80, 0x9d, 0xa3, 0x7e, 0xb7, 0xd5, 0x3d, 0x38, 0xe8, 0xf4, 0xed, - 0xe4, 0xee, 0xa7, 0x50, 0x61, 0xbc, 0x31, 0x65, 0x8a, 0x4a, 0x19, 0xfc, 0xcd, 0xfa, 0xee, 0x5e, - 0x28, 0x31, 0xde, 0x0c, 0xbe, 0x9a, 0x43, 0xde, 0x9c, 0xaa, 0xa6, 0x41, 0x9b, 0x41, 0x69, 0x9e, - 0x66, 0x8c, 0xf4, 0xf1, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x70, 0xa7, 0x77, 0x23, 0xe6, 0x0d, - 0x00, 0x00, + // 1357 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x6d, 0x6f, 0x1b, 0xc5, + 0x13, 0xef, 0xf9, 0xd9, 0xe3, 0xa7, 0xcb, 0xe6, 0xe1, 0x7f, 0xcd, 0xbf, 0x80, 0xe5, 0xb6, 0xaa, + 0x5b, 0x50, 0x02, 0x41, 0x40, 0x85, 0x40, 0x90, 0xd8, 0x6e, 0x71, 0x95, 0xd4, 0x61, 0xed, 0x24, + 0x12, 0x02, 0x9d, 0x2e, 0xbe, 0x8d, 0xb3, 0x8a, 0x73, 0xeb, 0xee, 0xae, 0x1d, 0xfc, 0x29, 0x78, + 0x0f, 0x1f, 0x80, 0x37, 0xbc, 0xe7, 0x3b, 0xf0, 0x8e, 0x6f, 0x84, 0x76, 0xf7, 0xce, 0x3e, 0xbb, + 0x81, 0xa6, 0xad, 0xfa, 0xc6, 0xba, 0x9d, 0xdf, 0xec, 0xec, 0xcc, 0xfc, 0x66, 0x76, 0xd6, 0x50, + 0x9c, 0xc8, 0x81, 0x27, 0xc9, 0xd6, 0x88, 0x33, 0xc9, 0x50, 0xc6, 0xac, 0x36, 0xed, 0x53, 0x1a, + 0x0c, 0xd9, 0xc0, 0xf7, 0xa4, 0x67, 0x90, 0xcd, 0xc2, 0x8b, 0x31, 0xe1, 0xd3, 0x70, 0x51, 0x96, + 0x6c, 0xc4, 0xe2, 0xe0, 0x44, 0xf2, 0x51, 0xdf, 0x2c, 0x6a, 0xbf, 0x15, 0x20, 0xdb, 0x25, 0x42, + 0x50, 0x16, 0xa0, 0xfb, 0x50, 0xa6, 0x81, 0x2b, 0xb9, 0x17, 0x08, 0xaf, 0x2f, 0x29, 0x0b, 0x1c, + 0xab, 0x6a, 0xd5, 0x73, 0xb8, 0x44, 0x83, 0xde, 0x5c, 0x88, 0x1a, 0x50, 0x16, 0xe7, 0x1e, 0xf7, + 0x5d, 0x61, 0xf6, 0x09, 0x27, 0x51, 0x4d, 0xd6, 0x0b, 0x3b, 0x77, 0xb6, 0x42, 0xef, 0x42, 0x7b, + 0x5b, 0x5d, 0xa5, 0x15, 0x2e, 0x70, 0x49, 0xc4, 0x56, 0x02, 0xbd, 0x0f, 0xe0, 0x8d, 0x25, 0xeb, + 0xb3, 0xcb, 0x4b, 0x2a, 0x9d, 0x94, 0x3e, 0x27, 0x26, 0x41, 0x77, 0xa1, 0x24, 0x3d, 0x3e, 0x20, + 0xd2, 0x15, 0x92, 0xd3, 0x60, 0xe0, 0xa4, 0xab, 0x56, 0x3d, 0x8f, 0x8b, 0x46, 0xd8, 0xd5, 0x32, + 0xb4, 0x0d, 0x59, 0x36, 0x92, 0xda, 0x85, 0x4c, 0xd5, 0xaa, 0x17, 0x76, 0xd6, 0xb7, 0x4c, 0xe0, + 0xad, 0x9f, 0x49, 0x7f, 0x2c, 0x49, 0xc7, 0x80, 0x38, 0xd2, 0x42, 0x7b, 0x60, 0xc7, 0xc2, 0x73, + 0x2f, 0x99, 0x4f, 0x9c, 0x6c, 0xd5, 0xaa, 0x97, 0x77, 0xfe, 0x17, 0x39, 0x1f, 0x8b, 0xf4, 0x80, + 0xf9, 0x04, 0x57, 0xe4, 0xa2, 0x00, 0x6d, 0x43, 0xee, 0xca, 0xe3, 0x01, 0x0d, 0x06, 0xc2, 0xc9, + 0xe9, 0xc0, 0x57, 0xc3, 0x53, 0xbf, 0x57, 0xbf, 0x27, 0x06, 0xc3, 0x33, 0x25, 0xf4, 0x0d, 0x14, + 0x47, 0x9c, 0xcc, 0xb3, 0x95, 0xbf, 0x41, 0xb6, 0x0a, 0x23, 0x4e, 0x66, 0xb9, 0xda, 0x85, 0xd2, + 0x88, 0x09, 0x39, 0xb7, 0x00, 0x37, 0xb0, 0x50, 0x54, 0x5b, 0x66, 0x26, 0xee, 0x41, 0x79, 0xe8, + 0x09, 0xe9, 0xd2, 0x40, 0x10, 0x2e, 0x5d, 0xea, 0x3b, 0x85, 0xaa, 0x55, 0x4f, 0xe1, 0xa2, 0x92, + 0xb6, 0xb5, 0xb0, 0xed, 0xa3, 0xf7, 0x00, 0xce, 0xd8, 0x38, 0xf0, 0x5d, 0xce, 0xae, 0x84, 0x53, + 0xd4, 0x1a, 0x79, 0x2d, 0xc1, 0xec, 0x4a, 0x20, 0x17, 0x36, 0xc6, 0x82, 0x70, 0xd7, 0x27, 0x67, + 0x34, 0x20, 0xbe, 0x3b, 0xf1, 0x38, 0xf5, 0x4e, 0x87, 0x44, 0x38, 0x25, 0xed, 0xd0, 0xc3, 0x65, + 0x87, 0x8e, 0x04, 0xe1, 0x4d, 0xa3, 0x7c, 0x1c, 0xe9, 0xb6, 0x02, 0xc9, 0xa7, 0x78, 0x6d, 0x7c, + 0x0d, 0x84, 0x3a, 0x60, 0x8b, 0xa9, 0x90, 0xe4, 0x32, 0x66, 0xba, 0xac, 0x4d, 0xdf, 0x7b, 0x29, + 0x56, 0xad, 0xb7, 0x64, 0xb5, 0x22, 0x16, 0xa5, 0xe8, 0xff, 0x90, 0xe7, 0xec, 0xca, 0xed, 0xb3, + 0x71, 0x20, 0x9d, 0x4a, 0xd5, 0xaa, 0x27, 0x71, 0x8e, 0xb3, 0xab, 0x86, 0x5a, 0xab, 0x12, 0x14, + 0xde, 0x84, 0x8c, 0x18, 0x0d, 0xa4, 0x70, 0xec, 0x6a, 0xb2, 0x9e, 0xc7, 0x31, 0x09, 0xaa, 0x83, + 0x4d, 0x03, 0x97, 0x13, 0x41, 0xf8, 0x84, 0xf8, 0x6e, 0x9f, 0x05, 0x81, 0xb3, 0xa2, 0x0b, 0xb5, + 0x4c, 0x03, 0x1c, 0x8a, 0x1b, 0x2c, 0x08, 0x14, 0xc3, 0x43, 0xd6, 0xbf, 0x88, 0x08, 0x72, 0x90, + 0x2e, 0xc6, 0x57, 0x30, 0xac, 0x76, 0x44, 0x9d, 0xb7, 0x05, 0xab, 0x9a, 0x1e, 0x6d, 0xe5, 0x9c, + 0x78, 0x5c, 0x9e, 0x12, 0x4f, 0x3a, 0xab, 0xda, 0xe3, 0x15, 0x05, 0xed, 0xb3, 0xfe, 0xc5, 0x77, + 0x11, 0x80, 0xbe, 0x05, 0x9b, 0x13, 0xcf, 0x77, 0xbd, 0x33, 0x49, 0xb8, 0x7b, 0xc5, 0xa9, 0x24, + 0xce, 0x9a, 0x3e, 0x74, 0x23, 0x3a, 0x14, 0x13, 0xcf, 0xdf, 0x55, 0xf0, 0x89, 0x42, 0x71, 0x99, + 0x2f, 0xac, 0x51, 0x15, 0x0a, 0xcd, 0xe6, 0x7e, 0x57, 0x72, 0x4f, 0x92, 0xc1, 0xd4, 0x59, 0xd7, + 0xdd, 0x15, 0x17, 0x29, 0x8d, 0xd0, 0xbd, 0xa3, 0xa3, 0x76, 0xd3, 0xd9, 0x30, 0x1a, 0x31, 0xd1, + 0xe6, 0x9f, 0x16, 0x14, 0xe3, 0x31, 0xa1, 0xfb, 0x90, 0x31, 0xfd, 0xa9, 0x2f, 0x8e, 0xc2, 0x4e, + 0x29, 0x6c, 0x8c, 0x9e, 0x16, 0xe2, 0x10, 0x54, 0xf7, 0x4c, 0xbc, 0x0b, 0xa9, 0xef, 0x24, 0x74, + 0xa0, 0xa5, 0x98, 0xb4, 0xed, 0xa3, 0xc7, 0x50, 0x94, 0x8a, 0x46, 0xe9, 0x7a, 0x43, 0xea, 0x09, + 0x27, 0x19, 0xb6, 0xf8, 0xec, 0x3a, 0xeb, 0x69, 0x74, 0x57, 0x81, 0xb8, 0x20, 0xe7, 0x0b, 0xf4, + 0x01, 0x14, 0x66, 0xb4, 0x51, 0x5f, 0xdf, 0x2e, 0x49, 0x0c, 0x91, 0xa8, 0xed, 0x6f, 0xfe, 0x08, + 0xb7, 0xff, 0xb5, 0x36, 0x91, 0x0d, 0xc9, 0x0b, 0x32, 0xd5, 0x21, 0xe4, 0xb1, 0xfa, 0x44, 0x0f, + 0x21, 0x3d, 0xf1, 0x86, 0x63, 0xa2, 0xfd, 0x9c, 0xf7, 0xfb, 0x1e, 0x0d, 0x66, 0x7b, 0xb1, 0xd1, + 0xf8, 0x32, 0xf1, 0xd8, 0xda, 0xdc, 0x83, 0xb5, 0xeb, 0xca, 0xf3, 0x1a, 0xc3, 0x6b, 0x71, 0xc3, + 0xf9, 0x98, 0x8d, 0x67, 0xa9, 0x5c, 0xd2, 0x4e, 0xd5, 0xfe, 0xb0, 0xa0, 0xbc, 0x48, 0x24, 0xfa, + 0x04, 0xd6, 0x97, 0xa9, 0x77, 0x07, 0x92, 0xfa, 0xa1, 0x59, 0xb4, 0xc8, 0xf3, 0x53, 0x49, 0x7d, + 0xf4, 0x05, 0x38, 0x2f, 0x6d, 0x91, 0xf4, 0x92, 0xb0, 0xb1, 0xd4, 0x07, 0x5b, 0x78, 0x7d, 0x71, + 0x57, 0xcf, 0x80, 0xaa, 0x2c, 0xc3, 0x92, 0x56, 0x53, 0xa1, 0x7f, 0xa1, 0x0f, 0x32, 0x44, 0xe4, + 0xf0, 0x4a, 0x08, 0xf5, 0x14, 0xa2, 0xce, 0x11, 0xb5, 0xdf, 0x13, 0x50, 0x0e, 0xaf, 0x5e, 0x4c, + 0x5e, 0x8c, 0x89, 0x90, 0xe8, 0x23, 0xc8, 0xf7, 0xbd, 0xe1, 0x90, 0x70, 0x37, 0x74, 0xb1, 0xb0, + 0x53, 0xd9, 0x32, 0x03, 0xa8, 0xa1, 0xe5, 0xed, 0x26, 0xce, 0x19, 0x8d, 0xb6, 0x8f, 0x1e, 0x42, + 0x36, 0xea, 0xa1, 0xc4, 0x4c, 0x37, 0xde, 0x43, 0x38, 0xc2, 0xd1, 0x03, 0x48, 0x6b, 0x16, 0xc2, + 0xb2, 0x58, 0x89, 0x38, 0x51, 0xb7, 0x95, 0xbe, 0x88, 0xb1, 0xc1, 0xd1, 0x67, 0x10, 0xd6, 0x86, + 0x2b, 0xa7, 0x23, 0xa2, 0x8b, 0xa1, 0xbc, 0xb3, 0xb6, 0x5c, 0x45, 0xbd, 0xe9, 0x88, 0x60, 0x90, + 0xb3, 0x6f, 0x55, 0xa4, 0x17, 0x64, 0x2a, 0x46, 0x5e, 0x9f, 0xb8, 0x7a, 0x74, 0xe9, 0x11, 0x93, + 0xc7, 0xa5, 0x48, 0xaa, 0x2b, 0x3f, 0x3e, 0x82, 0xb2, 0x37, 0x19, 0x41, 0xcf, 0x52, 0xb9, 0xb4, + 0x9d, 0xa9, 0xfd, 0x62, 0x41, 0x65, 0x96, 0x29, 0x31, 0x62, 0x81, 0x50, 0x27, 0xa6, 0x09, 0xe7, + 0x8c, 0x2f, 0xa5, 0x09, 0x1f, 0x36, 0x5a, 0x4a, 0x8c, 0x0d, 0xfa, 0x3a, 0x39, 0x7a, 0x04, 0x19, + 0x4e, 0xc4, 0x78, 0x28, 0xc3, 0x24, 0xa1, 0xf8, 0xa0, 0xc2, 0x1a, 0xc1, 0xa1, 0x46, 0xed, 0xef, + 0x04, 0xac, 0x86, 0x1e, 0xed, 0x79, 0xb2, 0x7f, 0xfe, 0xce, 0x09, 0xfc, 0x10, 0xb2, 0xca, 0x1b, + 0x4a, 0x54, 0x41, 0x25, 0xaf, 0xa7, 0x30, 0xd2, 0x78, 0x0b, 0x12, 0x3d, 0xb1, 0xf0, 0xa2, 0x49, + 0x9b, 0x17, 0x8d, 0x27, 0xe2, 0x2f, 0x9a, 0x77, 0xc4, 0x75, 0xed, 0x57, 0x0b, 0xd6, 0x16, 0x73, + 0xfa, 0xce, 0xa8, 0xfe, 0x18, 0xb2, 0x86, 0xc8, 0x28, 0x9b, 0x1b, 0xa1, 0x6f, 0x86, 0xe6, 0x13, + 0x2a, 0xcf, 0x8d, 0xe9, 0x48, 0x4d, 0x35, 0xeb, 0x5a, 0x57, 0x72, 0xe2, 0x5d, 0xbe, 0x55, 0xcb, + 0xce, 0xfa, 0x30, 0xf1, 0x7a, 0x7d, 0x98, 0x7c, 0xe3, 0x3e, 0x4c, 0xbd, 0x82, 0x9b, 0xf4, 0x8d, + 0x9e, 0x82, 0xb1, 0xdc, 0x66, 0xfe, 0x3b, 0xb7, 0xb5, 0x06, 0xac, 0x2f, 0x25, 0x2a, 0xa4, 0x71, + 0xde, 0x5f, 0xd6, 0x2b, 0xfb, 0xeb, 0x27, 0xb8, 0x8d, 0x89, 0x60, 0xc3, 0x09, 0x89, 0x55, 0xde, + 0x9b, 0xa5, 0x1c, 0x41, 0xca, 0x97, 0xe1, 0xd4, 0xcc, 0x63, 0xfd, 0x5d, 0xbb, 0x03, 0x9b, 0xd7, + 0x99, 0x37, 0x8e, 0xd6, 0xfe, 0xb2, 0xa0, 0x7c, 0x6c, 0x62, 0x78, 0xb3, 0x23, 0x97, 0xc8, 0x4b, + 0xdc, 0x90, 0xbc, 0x07, 0x90, 0x9e, 0xe8, 0xe1, 0x14, 0x5d, 0xd2, 0xb1, 0x7f, 0x2a, 0xc7, 0x6a, + 0x66, 0x60, 0x83, 0xab, 0x4c, 0x9e, 0xd1, 0xa1, 0x24, 0x5c, 0xb3, 0xab, 0x32, 0x19, 0xd3, 0x7c, + 0xa2, 0x11, 0x1c, 0x6a, 0xd4, 0xbe, 0x86, 0xca, 0x2c, 0x96, 0x39, 0x11, 0x64, 0x42, 0xd4, 0x33, + 0xce, 0xd2, 0xc5, 0xbf, 0xb0, 0xfd, 0xb8, 0xa5, 0x20, 0x1c, 0x6a, 0x3c, 0x6a, 0x42, 0x65, 0xe9, + 0x8d, 0x8f, 0x2a, 0x50, 0x38, 0x7a, 0xde, 0x3d, 0x6c, 0x35, 0xda, 0x4f, 0xda, 0xad, 0xa6, 0x7d, + 0x0b, 0x01, 0x64, 0xba, 0xed, 0xe7, 0x4f, 0xf7, 0x5b, 0xb6, 0x85, 0xf2, 0x90, 0x3e, 0x38, 0xda, + 0xef, 0xb5, 0xed, 0x84, 0xfa, 0xec, 0x9d, 0x74, 0x0e, 0x1b, 0x76, 0xf2, 0xd1, 0x57, 0x50, 0x68, + 0xe8, 0x7f, 0x2a, 0x1d, 0xee, 0x13, 0xae, 0x36, 0x3c, 0xef, 0xe0, 0x83, 0xdd, 0x7d, 0xfb, 0x16, + 0xca, 0x42, 0xf2, 0x10, 0xab, 0x9d, 0x39, 0x48, 0x1d, 0x76, 0xba, 0x3d, 0x3b, 0x81, 0xca, 0x00, + 0xbb, 0x47, 0xbd, 0x4e, 0xa3, 0x73, 0x70, 0xd0, 0xee, 0xd9, 0xc9, 0xbd, 0xcf, 0xa1, 0x42, 0xd9, + 0xd6, 0x84, 0x4a, 0x22, 0x84, 0xf9, 0x23, 0xf6, 0xc3, 0xdd, 0x70, 0x45, 0xd9, 0xb6, 0xf9, 0xda, + 0x1e, 0xb0, 0xed, 0x89, 0xdc, 0xd6, 0xe8, 0xb6, 0x29, 0xcd, 0xd3, 0x8c, 0x5e, 0x7d, 0xfa, 0x4f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x90, 0xad, 0x39, 0x45, 0x08, 0x0e, 0x00, 0x00, } diff --git a/go/vt/sqlparser/ast_rewriting.go b/go/vt/sqlparser/ast_rewriting.go index 23ad0758c79..7791f1cfd8f 100644 --- a/go/vt/sqlparser/ast_rewriting.go +++ b/go/vt/sqlparser/ast_rewriting.go @@ -234,6 +234,7 @@ func (er *expressionRewriter) sysVarRewrite(cursor *Cursor, node *ColName) { sysvars.TransactionMode.Name, sysvars.Workload.Name, sysvars.DDLStrategy.Name, + sysvars.SessionUUID.Name, sysvars.ReadAfterWriteGTID.Name, sysvars.ReadAfterWriteTimeOut.Name, sysvars.SessionTrackGTIDs.Name: diff --git a/go/vt/sqlparser/ast_rewriting_test.go b/go/vt/sqlparser/ast_rewriting_test.go index 486e3fdb967..802f632f627 100644 --- a/go/vt/sqlparser/ast_rewriting_test.go +++ b/go/vt/sqlparser/ast_rewriting_test.go @@ -29,7 +29,7 @@ import ( type myTestCase struct { in, expected string liid, db, foundRows, rowCount, rawGTID, rawTimeout, sessTrackGTID bool - ddlStrategy bool + ddlStrategy, sessionUUID bool udv int autocommit, clientFoundRows, skipQueryPlanCache bool sqlSelectLimit, transactionMode, workload bool @@ -194,6 +194,7 @@ func TestRewrites(in *testing.T) { assert.Equal(tc.transactionMode, result.NeedsSysVar(sysvars.TransactionMode.Name), "should need :__vttransactionMode") assert.Equal(tc.workload, result.NeedsSysVar(sysvars.Workload.Name), "should need :__vtworkload") assert.Equal(tc.ddlStrategy, result.NeedsSysVar(sysvars.DDLStrategy.Name), "should need ddlStrategy") + assert.Equal(tc.sessionUUID, result.NeedsSysVar(sysvars.SessionUUID.Name), "should need sessionUUID") assert.Equal(tc.rawGTID, result.NeedsSysVar(sysvars.ReadAfterWriteGTID.Name), "should need rawGTID") assert.Equal(tc.rawTimeout, result.NeedsSysVar(sysvars.ReadAfterWriteTimeOut.Name), "should need rawTimeout") assert.Equal(tc.sessTrackGTID, result.NeedsSysVar(sysvars.SessionTrackGTIDs.Name), "should need sessTrackGTID") diff --git a/go/vt/sysvars/sysvars.go b/go/vt/sysvars/sysvars.go index 2fa219fa2f6..b0e60b61d6d 100644 --- a/go/vt/sysvars/sysvars.go +++ b/go/vt/sysvars/sysvars.go @@ -53,6 +53,7 @@ var ( Workload = SystemVariable{Name: "workload", IdentifierAsString: true} Charset = SystemVariable{Name: "charset", Default: utf8, IdentifierAsString: true} Names = SystemVariable{Name: "names", Default: utf8, IdentifierAsString: true} + SessionUUID = SystemVariable{Name: "session_uuid", IdentifierAsString: true} // Online DDL DDLStrategy = SystemVariable{Name: "ddl_strategy", IdentifierAsString: true} @@ -73,6 +74,7 @@ var ( Workload, Charset, Names, + SessionUUID, ReadAfterWriteGTID, ReadAfterWriteTimeOut, SessionTrackGTIDs, diff --git a/go/vt/vtgate/engine/fake_vcursor_test.go b/go/vt/vtgate/engine/fake_vcursor_test.go index 96b10cab6fa..c9f40b4d383 100644 --- a/go/vt/vtgate/engine/fake_vcursor_test.go +++ b/go/vt/vtgate/engine/fake_vcursor_test.go @@ -65,6 +65,10 @@ func (t noopVCursor) GetDDLStrategy() string { panic("implement me") } +func (t noopVCursor) GetSessionUUID() string { + panic("implement me") +} + func (t noopVCursor) SetReadAfterWriteGTID(s string) { panic("implement me") } diff --git a/go/vt/vtgate/engine/online_ddl.go b/go/vt/vtgate/engine/online_ddl.go index 65d00d2c1bd..39ee6bbfda0 100644 --- a/go/vt/vtgate/engine/online_ddl.go +++ b/go/vt/vtgate/engine/online_ddl.go @@ -17,6 +17,8 @@ limitations under the License. package engine import ( + "fmt" + "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/proto/query" querypb "vitess.io/vitess/go/vt/proto/query" @@ -75,7 +77,7 @@ func (v *OnlineDDL) Execute(vcursor VCursor, bindVars map[string]*query.BindVari } rows := [][]sqltypes.Value{} for _, normalized := range normalizedQueries { - onlineDDL, err := schema.NewOnlineDDL(v.GetKeyspaceName(), normalized.TableName.Name.String(), normalized.SQL, v.Strategy, v.Options, "vtgate") + onlineDDL, err := schema.NewOnlineDDL(v.GetKeyspaceName(), normalized.TableName.Name.String(), normalized.SQL, v.Strategy, v.Options, fmt.Sprintf("vtgate:%s", vcursor.Session().GetSessionUUID())) if err != nil { return result, err } diff --git a/go/vt/vtgate/engine/primitive.go b/go/vt/vtgate/engine/primitive.go index 7d24fc48bd6..5bc98d7481c 100644 --- a/go/vt/vtgate/engine/primitive.go +++ b/go/vt/vtgate/engine/primitive.go @@ -131,6 +131,8 @@ type ( SetDDLStrategy(string) GetDDLStrategy() string + GetSessionUUID() string + // SetReadAfterWriteGTID sets the GTID that the user expects a replica to have caught up with before answering a query SetReadAfterWriteGTID(string) SetReadAfterWriteTimeout(float64) diff --git a/go/vt/vtgate/executor.go b/go/vt/vtgate/executor.go index ffa0ed13318..dec82d79380 100644 --- a/go/vt/vtgate/executor.go +++ b/go/vt/vtgate/executor.go @@ -294,6 +294,8 @@ func (e *Executor) addNeededBindVars(bindVarNeeds *sqlparser.BindVarNeeds, bindV bindVars[key] = sqltypes.StringBindVariable(v) case sysvars.DDLStrategy.Name: bindVars[key] = sqltypes.StringBindVariable(session.DDLStrategy) + case sysvars.SessionUUID.Name: + bindVars[key] = sqltypes.StringBindVariable(session.SessionUUID) case sysvars.ReadAfterWriteGTID.Name: var v string ifReadAfterWriteExist(session, func(raw *vtgatepb.ReadAfterWrite) { diff --git a/go/vt/vtgate/plugin_mysql_server.go b/go/vt/vtgate/plugin_mysql_server.go index eee8b321dc1..df850fe2f0a 100644 --- a/go/vt/vtgate/plugin_mysql_server.go +++ b/go/vt/vtgate/plugin_mysql_server.go @@ -34,10 +34,9 @@ import ( "context" - "vitess.io/vitess/go/trace" - "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/trace" "vitess.io/vitess/go/vt/callerid" "vitess.io/vitess/go/vt/callinfo" "vitess.io/vitess/go/vt/log" @@ -46,6 +45,8 @@ import ( querypb "vitess.io/vitess/go/vt/proto/query" vtgatepb "vitess.io/vitess/go/vt/proto/vtgate" + + "github.com/google/uuid" ) var ( @@ -335,6 +336,7 @@ func (vh *vtgateHandler) WarningCount(c *mysql.Conn) uint16 { func (vh *vtgateHandler) session(c *mysql.Conn) *vtgatepb.Session { session, _ := c.ClientData.(*vtgatepb.Session) if session == nil { + u, _ := uuid.NewUUID() session = &vtgatepb.Session{ Options: &querypb.ExecuteOptions{ IncludedFields: querypb.ExecuteOptions_ALL, @@ -342,6 +344,7 @@ func (vh *vtgateHandler) session(c *mysql.Conn) *vtgatepb.Session { }, Autocommit: true, DDLStrategy: *defaultDDLStrategy, + SessionUUID: u.String(), } if c.Capabilities&mysql.CapabilityClientFoundRows != 0 { session.Options.ClientFoundRows = true diff --git a/go/vt/vtgate/safe_session.go b/go/vt/vtgate/safe_session.go index da1524a6d7b..ead6619b4af 100644 --- a/go/vt/vtgate/safe_session.go +++ b/go/vt/vtgate/safe_session.go @@ -471,6 +471,13 @@ func (session *SafeSession) GetDDLStrategy() string { return session.DDLStrategy } +// GetSessionUUID returns the SessionUUID value. +func (session *SafeSession) GetSessionUUID() string { + session.mu.Lock() + defer session.mu.Unlock() + return session.SessionUUID +} + // SetReadAfterWriteGTID set the ReadAfterWriteGtid setting. func (session *SafeSession) SetReadAfterWriteGTID(vtgtid string) { session.mu.Lock() diff --git a/go/vt/vtgate/vcursor_impl.go b/go/vt/vtgate/vcursor_impl.go index c8597dc73fd..0fcaac3ca85 100644 --- a/go/vt/vtgate/vcursor_impl.go +++ b/go/vt/vtgate/vcursor_impl.go @@ -619,6 +619,11 @@ func (vc *vcursorImpl) GetDDLStrategy() string { return vc.safeSession.GetDDLStrategy() } +// GetSessionUUID implements the SessionActions interface +func (vc *vcursorImpl) GetSessionUUID() string { + return vc.safeSession.GetSessionUUID() +} + // SetReadAfterWriteGTID implements the SessionActions interface func (vc *vcursorImpl) SetReadAfterWriteGTID(vtgtid string) { vc.safeSession.SetReadAfterWriteGTID(vtgtid) diff --git a/proto/vtgate.proto b/proto/vtgate.proto index 2e3318b51cf..43723c5bcd5 100644 --- a/proto/vtgate.proto +++ b/proto/vtgate.proto @@ -140,6 +140,9 @@ message Session { // DDL strategy string DDLStrategy = 21; + + // Session UUID + string SessionUUID = 22; } // ReadAfterWrite contains information regarding gtid set and timeout