diff --git a/go/cmd/vtshovel/vtshovel.go b/go/cmd/vtshovel/vtshovel.go deleted file mode 100644 index 5a70f239a10..00000000000 --- a/go/cmd/vtshovel/vtshovel.go +++ /dev/null @@ -1,196 +0,0 @@ -/* -Copyright 2017 Google Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package main - -import ( - "context" - "encoding/json" - "flag" - "io/ioutil" - "math/rand" - "time" - - "vitess.io/vitess/go/exit" - "vitess.io/vitess/go/mysql" - "vitess.io/vitess/go/vt/binlog/binlogplayer" - "vitess.io/vitess/go/vt/dbconfigs" - "vitess.io/vitess/go/vt/log" - "vitess.io/vitess/go/vt/mysqlctl" - "vitess.io/vitess/go/vt/servenv" - "vitess.io/vitess/go/vt/vterrors" - "vitess.io/vitess/go/vt/vttablet/tabletmanager/vreplication" - - binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata" -) - -var ( - vtShovelConfigFile = flag.String("vtshovel-config-file", "/etc/slack.d/vtshovel.json", "VTShovel Config file") - dryRun = flag.Bool("dry-run", false, "When present, only log DML that are going to be performed in target database") -) - -func init() { - rand.Seed(time.Now().UnixNano()) - servenv.RegisterDefaultFlags() -} - -// VtShovelConfig fields to configure vtshovel client -type VtShovelConfig struct { - // Source MySQL client information - // MySQLSourceHost ... - MySQLSourceHost string `json:"mysql_source_host"` - // MySQLSourcePort ... - MySQLSourcePort int `json:"mysql_source_port"` - // MySQLSourceUser ... - MySQLSourceUser string `json:"mysql_source_user"` - // MySQLSourcePassword ... - MySQLSourcePassword string `json:"mysql_source_password"` - // MySQLSourceBinlogStartPos ... - MySQLSourceBinlogStartPos string `json:"mysql_source_binlog_start_pos"` - // MySQLSourceDatabase ... - MySQLSourceDBName string `json:"mysql_source_dbname"` -} - -func main() { - defer exit.Recover() - - dbconfigs.RegisterFlags(dbconfigs.Dba) - mysqlctl.RegisterFlags() - - servenv.ParseFlags("vtshovel") - servenv.Init() - - servenv.OnRun(func() { - //vreplication.MySQLAddStatusPart() - // Flags are parsed now. Parse the template using the actual flag value and overwrite the current template. - //addStatusParts(vtg) - }) - - vtShovelConfig, err := loadConfigFromFile(*vtShovelConfigFile) - if err != nil { - log.Fatal(err) - } - - sourceConnParams := mysql.ConnParams{ - Host: vtShovelConfig.MySQLSourceHost, - Port: vtShovelConfig.MySQLSourcePort, - Pass: vtShovelConfig.MySQLSourcePassword, - Uname: vtShovelConfig.MySQLSourceUser, - DbName: vtShovelConfig.MySQLSourceDBName, - } - - source := binlogdatapb.BinlogSource{ - Filter: &binlogdatapb.Filter{ - Rules: []*binlogdatapb.Rule{ - &binlogdatapb.Rule{ - Match: "/.*", - }, - }, - }, - } - - var mycnf *mysqlctl.Mycnf - var socketFile string - // If no connection parameters were specified, load the mycnf file - // and use the socket from it. If connection parameters were specified, - // we assume that the mysql is not local, and we skip loading mycnf. - // This also means that backup and restore will not be allowed. - if !dbconfigs.HasConnectionParams() { - var err error - if mycnf, err = mysqlctl.NewMycnfFromFlags(123213123); err != nil { - log.Exitf("mycnf read failed: %v", err) - } - socketFile = mycnf.SocketFile - } else { - log.Info("connection parameters were specified. Not loading my.cnf.") - } - - // If connection parameters were specified, socketFile will be empty. - // Otherwise, the socketFile (read from mycnf) will be used to initialize - // dbconfigs. - dbcfgs, err := dbconfigs.Init(socketFile) - if err != nil { - log.Warning(err) - } - - mysqld := mysqlctl.NewMysqld(dbcfgs) - servenv.OnClose(mysqld.Close) - - destConnParams := dbcfgs.Dba() - // Hack to make sure dbname is set correctly given that this is not a tablet - // and SetDBName is not called. - destConnParams.DbName = destConnParams.DeprecatedDBName - - log.Infof("This are the destConnParams:%v", destConnParams) - destDbClient := binlogplayer.NewDBClient(destConnParams) - - if err := destDbClient.Connect(); err != nil { - log.Fatal(vterrors.Wrap(err, "can't connect to database")) - } - servenv.OnClose(destDbClient.Close) - - for _, query := range binlogplayer.CreateVReplicationTable() { - if _, err := destDbClient.ExecuteFetch(query, 0); err != nil { - log.Fatalf("Failed to ensure vreplication table exists: %v", err) - } - } - - newVReplicatorStmt := binlogplayer.CreateVReplication("VTshovel", &source, vtShovelConfig.MySQLSourceBinlogStartPos, int64(1000), int64(100000), time.Now().Unix(), destDbClient.DBName()) - - res, err := destDbClient.ExecuteFetch(newVReplicatorStmt, 0) - if err != nil { - log.Fatalf("Failed to create vreplication stream: %v", err) - } - - sourceVstreamClient := vreplication.NewMySQLVStreamerClient(&sourceConnParams) - - go func() { - ctx := context.Background() - replicator := vreplication.NewVReplicator( - uint32(res.InsertID), - &source, - sourceVstreamClient, - binlogplayer.NewStats(), - destDbClient, - mysqld, - ) - replicator.Replicate(ctx) - if err != nil { - log.Infof("Error with stream: %v", err) - - } - return - }() - servenv.RunDefault() -} - -func loadConfigFromFile(file string) (*VtShovelConfig, error) { - data, err := ioutil.ReadFile(file) - if err != nil { - return nil, vterrors.Wrapf(err, "Failed to read %v file", file) - } - vtShovelConfig := &VtShovelConfig{} - err = json.Unmarshal(data, vtShovelConfig) - if err != nil { - return nil, vterrors.Wrap(err, "Error parsing auth server config") - } - return vtShovelConfig, nil -} - -type vtShovelDbClient struct { - dbClient binlogplayer.DBClient - startPos string -} diff --git a/go/vt/dbconfigs/dbconfigs.go b/go/vt/dbconfigs/dbconfigs.go index c15ad1e6415..af675779b18 100644 --- a/go/vt/dbconfigs/dbconfigs.go +++ b/go/vt/dbconfigs/dbconfigs.go @@ -69,14 +69,15 @@ const ( // AllPrivs user should have more privileges than App (should include possibility to do // schema changes and write to internal Vitess tables), but it shouldn't have SUPER // privilege like Dba has. - AllPrivs = "allprivs" - Dba = "dba" - Filtered = "filtered" - Repl = "repl" + AllPrivs = "allprivs" + Dba = "dba" + Filtered = "filtered" + Repl = "repl" + ExternalRepl = "erepl" ) // All can be used to register all flags: RegisterFlags(All...) -var All = []string{App, AppDebug, AllPrivs, Dba, Filtered, Repl} +var All = []string{App, AppDebug, AllPrivs, Dba, Filtered, Repl, ExternalRepl} // RegisterFlags registers the flags for the given DBConfigFlag. // For instance, vttablet will register client, dba and repl. @@ -157,16 +158,26 @@ func (dbcfgs *DBConfigs) DbaWithDB() *mysql.ConnParams { return dbcfgs.makeParams(Dba, true) } -// FilteredWithDB returns connection parameters for appdebug with dbname set. +// FilteredWithDB returns connection parameters for filtered with dbname set. func (dbcfgs *DBConfigs) FilteredWithDB() *mysql.ConnParams { return dbcfgs.makeParams(Filtered, true) } -// Repl returns connection parameters for appdebug with no dbname set. +// Repl returns connection parameters for repl with no dbname set. func (dbcfgs *DBConfigs) Repl() *mysql.ConnParams { return dbcfgs.makeParams(Repl, false) } +// ExternalRepl returns connection parameters for repl with no dbname set. +func (dbcfgs *DBConfigs) ExternalRepl() *mysql.ConnParams { + return dbcfgs.makeParams(Repl, false) +} + +// ExternalReplWithDb returns connection parameters for repl with dbname set. +func (dbcfgs *DBConfigs) ExternalReplWithDb() *mysql.ConnParams { + return dbcfgs.makeParams(Repl, true) +} + // AppWithDB returns connection parameters for app with dbname set. func (dbcfgs *DBConfigs) makeParams(userKey string, withDB bool) *mysql.ConnParams { orig := dbcfgs.userConfigs[userKey] diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go index 454658c4f24..e0f0d0f1d23 100644 --- a/go/vt/proto/binlogdata/binlogdata.pb.go +++ b/go/vt/proto/binlogdata/binlogdata.pb.go @@ -715,10 +715,13 @@ type BinlogSource struct { // for the filter. Filter *Filter `protobuf:"bytes,6,opt,name=filter,proto3" json:"filter,omitempty"` // on_ddl specifies the action to be taken when a DDL is encountered. - OnDdl OnDDLAction `protobuf:"varint,7,opt,name=on_ddl,json=onDdl,proto3,enum=binlogdata.OnDDLAction" json:"on_ddl,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OnDdl OnDDLAction `protobuf:"varint,7,opt,name=on_ddl,json=onDdl,proto3,enum=binlogdata.OnDDLAction" json:"on_ddl,omitempty"` + // Source is an external mysql. This attribute should be set to the username + // to use in the connection + ExternalMysql string `protobuf:"bytes,8,opt,name=external_mysql,json=externalMysql,proto3" json:"external_mysql,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *BinlogSource) Reset() { *m = BinlogSource{} } @@ -795,6 +798,13 @@ func (m *BinlogSource) GetOnDdl() OnDDLAction { return OnDDLAction_IGNORE } +func (m *BinlogSource) GetExternalMysql() string { + if m != nil { + return m.ExternalMysql + } + return "" +} + // RowChange represents one row change type RowChange struct { Before *query.Row `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` @@ -1568,107 +1578,109 @@ func init() { func init() { proto.RegisterFile("binlogdata.proto", fileDescriptor_5fd02bcb2e350dad) } var fileDescriptor_5fd02bcb2e350dad = []byte{ - // 1630 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x72, 0xf3, 0x48, - 0x15, 0x8e, 0x2d, 0xf9, 0x76, 0x94, 0x38, 0x4a, 0xe7, 0x82, 0x49, 0x31, 0x54, 0x46, 0xc5, 0x90, - 0x90, 0x2a, 0x1c, 0x30, 0xf0, 0xb3, 0x1a, 0x06, 0x5f, 0x94, 0xc4, 0x89, 0x6c, 0xe7, 0x6f, 0x2b, - 0x19, 0x6a, 0x36, 0x2a, 0xc5, 0xea, 0x24, 0x22, 0xb2, 0xe4, 0x5f, 0x6a, 0x3b, 0xe4, 0x01, 0x28, - 0x1e, 0x80, 0x2d, 0x2f, 0xc0, 0x1a, 0xb6, 0x6c, 0xd9, 0xf3, 0x10, 0x3c, 0x00, 0x6f, 0x40, 0xf5, - 0x45, 0xb2, 0x95, 0x0c, 0xf3, 0x67, 0xa8, 0x62, 0xc1, 0x46, 0x75, 0xfa, 0xf4, 0x39, 0xa7, 0xcf, - 0xf9, 0xfa, 0x3b, 0xdd, 0x6a, 0xd0, 0x6f, 0xfd, 0x30, 0x88, 0xee, 0x3d, 0x97, 0xba, 0xcd, 0x59, - 0x1c, 0xd1, 0x08, 0xc1, 0x52, 0xb3, 0xaf, 0x2d, 0x68, 0x3c, 0x9b, 0x88, 0x89, 0x7d, 0xed, 0xc3, - 0x9c, 0xc4, 0xcf, 0x72, 0x50, 0xa7, 0xd1, 0x2c, 0x5a, 0x7a, 0x19, 0x03, 0xa8, 0x74, 0x1f, 0xdc, - 0x38, 0x21, 0x14, 0xed, 0x41, 0x79, 0x12, 0xf8, 0x24, 0xa4, 0x8d, 0xc2, 0x41, 0xe1, 0xa8, 0x84, - 0xe5, 0x08, 0x21, 0x50, 0x27, 0x51, 0x18, 0x36, 0x8a, 0x5c, 0xcb, 0x65, 0x66, 0x9b, 0x90, 0x78, - 0x41, 0xe2, 0x86, 0x22, 0x6c, 0xc5, 0xc8, 0xf8, 0xa7, 0x02, 0x5b, 0x1d, 0x9e, 0x87, 0x1d, 0xbb, - 0x61, 0xe2, 0x4e, 0xa8, 0x1f, 0x85, 0xe8, 0x0c, 0x20, 0xa1, 0x2e, 0x25, 0x53, 0x12, 0xd2, 0xa4, - 0x51, 0x38, 0x50, 0x8e, 0xb4, 0xd6, 0x61, 0x73, 0xa5, 0x82, 0x57, 0x2e, 0xcd, 0x71, 0x6a, 0x8f, - 0x57, 0x5c, 0x51, 0x0b, 0x34, 0xb2, 0x20, 0x21, 0x75, 0x68, 0xf4, 0x48, 0xc2, 0x86, 0x7a, 0x50, - 0x38, 0xd2, 0x5a, 0x5b, 0x4d, 0x51, 0xa0, 0xc9, 0x66, 0x6c, 0x36, 0x81, 0x81, 0x64, 0xf2, 0xfe, - 0xdf, 0x8b, 0x50, 0xcb, 0xa2, 0x21, 0x0b, 0xaa, 0x13, 0x97, 0x92, 0xfb, 0x28, 0x7e, 0xe6, 0x65, - 0xd6, 0x5b, 0x3f, 0x79, 0x63, 0x22, 0xcd, 0xae, 0xf4, 0xc3, 0x59, 0x04, 0xf4, 0x63, 0xa8, 0x4c, - 0x04, 0x7a, 0x1c, 0x1d, 0xad, 0xb5, 0xbd, 0x1a, 0x4c, 0x02, 0x8b, 0x53, 0x1b, 0xa4, 0x83, 0x92, - 0x7c, 0x08, 0x38, 0x64, 0xeb, 0x98, 0x89, 0xc6, 0x9f, 0x0b, 0x50, 0x4d, 0xe3, 0xa2, 0x6d, 0xd8, - 0xec, 0x58, 0xce, 0xf5, 0x10, 0x9b, 0xdd, 0xd1, 0xd9, 0xb0, 0xff, 0x95, 0xd9, 0xd3, 0xd7, 0xd0, - 0x3a, 0x54, 0x3b, 0x96, 0xd3, 0x31, 0xcf, 0xfa, 0x43, 0xbd, 0x80, 0x36, 0xa0, 0xd6, 0xb1, 0x9c, - 0xee, 0x68, 0x30, 0xe8, 0xdb, 0x7a, 0x11, 0x6d, 0x82, 0xd6, 0xb1, 0x1c, 0x3c, 0xb2, 0xac, 0x4e, - 0xbb, 0x7b, 0xa9, 0x2b, 0x68, 0x17, 0xb6, 0x3a, 0x96, 0xd3, 0x1b, 0x58, 0x4e, 0xcf, 0xbc, 0xc2, - 0x66, 0xb7, 0x6d, 0x9b, 0x3d, 0x5d, 0x45, 0x00, 0x65, 0xa6, 0xee, 0x59, 0x7a, 0x49, 0xca, 0x63, - 0xd3, 0xd6, 0xcb, 0x32, 0x5c, 0x7f, 0x38, 0x36, 0xb1, 0xad, 0x57, 0xe4, 0xf0, 0xfa, 0xaa, 0xd7, - 0xb6, 0x4d, 0xbd, 0x2a, 0x87, 0x3d, 0xd3, 0x32, 0x6d, 0x53, 0xaf, 0x5d, 0xa8, 0xd5, 0xa2, 0xae, - 0x5c, 0xa8, 0x55, 0x45, 0x57, 0x8d, 0x3f, 0x16, 0x60, 0x77, 0x4c, 0x63, 0xe2, 0x4e, 0x2f, 0xc9, - 0x33, 0x76, 0xc3, 0x7b, 0x82, 0xc9, 0x87, 0x39, 0x49, 0x28, 0xda, 0x87, 0xea, 0x2c, 0x4a, 0x7c, - 0x86, 0x1d, 0x07, 0xb8, 0x86, 0xb3, 0x31, 0x3a, 0x81, 0xda, 0x23, 0x79, 0x76, 0x62, 0x66, 0x2f, - 0x01, 0x43, 0xcd, 0x8c, 0x90, 0x59, 0xa4, 0xea, 0xa3, 0x94, 0x56, 0xf1, 0x55, 0x3e, 0x8e, 0xaf, - 0x71, 0x07, 0x7b, 0x2f, 0x93, 0x4a, 0x66, 0x51, 0x98, 0x10, 0x64, 0x01, 0x12, 0x8e, 0x0e, 0x5d, - 0xee, 0x2d, 0xcf, 0x4f, 0x6b, 0x7d, 0xf2, 0x8d, 0x04, 0xc0, 0x5b, 0xb7, 0x2f, 0x55, 0xc6, 0xef, - 0x60, 0x5b, 0xac, 0x63, 0xbb, 0xb7, 0x01, 0x49, 0xde, 0x52, 0xfa, 0x1e, 0x94, 0x29, 0x37, 0x6e, - 0x14, 0x0f, 0x94, 0xa3, 0x1a, 0x96, 0xa3, 0x6f, 0x5b, 0xa1, 0x07, 0x3b, 0xf9, 0x95, 0xff, 0x27, - 0xf5, 0xfd, 0x1c, 0x54, 0x3c, 0x0f, 0x08, 0xda, 0x81, 0xd2, 0xd4, 0xa5, 0x93, 0x07, 0x59, 0x8d, - 0x18, 0xb0, 0x52, 0xee, 0xfc, 0x80, 0x92, 0x98, 0x6f, 0x61, 0x0d, 0xcb, 0x91, 0xf1, 0x97, 0x02, - 0x94, 0x4f, 0xb9, 0x88, 0x7e, 0x08, 0xa5, 0x78, 0xce, 0x8a, 0x15, 0xbd, 0xae, 0xaf, 0x66, 0xc0, - 0x22, 0x63, 0x31, 0x8d, 0xfa, 0x50, 0xbf, 0xf3, 0x49, 0xe0, 0xf1, 0xd6, 0x1d, 0x44, 0x9e, 0x60, - 0x45, 0xbd, 0xf5, 0xe9, 0xaa, 0x83, 0x88, 0xd9, 0x3c, 0xcd, 0x19, 0xe2, 0x17, 0x8e, 0xc6, 0x3b, - 0xa8, 0xe7, 0x2d, 0x58, 0x3b, 0x99, 0x18, 0x3b, 0xa3, 0xa1, 0x33, 0xe8, 0x8f, 0x07, 0x6d, 0xbb, - 0x7b, 0xae, 0xaf, 0xf1, 0x8e, 0x31, 0xc7, 0xb6, 0x63, 0x9e, 0x9e, 0x8e, 0xb0, 0xad, 0x17, 0x8c, - 0x3f, 0x15, 0x61, 0x5d, 0x80, 0x32, 0x8e, 0xe6, 0xf1, 0x84, 0xb0, 0x5d, 0x7c, 0x24, 0xcf, 0xc9, - 0xcc, 0x9d, 0x90, 0x74, 0x17, 0xd3, 0x31, 0x03, 0x24, 0x79, 0x70, 0x63, 0x4f, 0x56, 0x2e, 0x06, - 0xe8, 0x17, 0xa0, 0xf1, 0xdd, 0xa4, 0x0e, 0x7d, 0x9e, 0x11, 0xbe, 0x8f, 0xf5, 0xd6, 0xce, 0x92, - 0xd8, 0x7c, 0xaf, 0xa8, 0xfd, 0x3c, 0x23, 0x18, 0x68, 0x26, 0xe7, 0xbb, 0x41, 0x7d, 0x43, 0x37, - 0x2c, 0x39, 0x54, 0xca, 0x71, 0xe8, 0x38, 0xdb, 0x90, 0xb2, 0x8c, 0xf2, 0x0a, 0xbd, 0x74, 0x93, - 0x50, 0x13, 0xca, 0x51, 0xe8, 0x78, 0x5e, 0xd0, 0xa8, 0xf0, 0x34, 0xbf, 0xb3, 0x6a, 0x3b, 0x0a, - 0x7b, 0x3d, 0xab, 0x2d, 0x68, 0x51, 0x8a, 0xc2, 0x9e, 0x17, 0x18, 0xef, 0xa1, 0x86, 0xa3, 0xa7, - 0xee, 0x03, 0x4f, 0xc0, 0x80, 0xf2, 0x2d, 0xb9, 0x8b, 0x62, 0x22, 0x99, 0x05, 0xf2, 0xe4, 0xc5, - 0xd1, 0x13, 0x96, 0x33, 0xe8, 0x00, 0x4a, 0xee, 0x5d, 0x4a, 0x8e, 0xbc, 0x89, 0x98, 0x30, 0x5c, - 0xa8, 0xe2, 0xe8, 0x89, 0xef, 0x13, 0xfa, 0x04, 0x04, 0x22, 0x4e, 0xe8, 0x4e, 0x53, 0xb8, 0x6b, - 0x5c, 0x33, 0x74, 0xa7, 0x04, 0xbd, 0x03, 0x2d, 0x8e, 0x9e, 0x9c, 0x09, 0x5f, 0x5e, 0xb4, 0x8e, - 0xd6, 0xda, 0xcd, 0xb1, 0x29, 0x4d, 0x0e, 0x43, 0x9c, 0x8a, 0x89, 0xf1, 0x1e, 0x60, 0x49, 0x86, - 0x8f, 0x2d, 0xf2, 0x03, 0x06, 0x1f, 0x09, 0xbc, 0x34, 0xfe, 0xba, 0x4c, 0x99, 0x47, 0xc0, 0x72, - 0x8e, 0x01, 0x31, 0x66, 0xbb, 0x7d, 0x46, 0x7d, 0xef, 0xbf, 0xe0, 0x08, 0x02, 0xf5, 0x9e, 0xfa, - 0x1e, 0x27, 0x47, 0x0d, 0x73, 0xd9, 0xf8, 0x02, 0x4a, 0x37, 0x3c, 0xdc, 0x3b, 0xd0, 0xb8, 0x95, - 0xc3, 0xd4, 0x69, 0xd3, 0xe4, 0xca, 0xcc, 0x96, 0xc6, 0x90, 0xa4, 0x62, 0x62, 0xb4, 0x61, 0xe3, - 0x52, 0x2e, 0xcb, 0x0d, 0xbe, 0x7d, 0x5e, 0xc6, 0x5f, 0x8b, 0x50, 0xb9, 0x88, 0xe6, 0x71, 0xe8, - 0x06, 0xa8, 0x0e, 0x45, 0xdf, 0xe3, 0x7e, 0x0a, 0x2e, 0xfa, 0x1e, 0xfa, 0x35, 0xd4, 0xa7, 0xfe, - 0x7d, 0xec, 0x32, 0x3e, 0x08, 0x6a, 0x8b, 0xee, 0xfc, 0xee, 0x6a, 0x66, 0x83, 0xd4, 0x82, 0xf3, - 0x7b, 0x63, 0xba, 0x3a, 0x5c, 0x61, 0xac, 0x92, 0x63, 0xec, 0x67, 0x50, 0x0f, 0xa2, 0x89, 0x1b, - 0x38, 0xd9, 0x79, 0xa9, 0xf2, 0xa4, 0x36, 0xb8, 0xf6, 0x2a, 0x3d, 0x34, 0x5f, 0xe0, 0x52, 0x7a, - 0x23, 0x2e, 0xe8, 0x73, 0x58, 0x9f, 0xb9, 0x31, 0xf5, 0x27, 0xfe, 0xcc, 0x65, 0x7f, 0x1c, 0x65, - 0xee, 0x98, 0x4b, 0x3b, 0x87, 0x1b, 0xce, 0x99, 0xa3, 0x4f, 0x61, 0x3d, 0x26, 0x0b, 0x12, 0x27, - 0xc4, 0x73, 0xd8, 0xba, 0x95, 0x03, 0xe5, 0x48, 0xc1, 0x5a, 0xaa, 0xeb, 0x7b, 0x89, 0xf1, 0xaf, - 0x22, 0x94, 0x6f, 0x04, 0xbb, 0x8e, 0x41, 0xe5, 0xd8, 0x88, 0xbf, 0x89, 0xbd, 0xd5, 0x45, 0x84, - 0x05, 0x07, 0x86, 0xdb, 0xa0, 0xef, 0x41, 0x8d, 0xfa, 0x53, 0x92, 0x50, 0x77, 0x3a, 0xe3, 0x60, - 0x2a, 0x78, 0xa9, 0xf8, 0x3a, 0x8e, 0xb0, 0x5f, 0x06, 0xd6, 0xac, 0x02, 0x1e, 0x26, 0xa2, 0x9f, - 0x42, 0x8d, 0xf5, 0x04, 0xff, 0xc3, 0x69, 0x94, 0x78, 0x93, 0xed, 0xbc, 0xe8, 0x08, 0xbe, 0x2c, - 0xae, 0xc6, 0x69, 0x97, 0xfd, 0x12, 0x34, 0xce, 0x62, 0xe9, 0x24, 0x4e, 0x89, 0xbd, 0xfc, 0x29, - 0x91, 0x76, 0x0b, 0x86, 0xe5, 0xc1, 0x8a, 0x0e, 0xa1, 0xb4, 0xe0, 0x29, 0x55, 0xe4, 0x9f, 0xd6, - 0x6a, 0x71, 0x1c, 0x76, 0x31, 0xcf, 0xae, 0xb1, 0xdf, 0x0a, 0x16, 0x35, 0xaa, 0xaf, 0xaf, 0x31, - 0x49, 0x30, 0x9c, 0xda, 0xf0, 0xaa, 0xa6, 0x41, 0xa3, 0x26, 0xab, 0x9a, 0x06, 0x0c, 0xf3, 0xc9, - 0x3c, 0x8e, 0xf9, 0xbf, 0x9d, 0x3f, 0x25, 0x8d, 0x1d, 0x0e, 0x8e, 0x26, 0x75, 0xb6, 0x3f, 0x25, - 0xc6, 0x1f, 0x8a, 0x50, 0xbf, 0x11, 0xb7, 0x5f, 0x7a, 0xe3, 0x7e, 0x01, 0xdb, 0xe4, 0xee, 0x8e, - 0x4c, 0xa8, 0xbf, 0x20, 0xce, 0xc4, 0x0d, 0x02, 0x12, 0x3b, 0x92, 0xc2, 0x5a, 0x6b, 0xb3, 0x29, - 0xfe, 0x82, 0xbb, 0x5c, 0xdf, 0xef, 0xe1, 0xad, 0xcc, 0x56, 0xaa, 0x3c, 0x64, 0xc2, 0xb6, 0x3f, - 0x9d, 0x12, 0xcf, 0x77, 0xe9, 0x6a, 0x00, 0x71, 0x76, 0xed, 0xca, 0x83, 0xe0, 0xc6, 0x3e, 0x73, - 0x29, 0x59, 0x86, 0xc9, 0x3c, 0xb2, 0x30, 0x9f, 0x31, 0x9e, 0xc7, 0xf7, 0xd9, 0x25, 0xbe, 0x21, - 0x3d, 0x6d, 0xae, 0xc4, 0x72, 0x32, 0xf7, 0x83, 0xa0, 0xbe, 0xf8, 0x41, 0x58, 0x1e, 0xe2, 0xa5, - 0x8f, 0x1d, 0xe2, 0xc6, 0xe7, 0xb0, 0x99, 0x01, 0x21, 0x7f, 0x00, 0x8e, 0xa1, 0xcc, 0x37, 0x37, - 0x3d, 0x3d, 0xd0, 0x6b, 0x1e, 0x62, 0x69, 0x61, 0xfc, 0xbe, 0x08, 0x28, 0xf5, 0x8f, 0x9e, 0x92, - 0xff, 0x53, 0x30, 0x77, 0xa0, 0xc4, 0xf5, 0x12, 0x49, 0x31, 0x60, 0x38, 0x04, 0x6e, 0x42, 0x67, - 0x8f, 0x19, 0x8c, 0xc2, 0xf9, 0x3d, 0xfb, 0x62, 0x92, 0xcc, 0x03, 0x8a, 0xa5, 0x85, 0xf1, 0xb7, - 0x02, 0x6c, 0xe7, 0x70, 0x90, 0x58, 0x2e, 0x2f, 0x84, 0xc2, 0x7f, 0xbe, 0x10, 0xd0, 0x11, 0x54, - 0x67, 0x8f, 0xdf, 0x70, 0x71, 0x64, 0xb3, 0x5f, 0xdb, 0xd7, 0xdf, 0x07, 0x35, 0x8e, 0x9e, 0x92, - 0x86, 0xca, 0x3d, 0x57, 0x6f, 0x49, 0xae, 0x67, 0x57, 0x6d, 0xae, 0x8e, 0xdc, 0x55, 0x2b, 0x66, - 0x8e, 0x7f, 0x05, 0xda, 0xca, 0x8d, 0xcd, 0x7e, 0xec, 0xfb, 0x67, 0xc3, 0x11, 0x36, 0xf5, 0x35, - 0x54, 0x05, 0x75, 0x6c, 0x8f, 0xae, 0xf4, 0x02, 0x93, 0xcc, 0xdf, 0x98, 0x5d, 0xf1, 0x58, 0x60, - 0x92, 0x23, 0x8d, 0x94, 0xe3, 0x7f, 0x14, 0x00, 0x96, 0x47, 0x14, 0xd2, 0xa0, 0x72, 0x3d, 0xbc, - 0x1c, 0x8e, 0xbe, 0x1c, 0x8a, 0x00, 0x67, 0x76, 0xbf, 0xa7, 0x17, 0x50, 0x0d, 0x4a, 0xe2, 0xf5, - 0x51, 0x64, 0x2b, 0xc8, 0xa7, 0x87, 0xc2, 0xde, 0x25, 0xd9, 0xbb, 0x43, 0x45, 0x15, 0x50, 0xb2, - 0xd7, 0x85, 0x7c, 0x4e, 0x94, 0x59, 0x40, 0x6c, 0x5e, 0x59, 0xed, 0xae, 0xa9, 0x57, 0xd8, 0x44, - 0xf6, 0xb0, 0x00, 0x28, 0xa7, 0xaf, 0x0a, 0xe6, 0xc9, 0xde, 0x22, 0xc0, 0xd6, 0x19, 0xd9, 0xe7, - 0x26, 0xd6, 0x35, 0xa6, 0xc3, 0xa3, 0x2f, 0xf5, 0x75, 0xa6, 0x3b, 0xed, 0x9b, 0x56, 0x4f, 0xdf, - 0x60, 0x8f, 0x91, 0x73, 0xb3, 0x8d, 0xed, 0x8e, 0xd9, 0xb6, 0xf5, 0x3a, 0x9b, 0xb9, 0xe1, 0x09, - 0x6e, 0xb2, 0x65, 0x2e, 0x46, 0xd7, 0x78, 0xd8, 0xb6, 0x74, 0xfd, 0xf8, 0x10, 0x36, 0x72, 0x37, - 0x12, 0x5b, 0xcb, 0x6e, 0x77, 0x2c, 0x73, 0xac, 0xaf, 0x31, 0x79, 0x7c, 0xde, 0xc6, 0xbd, 0xb1, - 0x5e, 0xe8, 0xfc, 0xe8, 0xab, 0xc3, 0x85, 0x4f, 0x49, 0x92, 0x34, 0xfd, 0xe8, 0x44, 0x48, 0x27, - 0xf7, 0xd1, 0xc9, 0x82, 0x9e, 0xf0, 0x87, 0xf1, 0xc9, 0xb2, 0x7d, 0x6e, 0xcb, 0x5c, 0xf3, 0xb3, - 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x08, 0x9a, 0x3a, 0x74, 0x0f, 0x00, 0x00, + // 1652 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xdd, 0x72, 0xe3, 0x48, + 0x15, 0x1e, 0x5b, 0xf2, 0xdf, 0x51, 0xe2, 0x28, 0x9d, 0x4c, 0x30, 0x53, 0x2c, 0x95, 0x55, 0x31, + 0x4c, 0x48, 0x15, 0x0e, 0x18, 0x18, 0xae, 0x96, 0xc5, 0x3f, 0x4a, 0xc6, 0x13, 0xd9, 0xce, 0xb4, + 0x95, 0x2c, 0xb5, 0x37, 0x2a, 0xc5, 0xea, 0x24, 0x22, 0xfa, 0xf1, 0x48, 0x6d, 0x67, 0xfd, 0x00, + 0x14, 0x0f, 0xc0, 0x53, 0x70, 0x0d, 0xb7, 0x5c, 0x51, 0xc5, 0x3d, 0x0f, 0xc1, 0x03, 0xf0, 0x06, + 0x54, 0xff, 0x48, 0xb6, 0x32, 0xcb, 0x4e, 0x96, 0x2a, 0x2e, 0xf6, 0x46, 0x75, 0xfa, 0xf4, 0x39, + 0xa7, 0xcf, 0xf9, 0xfa, 0xfc, 0xa8, 0x41, 0xbf, 0xf6, 0xa3, 0x20, 0xbe, 0xf5, 0x5c, 0xea, 0xb6, + 0xe7, 0x49, 0x4c, 0x63, 0x04, 0x6b, 0xce, 0x0b, 0x6d, 0x49, 0x93, 0xf9, 0x4c, 0x6c, 0xbc, 0xd0, + 0xde, 0x2f, 0x48, 0xb2, 0x92, 0x8b, 0x26, 0x8d, 0xe7, 0xf1, 0x5a, 0xcb, 0x18, 0x41, 0xad, 0x7f, + 0xe7, 0x26, 0x29, 0xa1, 0xe8, 0x00, 0xaa, 0xb3, 0xc0, 0x27, 0x11, 0x6d, 0x95, 0x0e, 0x4b, 0x47, + 0x15, 0x2c, 0x57, 0x08, 0x81, 0x3a, 0x8b, 0xa3, 0xa8, 0x55, 0xe6, 0x5c, 0x4e, 0x33, 0xd9, 0x94, + 0x24, 0x4b, 0x92, 0xb4, 0x14, 0x21, 0x2b, 0x56, 0xc6, 0xbf, 0x14, 0xd8, 0xed, 0x71, 0x3f, 0xec, + 0xc4, 0x8d, 0x52, 0x77, 0x46, 0xfd, 0x38, 0x42, 0x67, 0x00, 0x29, 0x75, 0x29, 0x09, 0x49, 0x44, + 0xd3, 0x56, 0xe9, 0x50, 0x39, 0xd2, 0x3a, 0xaf, 0xda, 0x1b, 0x11, 0x7c, 0xa0, 0xd2, 0x9e, 0x66, + 0xf2, 0x78, 0x43, 0x15, 0x75, 0x40, 0x23, 0x4b, 0x12, 0x51, 0x87, 0xc6, 0xf7, 0x24, 0x6a, 0xa9, + 0x87, 0xa5, 0x23, 0xad, 0xb3, 0xdb, 0x16, 0x01, 0x9a, 0x6c, 0xc7, 0x66, 0x1b, 0x18, 0x48, 0x4e, + 0xbf, 0xf8, 0x47, 0x19, 0x1a, 0xb9, 0x35, 0x64, 0x41, 0x7d, 0xe6, 0x52, 0x72, 0x1b, 0x27, 0x2b, + 0x1e, 0x66, 0xb3, 0xf3, 0xb3, 0x27, 0x3a, 0xd2, 0xee, 0x4b, 0x3d, 0x9c, 0x5b, 0x40, 0x3f, 0x85, + 0xda, 0x4c, 0xa0, 0xc7, 0xd1, 0xd1, 0x3a, 0x7b, 0x9b, 0xc6, 0x24, 0xb0, 0x38, 0x93, 0x41, 0x3a, + 0x28, 0xe9, 0xfb, 0x80, 0x43, 0xb6, 0x85, 0x19, 0x69, 0xfc, 0xb9, 0x04, 0xf5, 0xcc, 0x2e, 0xda, + 0x83, 0x9d, 0x9e, 0xe5, 0x5c, 0x8e, 0xb1, 0xd9, 0x9f, 0x9c, 0x8d, 0x87, 0x5f, 0x9a, 0x03, 0xfd, + 0x19, 0xda, 0x82, 0x7a, 0xcf, 0x72, 0x7a, 0xe6, 0xd9, 0x70, 0xac, 0x97, 0xd0, 0x36, 0x34, 0x7a, + 0x96, 0xd3, 0x9f, 0x8c, 0x46, 0x43, 0x5b, 0x2f, 0xa3, 0x1d, 0xd0, 0x7a, 0x96, 0x83, 0x27, 0x96, + 0xd5, 0xeb, 0xf6, 0xcf, 0x75, 0x05, 0x3d, 0x87, 0xdd, 0x9e, 0xe5, 0x0c, 0x46, 0x96, 0x33, 0x30, + 0x2f, 0xb0, 0xd9, 0xef, 0xda, 0xe6, 0x40, 0x57, 0x11, 0x40, 0x95, 0xb1, 0x07, 0x96, 0x5e, 0x91, + 0xf4, 0xd4, 0xb4, 0xf5, 0xaa, 0x34, 0x37, 0x1c, 0x4f, 0x4d, 0x6c, 0xeb, 0x35, 0xb9, 0xbc, 0xbc, + 0x18, 0x74, 0x6d, 0x53, 0xaf, 0xcb, 0xe5, 0xc0, 0xb4, 0x4c, 0xdb, 0xd4, 0x1b, 0x6f, 0xd5, 0x7a, + 0x59, 0x57, 0xde, 0xaa, 0x75, 0x45, 0x57, 0x8d, 0x3f, 0x95, 0xe0, 0xf9, 0x94, 0x26, 0xc4, 0x0d, + 0xcf, 0xc9, 0x0a, 0xbb, 0xd1, 0x2d, 0xc1, 0xe4, 0xfd, 0x82, 0xa4, 0x14, 0xbd, 0x80, 0xfa, 0x3c, + 0x4e, 0x7d, 0x86, 0x1d, 0x07, 0xb8, 0x81, 0xf3, 0x35, 0x3a, 0x81, 0xc6, 0x3d, 0x59, 0x39, 0x09, + 0x93, 0x97, 0x80, 0xa1, 0x76, 0x9e, 0x90, 0xb9, 0xa5, 0xfa, 0xbd, 0xa4, 0x36, 0xf1, 0x55, 0x3e, + 0x8e, 0xaf, 0x71, 0x03, 0x07, 0x8f, 0x9d, 0x4a, 0xe7, 0x71, 0x94, 0x12, 0x64, 0x01, 0x12, 0x8a, + 0x0e, 0x5d, 0xdf, 0x2d, 0xf7, 0x4f, 0xeb, 0x7c, 0xf2, 0x8d, 0x09, 0x80, 0x77, 0xaf, 0x1f, 0xb3, + 0x8c, 0xaf, 0x60, 0x4f, 0x9c, 0x63, 0xbb, 0xd7, 0x01, 0x49, 0x9f, 0x12, 0xfa, 0x01, 0x54, 0x29, + 0x17, 0x6e, 0x95, 0x0f, 0x95, 0xa3, 0x06, 0x96, 0xab, 0x6f, 0x1b, 0xa1, 0x07, 0xfb, 0xc5, 0x93, + 0xff, 0x2f, 0xf1, 0xfd, 0x12, 0x54, 0xbc, 0x08, 0x08, 0xda, 0x87, 0x4a, 0xe8, 0xd2, 0xd9, 0x9d, + 0x8c, 0x46, 0x2c, 0x58, 0x28, 0x37, 0x7e, 0x40, 0x49, 0xc2, 0xaf, 0xb0, 0x81, 0xe5, 0xca, 0xf8, + 0x4b, 0x09, 0xaa, 0xa7, 0x9c, 0x44, 0x3f, 0x86, 0x4a, 0xb2, 0x60, 0xc1, 0x8a, 0x5a, 0xd7, 0x37, + 0x3d, 0x60, 0x96, 0xb1, 0xd8, 0x46, 0x43, 0x68, 0xde, 0xf8, 0x24, 0xf0, 0x78, 0xe9, 0x8e, 0x62, + 0x4f, 0x64, 0x45, 0xb3, 0xf3, 0xe9, 0xa6, 0x82, 0xb0, 0xd9, 0x3e, 0x2d, 0x08, 0xe2, 0x47, 0x8a, + 0xc6, 0x6b, 0x68, 0x16, 0x25, 0x58, 0x39, 0x99, 0x18, 0x3b, 0x93, 0xb1, 0x33, 0x1a, 0x4e, 0x47, + 0x5d, 0xbb, 0xff, 0x46, 0x7f, 0xc6, 0x2b, 0xc6, 0x9c, 0xda, 0x8e, 0x79, 0x7a, 0x3a, 0xc1, 0xb6, + 0x5e, 0x32, 0xfe, 0x5e, 0x86, 0x2d, 0x01, 0xca, 0x34, 0x5e, 0x24, 0x33, 0xc2, 0x6e, 0xf1, 0x9e, + 0xac, 0xd2, 0xb9, 0x3b, 0x23, 0xd9, 0x2d, 0x66, 0x6b, 0x06, 0x48, 0x7a, 0xe7, 0x26, 0x9e, 0x8c, + 0x5c, 0x2c, 0xd0, 0xaf, 0x40, 0xe3, 0xb7, 0x49, 0x1d, 0xba, 0x9a, 0x13, 0x7e, 0x8f, 0xcd, 0xce, + 0xfe, 0x3a, 0xb1, 0xf9, 0x5d, 0x51, 0x7b, 0x35, 0x27, 0x18, 0x68, 0x4e, 0x17, 0xab, 0x41, 0x7d, + 0x42, 0x35, 0xac, 0x73, 0xa8, 0x52, 0xc8, 0xa1, 0xe3, 0xfc, 0x42, 0xaa, 0xd2, 0xca, 0x07, 0xe8, + 0x65, 0x97, 0x84, 0xda, 0x50, 0x8d, 0x23, 0xc7, 0xf3, 0x82, 0x56, 0x8d, 0xbb, 0xf9, 0xbd, 0x4d, + 0xd9, 0x49, 0x34, 0x18, 0x58, 0x5d, 0x91, 0x16, 0x95, 0x38, 0x1a, 0x78, 0x01, 0x7a, 0x09, 0x4d, + 0xf2, 0x15, 0x25, 0x49, 0xe4, 0x06, 0x4e, 0xb8, 0x62, 0xdd, 0xab, 0xce, 0x43, 0xdf, 0xce, 0xb8, + 0x23, 0xc6, 0x34, 0xde, 0x41, 0x03, 0xc7, 0x0f, 0xfd, 0x3b, 0xee, 0xa7, 0x01, 0xd5, 0x6b, 0x72, + 0x13, 0x27, 0x44, 0x26, 0x20, 0xc8, 0x06, 0x8d, 0xe3, 0x07, 0x2c, 0x77, 0xd0, 0x21, 0x54, 0xdc, + 0x9b, 0x2c, 0x87, 0x8a, 0x22, 0x62, 0xc3, 0x70, 0xa1, 0x8e, 0xe3, 0x07, 0x7e, 0x9d, 0xe8, 0x13, + 0x10, 0xc0, 0x39, 0x91, 0x1b, 0x66, 0xb7, 0xd2, 0xe0, 0x9c, 0xb1, 0x1b, 0x12, 0xf4, 0x1a, 0xb4, + 0x24, 0x7e, 0x70, 0x66, 0xfc, 0x78, 0x51, 0x61, 0x5a, 0xe7, 0x79, 0x21, 0xe9, 0x32, 0xe7, 0x30, + 0x24, 0x19, 0x99, 0x1a, 0xef, 0x00, 0xd6, 0x39, 0xf3, 0xb1, 0x43, 0x7e, 0xc4, 0x50, 0x26, 0x81, + 0x97, 0xd9, 0xdf, 0x92, 0x2e, 0x73, 0x0b, 0x58, 0xee, 0x31, 0x20, 0xa6, 0x2c, 0x29, 0xce, 0xa8, + 0xef, 0xfd, 0x0f, 0xa9, 0x84, 0x40, 0xbd, 0xa5, 0xbe, 0xc7, 0x73, 0xa8, 0x81, 0x39, 0x6d, 0x7c, + 0x0e, 0x95, 0x2b, 0x6e, 0xee, 0x35, 0x68, 0x5c, 0xca, 0x61, 0xec, 0xac, 0xb6, 0x0a, 0x61, 0xe6, + 0x47, 0x63, 0x48, 0x33, 0x32, 0x35, 0xba, 0xb0, 0x7d, 0x2e, 0x8f, 0xe5, 0x02, 0xdf, 0xde, 0x2f, + 0xe3, 0xaf, 0x65, 0xa8, 0xbd, 0x8d, 0x17, 0xec, 0xc2, 0x51, 0x13, 0xca, 0xbe, 0xc7, 0xf5, 0x14, + 0x5c, 0xf6, 0x3d, 0xf4, 0x5b, 0x68, 0x86, 0xfe, 0x6d, 0xe2, 0xb2, 0xb4, 0x11, 0x15, 0x20, 0x8a, + 0xf8, 0xfb, 0x9b, 0x9e, 0x8d, 0x32, 0x09, 0x5e, 0x06, 0xdb, 0xe1, 0xe6, 0x72, 0x23, 0xb1, 0x95, + 0x42, 0x62, 0xbf, 0x84, 0x66, 0x10, 0xcf, 0xdc, 0xc0, 0xc9, 0xdb, 0xaa, 0x2a, 0x92, 0x8f, 0x73, + 0x2f, 0xb2, 0xde, 0xfa, 0x08, 0x97, 0xca, 0x13, 0x71, 0x41, 0x9f, 0xc1, 0xd6, 0xdc, 0x4d, 0xa8, + 0x3f, 0xf3, 0xe7, 0x2e, 0xfb, 0x31, 0xa9, 0x72, 0xc5, 0x82, 0xdb, 0x05, 0xdc, 0x70, 0x41, 0x1c, + 0x7d, 0x0a, 0x5b, 0x09, 0x59, 0x92, 0x24, 0x25, 0x9e, 0xc3, 0xce, 0xad, 0x1d, 0x2a, 0x47, 0x0a, + 0xd6, 0x32, 0xde, 0xd0, 0x4b, 0x8d, 0x7f, 0x97, 0xa1, 0x7a, 0x25, 0xb2, 0xeb, 0x18, 0x54, 0x8e, + 0x8d, 0xf8, 0xe9, 0x38, 0xd8, 0x3c, 0x44, 0x48, 0x70, 0x60, 0xb8, 0x0c, 0xfa, 0x01, 0x34, 0xa8, + 0x1f, 0x92, 0x94, 0xba, 0xe1, 0x9c, 0x83, 0xa9, 0xe0, 0x35, 0xe3, 0xeb, 0x72, 0x84, 0xfd, 0x59, + 0xb0, 0x9a, 0x16, 0xf0, 0x30, 0x12, 0xfd, 0x1c, 0x1a, 0xac, 0x26, 0xf8, 0x8f, 0x50, 0xab, 0xc2, + 0x8b, 0x6c, 0xff, 0x51, 0x45, 0xf0, 0x63, 0x71, 0x3d, 0xc9, 0xaa, 0xec, 0xd7, 0xa0, 0xf1, 0x2c, + 0x96, 0x4a, 0xa2, 0x99, 0x1c, 0x14, 0x9b, 0x49, 0x56, 0x2d, 0x18, 0xd6, 0xfd, 0x17, 0xbd, 0x82, + 0xca, 0x92, 0xbb, 0x54, 0x93, 0x3f, 0x64, 0x9b, 0xc1, 0x71, 0xd8, 0xc5, 0x3e, 0x9b, 0x76, 0xbf, + 0x17, 0x59, 0xc4, 0xdb, 0xc8, 0xa3, 0x69, 0x27, 0x13, 0x0c, 0x67, 0x32, 0x3c, 0xaa, 0x30, 0x68, + 0x35, 0x64, 0x54, 0x61, 0xc0, 0x30, 0x9f, 0x2d, 0x92, 0x84, 0xff, 0x02, 0xfa, 0x21, 0x69, 0xed, + 0x73, 0x70, 0x34, 0xc9, 0xb3, 0xfd, 0x90, 0x18, 0x7f, 0x2c, 0x43, 0xf3, 0x4a, 0x0c, 0xc9, 0x6c, + 0x30, 0x7f, 0x0e, 0x7b, 0xe4, 0xe6, 0x86, 0xcc, 0xa8, 0xbf, 0x24, 0xce, 0xcc, 0x0d, 0x02, 0x92, + 0x38, 0x32, 0x85, 0xb5, 0xce, 0x4e, 0x5b, 0xfc, 0x2c, 0xf7, 0x39, 0x7f, 0x38, 0xc0, 0xbb, 0xb9, + 0xac, 0x64, 0x79, 0xc8, 0x84, 0x3d, 0x3f, 0x0c, 0x89, 0xe7, 0xbb, 0x74, 0xd3, 0x80, 0xe8, 0x5d, + 0xcf, 0x65, 0x23, 0xb8, 0xb2, 0xcf, 0x5c, 0x4a, 0xd6, 0x66, 0x72, 0x8d, 0xdc, 0xcc, 0x4b, 0x96, + 0xe7, 0xc9, 0x6d, 0x3e, 0xeb, 0xb7, 0xa5, 0xa6, 0xcd, 0x99, 0x58, 0x6e, 0x16, 0xfe, 0x23, 0xd4, + 0x47, 0xff, 0x11, 0xeb, 0x5e, 0x5f, 0xf9, 0x58, 0xaf, 0x37, 0x3e, 0x83, 0x9d, 0x1c, 0x08, 0xf9, + 0x9f, 0x70, 0x0c, 0x55, 0x7e, 0xb9, 0x59, 0xf7, 0x40, 0x1f, 0xe6, 0x21, 0x96, 0x12, 0xc6, 0x1f, + 0xca, 0x80, 0x32, 0xfd, 0xf8, 0x21, 0xfd, 0x8e, 0x82, 0xb9, 0x0f, 0x15, 0xce, 0x97, 0x48, 0x8a, + 0x05, 0xc3, 0x21, 0x70, 0x53, 0x3a, 0xbf, 0xcf, 0x61, 0x14, 0xca, 0xef, 0xd8, 0x17, 0x93, 0x74, + 0x11, 0x50, 0x2c, 0x25, 0x8c, 0xbf, 0x95, 0x60, 0xaf, 0x80, 0x83, 0xc4, 0x72, 0x3d, 0x10, 0x4a, + 0xff, 0x7d, 0x20, 0xa0, 0x23, 0xa8, 0xcf, 0xef, 0xbf, 0x61, 0x70, 0xe4, 0xbb, 0x5f, 0x5b, 0xd7, + 0x3f, 0x04, 0x35, 0x89, 0x1f, 0xd2, 0x96, 0xca, 0x35, 0x37, 0xa7, 0x24, 0xe7, 0xb3, 0x51, 0x5b, + 0x88, 0xa3, 0x30, 0x6a, 0xc5, 0xce, 0xf1, 0x6f, 0x40, 0xdb, 0x18, 0xec, 0xec, 0xff, 0x7f, 0x78, + 0x36, 0x9e, 0x60, 0x53, 0x7f, 0x86, 0xea, 0xa0, 0x4e, 0xed, 0xc9, 0x85, 0x5e, 0x62, 0x94, 0xf9, + 0x3b, 0xb3, 0x2f, 0xde, 0x14, 0x8c, 0x72, 0xa4, 0x90, 0x72, 0xfc, 0xcf, 0x12, 0xc0, 0xba, 0x45, + 0x21, 0x0d, 0x6a, 0x97, 0xe3, 0xf3, 0xf1, 0xe4, 0x8b, 0xb1, 0x30, 0x70, 0x66, 0x0f, 0x07, 0x7a, + 0x09, 0x35, 0xa0, 0x22, 0x1e, 0x29, 0x65, 0x76, 0x82, 0x7c, 0xa1, 0x28, 0xec, 0xf9, 0x92, 0x3f, + 0x4f, 0x54, 0x54, 0x03, 0x25, 0x7f, 0x84, 0xc8, 0x57, 0x47, 0x95, 0x19, 0xc4, 0xe6, 0x85, 0xd5, + 0xed, 0x9b, 0x7a, 0x8d, 0x6d, 0xe4, 0xef, 0x0f, 0x80, 0x6a, 0xf6, 0xf8, 0x60, 0x9a, 0xec, 0xc9, + 0x02, 0xec, 0x9c, 0x89, 0xfd, 0xc6, 0xc4, 0xba, 0xc6, 0x78, 0x78, 0xf2, 0x85, 0xbe, 0xc5, 0x78, + 0xa7, 0x43, 0xd3, 0x1a, 0xe8, 0xdb, 0xec, 0xcd, 0xf2, 0xc6, 0xec, 0x62, 0xbb, 0x67, 0x76, 0x6d, + 0xbd, 0xc9, 0x76, 0xae, 0xb8, 0x83, 0x3b, 0xec, 0x98, 0xb7, 0x93, 0x4b, 0x3c, 0xee, 0x5a, 0xba, + 0x7e, 0xfc, 0x0a, 0xb6, 0x0b, 0x13, 0x89, 0x9d, 0x65, 0x77, 0x7b, 0x96, 0x39, 0xd5, 0x9f, 0x31, + 0x7a, 0xfa, 0xa6, 0x8b, 0x07, 0x53, 0xbd, 0xd4, 0xfb, 0xc9, 0x97, 0xaf, 0x96, 0x3e, 0x25, 0x69, + 0xda, 0xf6, 0xe3, 0x13, 0x41, 0x9d, 0xdc, 0xc6, 0x27, 0x4b, 0x7a, 0xc2, 0xdf, 0xcf, 0x27, 0xeb, + 0xf2, 0xb9, 0xae, 0x72, 0xce, 0x2f, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x82, 0x3a, 0x5d, + 0x9b, 0x0f, 0x00, 0x00, } diff --git a/go/vt/vttablet/tabletmanager/action_agent.go b/go/vt/vttablet/tabletmanager/action_agent.go index 7fe05a7b5b3..fdccaacc715 100644 --- a/go/vt/vttablet/tabletmanager/action_agent.go +++ b/go/vt/vttablet/tabletmanager/action_agent.go @@ -290,7 +290,10 @@ func NewActionAgent( // The db name is set by the Start function called above agent.VREngine = vreplication.NewEngine(ts, tabletAlias.Cell, mysqld, func() binlogplayer.DBClient { return binlogplayer.NewDBClient(agent.DBConfigs.FilteredWithDB()) - }, agent.DBConfigs.FilteredWithDB().DbName) + }, + agent.DBConfigs.ExternalRepl(), + agent.DBConfigs.FilteredWithDB().DbName, + ) servenv.OnTerm(agent.VREngine.Close) // Run a background task to rebuild the SrvKeyspace in our cell/keyspace @@ -357,7 +360,7 @@ func NewTestActionAgent(batchCtx context.Context, ts *topo.Server, tabletAlias * Cnf: nil, MysqlDaemon: mysqlDaemon, DBConfigs: &dbconfigs.DBConfigs{}, - VREngine: vreplication.NewEngine(ts, tabletAlias.Cell, mysqlDaemon, binlogplayer.NewFakeDBClient, ti.DbName()), + VREngine: vreplication.NewEngine(ts, tabletAlias.Cell, mysqlDaemon, binlogplayer.NewFakeDBClient, nil, ti.DbName()), History: history.New(historyLength), _healthy: fmt.Errorf("healthcheck not run yet"), } @@ -396,7 +399,7 @@ func NewComboActionAgent(batchCtx context.Context, ts *topo.Server, tabletAlias Cnf: nil, MysqlDaemon: mysqlDaemon, DBConfigs: dbcfgs, - VREngine: vreplication.NewEngine(nil, "", nil, nil, ""), + VREngine: vreplication.NewEngine(nil, "", nil, nil, nil, ""), gotMysqlPort: true, History: history.New(historyLength), _healthy: fmt.Errorf("healthcheck not run yet"), diff --git a/go/vt/vttablet/tabletmanager/vreplication/controller.go b/go/vt/vttablet/tabletmanager/vreplication/controller.go index 699c66212a6..0f98bc47f77 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/controller.go +++ b/go/vt/vttablet/tabletmanager/vreplication/controller.go @@ -27,6 +27,7 @@ import ( "github.com/golang/protobuf/proto" "golang.org/x/net/context" + "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/tb" "vitess.io/vitess/go/vt/binlog/binlogplayer" @@ -43,9 +44,10 @@ var retryDelay = flag.Duration("vreplication_retry_delay", 5*time.Second, "delay // There is no mutex within a controller becaust its members are // either read-only or self-synchronized. type controller struct { - dbClientFactory func() binlogplayer.DBClient - mysqld mysqlctl.MysqlDaemon - blpStats *binlogplayer.Stats + dbClientFactory func() binlogplayer.DBClient + sourceDbConnParams *mysql.ConnParams + mysqld mysqlctl.MysqlDaemon + blpStats *binlogplayer.Stats id uint32 source binlogdatapb.BinlogSource @@ -61,15 +63,16 @@ type controller struct { // newController creates a new controller. Unless a stream is explicitly 'Stopped', // this function launches a goroutine to perform continuous vreplication. -func newController(ctx context.Context, params map[string]string, dbClientFactory func() binlogplayer.DBClient, mysqld mysqlctl.MysqlDaemon, ts *topo.Server, cell, tabletTypesStr string, blpStats *binlogplayer.Stats) (*controller, error) { +func newController(ctx context.Context, params map[string]string, dbClientFactory func() binlogplayer.DBClient, sourceDbConnParams *mysql.ConnParams, mysqld mysqlctl.MysqlDaemon, ts *topo.Server, cell, tabletTypesStr string, blpStats *binlogplayer.Stats) (*controller, error) { if blpStats == nil { blpStats = binlogplayer.NewStats() } ct := &controller{ - dbClientFactory: dbClientFactory, - mysqld: mysqld, - blpStats: blpStats, - done: make(chan struct{}), + dbClientFactory: dbClientFactory, + sourceDbConnParams: sourceDbConnParams, + mysqld: mysqld, + blpStats: blpStats, + done: make(chan struct{}), } // id @@ -92,18 +95,20 @@ func newController(ctx context.Context, params map[string]string, dbClientFactor } ct.stopPos = params["stop_pos"] - // tabletPicker - if v, ok := params["cell"]; ok { - cell = v - } - if v, ok := params["tablet_types"]; ok { - tabletTypesStr = v - } - tp, err := newTabletPicker(ctx, ts, cell, ct.source.Keyspace, ct.source.Shard, tabletTypesStr) - if err != nil { - return nil, err + if ct.source.GetExternalMysql() == "" { + // tabletPicker + if v, ok := params["cell"]; ok { + cell = v + } + if v, ok := params["tablet_types"]; ok { + tabletTypesStr = v + } + tp, err := newTabletPicker(ctx, ts, cell, ct.source.Keyspace, ct.source.Shard, tabletTypesStr) + if err != nil { + return nil, err + } + ct.tabletPicker = tp } - ct.tabletPicker = tp // cancel ctx, ct.cancel = context.WithCancel(ctx) @@ -199,7 +204,14 @@ func (ct *controller) runBlp(ctx context.Context) (err error) { if _, err := dbClient.ExecuteFetch("set names binary", 10000); err != nil { return err } - vsClient := NewTabletVStreamerClient(tablet) + + var vsClient VStreamerClient + if ct.source.GetExternalMysql() == "" { + vsClient = NewTabletVStreamerClient(tablet) + } else { + vsClient = NewMySQLVStreamerClient(ct.sourceDbConnParams) + } + vreplicator := NewVReplicator(ct.id, &ct.source, vsClient, ct.blpStats, dbClient, ct.mysqld) return vreplicator.Replicate(ctx) } diff --git a/go/vt/vttablet/tabletmanager/vreplication/controller_test.go b/go/vt/vttablet/tabletmanager/vreplication/controller_test.go index f330985c4c9..c0644a7f3a6 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/controller_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/controller_test.go @@ -76,7 +76,7 @@ func TestControllerKeyRange(t *testing.T) { dbClientFactory := func() binlogplayer.DBClient { return dbClient } mysqld := &fakemysqldaemon.FakeMysqlDaemon{MysqlPort: 3306} - ct, err := newController(context.Background(), params, dbClientFactory, mysqld, env.TopoServ, env.Cells[0], "replica", nil) + ct, err := newController(context.Background(), params, dbClientFactory, nil, mysqld, env.TopoServ, env.Cells[0], "replica", nil) if err != nil { t.Fatal(err) } @@ -136,7 +136,7 @@ func TestControllerTables(t *testing.T) { }, } - ct, err := newController(context.Background(), params, dbClientFactory, mysqld, env.TopoServ, env.Cells[0], "replica", nil) + ct, err := newController(context.Background(), params, dbClientFactory, nil, mysqld, env.TopoServ, env.Cells[0], "replica", nil) if err != nil { t.Fatal(err) } @@ -153,7 +153,7 @@ func TestControllerBadID(t *testing.T) { params := map[string]string{ "id": "bad", } - _, err := newController(context.Background(), params, nil, nil, nil, "", "", nil) + _, err := newController(context.Background(), params, nil, nil, nil, nil, "", "", nil) want := `strconv.Atoi: parsing "bad": invalid syntax` if err == nil || err.Error() != want { t.Errorf("newController err: %v, want %v", err, want) @@ -166,7 +166,7 @@ func TestControllerStopped(t *testing.T) { "state": binlogplayer.BlpStopped, } - ct, err := newController(context.Background(), params, nil, nil, nil, "", "", nil) + ct, err := newController(context.Background(), params, nil, nil, nil, nil, "", "", nil) if err != nil { t.Fatal(err) } @@ -203,7 +203,7 @@ func TestControllerOverrides(t *testing.T) { dbClientFactory := func() binlogplayer.DBClient { return dbClient } mysqld := &fakemysqldaemon.FakeMysqlDaemon{MysqlPort: 3306} - ct, err := newController(context.Background(), params, dbClientFactory, mysqld, env.TopoServ, env.Cells[0], "rdonly", nil) + ct, err := newController(context.Background(), params, dbClientFactory, nil, mysqld, env.TopoServ, env.Cells[0], "rdonly", nil) if err != nil { t.Fatal(err) } @@ -227,7 +227,7 @@ func TestControllerCanceledContext(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) cancel() - ct, err := newController(ctx, params, nil, nil, env.TopoServ, env.Cells[0], "rdonly", nil) + ct, err := newController(ctx, params, nil, nil, nil, env.TopoServ, env.Cells[0], "rdonly", nil) if err != nil { t.Fatal(err) } @@ -269,7 +269,7 @@ func TestControllerRetry(t *testing.T) { dbClientFactory := func() binlogplayer.DBClient { return dbClient } mysqld := &fakemysqldaemon.FakeMysqlDaemon{MysqlPort: 3306} - ct, err := newController(context.Background(), params, dbClientFactory, mysqld, env.TopoServ, env.Cells[0], "rdonly", nil) + ct, err := newController(context.Background(), params, dbClientFactory, nil, mysqld, env.TopoServ, env.Cells[0], "rdonly", nil) if err != nil { t.Fatal(err) } @@ -315,7 +315,7 @@ func TestControllerStopPosition(t *testing.T) { dbClientFactory := func() binlogplayer.DBClient { return dbClient } mysqld := &fakemysqldaemon.FakeMysqlDaemon{MysqlPort: 3306} - ct, err := newController(context.Background(), params, dbClientFactory, mysqld, env.TopoServ, env.Cells[0], "replica", nil) + ct, err := newController(context.Background(), params, dbClientFactory, nil, mysqld, env.TopoServ, env.Cells[0], "replica", nil) if err != nil { t.Fatal(err) } diff --git a/go/vt/vttablet/tabletmanager/vreplication/engine.go b/go/vt/vttablet/tabletmanager/vreplication/engine.go index 4baad2ac62c..2b72a33ea4e 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/engine.go +++ b/go/vt/vttablet/tabletmanager/vreplication/engine.go @@ -77,23 +77,25 @@ type Engine struct { // cancel will cancel the root context, thereby all controllers. cancel context.CancelFunc - ts *topo.Server - cell string - mysqld mysqlctl.MysqlDaemon - dbClientFactory func() binlogplayer.DBClient - dbName string + ts *topo.Server + cell string + mysqld mysqlctl.MysqlDaemon + dbClientFactory func() binlogplayer.DBClient + sourceDbConnParams *mysql.ConnParams + dbName string } // NewEngine creates a new Engine. // A nil ts means that the Engine is disabled. -func NewEngine(ts *topo.Server, cell string, mysqld mysqlctl.MysqlDaemon, dbClientFactory func() binlogplayer.DBClient, dbName string) *Engine { +func NewEngine(ts *topo.Server, cell string, mysqld mysqlctl.MysqlDaemon, dbClientFactory func() binlogplayer.DBClient, sourceDbConnParams *mysql.ConnParams, dbName string) *Engine { vre := &Engine{ - controllers: make(map[int]*controller), - ts: ts, - cell: cell, - mysqld: mysqld, - dbClientFactory: dbClientFactory, - dbName: dbName, + controllers: make(map[int]*controller), + ts: ts, + cell: cell, + mysqld: mysqld, + dbClientFactory: dbClientFactory, + sourceDbConnParams: sourceDbConnParams, + dbName: dbName, } return vre } @@ -187,7 +189,7 @@ func (vre *Engine) initAll() error { return err } for _, row := range rows { - ct, err := newController(vre.ctx, row, vre.dbClientFactory, vre.mysqld, vre.ts, vre.cell, *tabletTypesStr, nil) + ct, err := newController(vre.ctx, row, vre.dbClientFactory, vre.sourceDbConnParams, vre.mysqld, vre.ts, vre.cell, *tabletTypesStr, nil) if err != nil { return err } @@ -280,7 +282,7 @@ func (vre *Engine) Exec(query string) (*sqltypes.Result, error) { if err != nil { return nil, err } - ct, err := newController(vre.ctx, params, vre.dbClientFactory, vre.mysqld, vre.ts, vre.cell, *tabletTypesStr, nil) + ct, err := newController(vre.ctx, params, vre.dbClientFactory, vre.sourceDbConnParams, vre.mysqld, vre.ts, vre.cell, *tabletTypesStr, nil) if err != nil { return nil, err } @@ -318,7 +320,7 @@ func (vre *Engine) Exec(query string) (*sqltypes.Result, error) { } // Create a new controller in place of the old one. // For continuity, the new controller inherits the previous stats. - ct, err := newController(vre.ctx, params, vre.dbClientFactory, vre.mysqld, vre.ts, vre.cell, *tabletTypesStr, blpStats[id]) + ct, err := newController(vre.ctx, params, vre.dbClientFactory, vre.sourceDbConnParams, vre.mysqld, vre.ts, vre.cell, *tabletTypesStr, blpStats[id]) if err != nil { return nil, err } diff --git a/go/vt/vttablet/tabletmanager/vreplication/engine_test.go b/go/vt/vttablet/tabletmanager/vreplication/engine_test.go index d16ca35cc4b..8e7cff1a880 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/engine_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/engine_test.go @@ -41,7 +41,7 @@ func TestEngineOpen(t *testing.T) { // Test Insert - vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, dbClient.DBName()) + vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, nil, dbClient.DBName()) if vre.IsOpen() { t.Errorf("IsOpen: %v, want false", vre.IsOpen()) } @@ -89,7 +89,7 @@ func TestEngineExec(t *testing.T) { // Test Insert - vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, dbClient.DBName()) + vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, nil, dbClient.DBName()) dbClient.ExpectRequest("select * from _vt.vreplication where db_name='db'", &sqltypes.Result{}, nil) if err := vre.Open(context.Background()); err != nil { @@ -249,7 +249,7 @@ func TestEngineBadInsert(t *testing.T) { dbClientFactory := func() binlogplayer.DBClient { return dbClient } mysqld := &fakemysqldaemon.FakeMysqlDaemon{MysqlPort: 3306} - vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, dbClient.DBName()) + vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, nil, dbClient.DBName()) dbClient.ExpectRequest("select * from _vt.vreplication where db_name='db'", &sqltypes.Result{}, nil) if err := vre.Open(context.Background()); err != nil { @@ -279,7 +279,7 @@ func TestEngineSelect(t *testing.T) { dbClientFactory := func() binlogplayer.DBClient { return dbClient } mysqld := &fakemysqldaemon.FakeMysqlDaemon{MysqlPort: 3306} - vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, dbClient.DBName()) + vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, nil, dbClient.DBName()) dbClient.ExpectRequest("select * from _vt.vreplication where db_name='db'", &sqltypes.Result{}, nil) if err := vre.Open(context.Background()); err != nil { @@ -314,7 +314,7 @@ func TestWaitForPos(t *testing.T) { dbClient := binlogplayer.NewMockDBClient(t) mysqld := &fakemysqldaemon.FakeMysqlDaemon{MysqlPort: 3306} dbClientFactory := func() binlogplayer.DBClient { return dbClient } - vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, dbClient.DBName()) + vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, nil, dbClient.DBName()) dbClient.ExpectRequest("select * from _vt.vreplication where db_name='db'", &sqltypes.Result{}, nil) if err := vre.Open(context.Background()); err != nil { @@ -344,7 +344,7 @@ func TestWaitForPosError(t *testing.T) { dbClient := binlogplayer.NewMockDBClient(t) mysqld := &fakemysqldaemon.FakeMysqlDaemon{MysqlPort: 3306} dbClientFactory := func() binlogplayer.DBClient { return dbClient } - vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, dbClient.DBName()) + vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, nil, dbClient.DBName()) err := vre.WaitForPos(context.Background(), 1, "MariaDB/0-1-1084") want := `vreplication engine is closed` @@ -386,7 +386,7 @@ func TestWaitForPosCancel(t *testing.T) { dbClient := binlogplayer.NewMockDBClient(t) mysqld := &fakemysqldaemon.FakeMysqlDaemon{MysqlPort: 3306} dbClientFactory := func() binlogplayer.DBClient { return dbClient } - vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, dbClient.DBName()) + vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, nil, dbClient.DBName()) dbClient.ExpectRequest("select * from _vt.vreplication where db_name='db'", &sqltypes.Result{}, nil) if err := vre.Open(context.Background()); err != nil { @@ -433,7 +433,7 @@ func TestCreateDBAndTable(t *testing.T) { // Test Insert - vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, dbClient.DBName()) + vre := NewEngine(env.TopoServ, env.Cells[0], mysqld, dbClientFactory, nil, dbClient.DBName()) tableNotFound := mysql.SQLError{Num: 1146, Message: "table not found"} dbClient.ExpectRequest("select * from _vt.vreplication where db_name='db'", nil, &tableNotFound) diff --git a/go/vt/vttablet/tabletmanager/vreplication/framework_test.go b/go/vt/vttablet/tabletmanager/vreplication/framework_test.go index bb8e4982094..461ba0ab0df 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/framework_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/framework_test.go @@ -96,7 +96,7 @@ func TestMain(m *testing.M) { return 1 } - playerEngine = NewEngine(env.TopoServ, env.Cells[0], env.Mysqld, realDBClientFactory, vrepldb) + playerEngine = NewEngine(env.TopoServ, env.Cells[0], env.Mysqld, realDBClientFactory, nil, vrepldb) if err := playerEngine.Open(context.Background()); err != nil { fmt.Fprintf(os.Stderr, "%v", err) return 1 diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 67d4772d9f7..b9c73a92fba 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -315,8 +315,8 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e if err != nil { return nil, fmt.Errorf("can't get query from binlog event: %v, event data: %#v", err, ev) } - // Insert/Delete/Update are supported are in here only to have support for vtshovel with - // SBR streams. Vitess itself should never run into cases where it needs to consume non rbr statements. + // Insert/Delete/Update are supported only to be used in the context of vtshovel where source databases + // could be using SBR. Vitess itself should never run into cases where it needs to consume non rbr statements. switch cat := sqlparser.Preview(q.SQL); cat { case sqlparser.StmtInsert: mustSend := mustSendStmt(q, vs.cp.DbName) diff --git a/proto/binlogdata.proto b/proto/binlogdata.proto index 7627c719560..78285253537 100644 --- a/proto/binlogdata.proto +++ b/proto/binlogdata.proto @@ -170,6 +170,10 @@ message BinlogSource { // on_ddl specifies the action to be taken when a DDL is encountered. OnDDLAction on_ddl = 7; + + // Source is an external mysql. This attribute should be set to the username + // to use in the connection + string external_mysql = 8; } // VEventType enumerates the event types. diff --git a/py/vtproto/binlogdata_pb2.py b/py/vtproto/binlogdata_pb2.py index 816b684becd..6b1a69c001b 100644 --- a/py/vtproto/binlogdata_pb2.py +++ b/py/vtproto/binlogdata_pb2.py @@ -23,7 +23,7 @@ package='binlogdata', syntax='proto3', serialized_options=_b('Z\'vitess.io/vitess/go/vt/proto/binlogdata'), - serialized_pb=_b('\n\x10\x62inlogdata.proto\x12\nbinlogdata\x1a\x0bvtrpc.proto\x1a\x0bquery.proto\x1a\x0etopodata.proto\"7\n\x07\x43harset\x12\x0e\n\x06\x63lient\x18\x01 \x01(\x05\x12\x0c\n\x04\x63onn\x18\x02 \x01(\x05\x12\x0e\n\x06server\x18\x03 \x01(\x05\"\xb5\x03\n\x11\x42inlogTransaction\x12;\n\nstatements\x18\x01 \x03(\x0b\x32\'.binlogdata.BinlogTransaction.Statement\x12&\n\x0b\x65vent_token\x18\x04 \x01(\x0b\x32\x11.query.EventToken\x1a\xae\x02\n\tStatement\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32\x30.binlogdata.BinlogTransaction.Statement.Category\x12$\n\x07\x63harset\x18\x02 \x01(\x0b\x32\x13.binlogdata.Charset\x12\x0b\n\x03sql\x18\x03 \x01(\x0c\"\xa9\x01\n\x08\x43\x61tegory\x12\x13\n\x0f\x42L_UNRECOGNIZED\x10\x00\x12\x0c\n\x08\x42L_BEGIN\x10\x01\x12\r\n\tBL_COMMIT\x10\x02\x12\x0f\n\x0b\x42L_ROLLBACK\x10\x03\x12\x15\n\x11\x42L_DML_DEPRECATED\x10\x04\x12\n\n\x06\x42L_DDL\x10\x05\x12\n\n\x06\x42L_SET\x10\x06\x12\r\n\tBL_INSERT\x10\x07\x12\r\n\tBL_UPDATE\x10\x08\x12\r\n\tBL_DELETE\x10\tJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"v\n\x15StreamKeyRangeRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"S\n\x16StreamKeyRangeResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"]\n\x13StreamTablesRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x0e\n\x06tables\x18\x02 \x03(\t\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"Q\n\x14StreamTablesResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"%\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x02 \x01(\t\"\x9c\x01\n\x06\x46ilter\x12\x1f\n\x05rules\x18\x01 \x03(\x0b\x32\x10.binlogdata.Rule\x12\x39\n\x0e\x66ieldEventMode\x18\x02 \x01(\x0e\x32!.binlogdata.Filter.FieldEventMode\"6\n\x0e\x46ieldEventMode\x12\x13\n\x0f\x45RR_ON_MISMATCH\x10\x00\x12\x0f\n\x0b\x42\x45ST_EFFORT\x10\x01\"\xde\x01\n\x0c\x42inlogSource\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\x12%\n\tkey_range\x18\x04 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x0e\n\x06tables\x18\x05 \x03(\t\x12\"\n\x06\x66ilter\x18\x06 \x01(\x0b\x32\x12.binlogdata.Filter\x12\'\n\x06on_ddl\x18\x07 \x01(\x0e\x32\x17.binlogdata.OnDDLAction\"B\n\tRowChange\x12\x1a\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\n.query.Row\x12\x19\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\n.query.Row\"J\n\x08RowEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12*\n\x0brow_changes\x18\x02 \x03(\x0b\x32\x15.binlogdata.RowChange\">\n\nFieldEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x1c\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x0c.query.Field\":\n\tShardGtid\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x0c\n\x04gtid\x18\x03 \x01(\t\"3\n\x05VGtid\x12*\n\x0bshard_gtids\x18\x01 \x03(\x0b\x32\x15.binlogdata.ShardGtid\"0\n\rKeyspaceShard\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\"\xe3\x01\n\x07Journal\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x31\n\x0emigration_type\x18\x02 \x01(\x0e\x32\x19.binlogdata.MigrationType\x12\x0e\n\x06tables\x18\x03 \x03(\t\x12\x16\n\x0elocal_position\x18\x04 \x01(\t\x12*\n\x0bshard_gtids\x18\x05 \x03(\x0b\x32\x15.binlogdata.ShardGtid\x12/\n\x0cparticipants\x18\x06 \x03(\x0b\x32\x19.binlogdata.KeyspaceShard\x12\x14\n\x0creversed_ids\x18\x07 \x03(\x03\"\x9d\x02\n\x06VEvent\x12$\n\x04type\x18\x01 \x01(\x0e\x32\x16.binlogdata.VEventType\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x0b\n\x03\x64\x64l\x18\x04 \x01(\t\x12\'\n\trow_event\x18\x05 \x01(\x0b\x32\x14.binlogdata.RowEvent\x12+\n\x0b\x66ield_event\x18\x06 \x01(\x0b\x32\x16.binlogdata.FieldEvent\x12 \n\x05vgtid\x18\x07 \x01(\x0b\x32\x11.binlogdata.VGtid\x12$\n\x07journal\x18\x08 \x01(\x0b\x32\x13.binlogdata.Journal\x12\x0b\n\x03\x64ml\x18\t \x01(\t\x12\x14\n\x0c\x63urrent_time\x18\x14 \x01(\x03\"\xc7\x01\n\x0eVStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\"\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x12.binlogdata.Filter\"5\n\x0fVStreamResponse\x12\"\n\x06\x65vents\x18\x01 \x03(\x0b\x32\x12.binlogdata.VEvent\"\xc8\x01\n\x12VStreamRowsRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\r\n\x05query\x18\x04 \x01(\t\x12\"\n\x06lastpk\x18\x05 \x01(\x0b\x32\x12.query.QueryResult\"\x97\x01\n\x13VStreamRowsResponse\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x1e\n\x08pkfields\x18\x02 \x03(\x0b\x32\x0c.query.Field\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x1a\n\x06lastpk\x18\x05 \x01(\x0b\x32\n.query.Row*>\n\x0bOnDDLAction\x12\n\n\x06IGNORE\x10\x00\x12\x08\n\x04STOP\x10\x01\x12\x08\n\x04\x45XEC\x10\x02\x12\x0f\n\x0b\x45XEC_IGNORE\x10\x03*\xd1\x01\n\nVEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04GTID\x10\x01\x12\t\n\x05\x42\x45GIN\x10\x02\x12\n\n\x06\x43OMMIT\x10\x03\x12\x0c\n\x08ROLLBACK\x10\x04\x12\x07\n\x03\x44\x44L\x10\x05\x12\n\n\x06INSERT\x10\x06\x12\x0b\n\x07REPLACE\x10\x07\x12\n\n\x06UPDATE\x10\x08\x12\n\n\x06\x44\x45LETE\x10\t\x12\x07\n\x03SET\x10\n\x12\t\n\x05OTHER\x10\x0b\x12\x07\n\x03ROW\x10\x0c\x12\t\n\x05\x46IELD\x10\r\x12\r\n\tHEARTBEAT\x10\x0e\x12\t\n\x05VGTID\x10\x0f\x12\x0b\n\x07JOURNAL\x10\x10*\'\n\rMigrationType\x12\n\n\x06TABLES\x10\x00\x12\n\n\x06SHARDS\x10\x01\x42)Z\'vitess.io/vitess/go/vt/proto/binlogdatab\x06proto3') + serialized_pb=_b('\n\x10\x62inlogdata.proto\x12\nbinlogdata\x1a\x0bvtrpc.proto\x1a\x0bquery.proto\x1a\x0etopodata.proto\"7\n\x07\x43harset\x12\x0e\n\x06\x63lient\x18\x01 \x01(\x05\x12\x0c\n\x04\x63onn\x18\x02 \x01(\x05\x12\x0e\n\x06server\x18\x03 \x01(\x05\"\xb5\x03\n\x11\x42inlogTransaction\x12;\n\nstatements\x18\x01 \x03(\x0b\x32\'.binlogdata.BinlogTransaction.Statement\x12&\n\x0b\x65vent_token\x18\x04 \x01(\x0b\x32\x11.query.EventToken\x1a\xae\x02\n\tStatement\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32\x30.binlogdata.BinlogTransaction.Statement.Category\x12$\n\x07\x63harset\x18\x02 \x01(\x0b\x32\x13.binlogdata.Charset\x12\x0b\n\x03sql\x18\x03 \x01(\x0c\"\xa9\x01\n\x08\x43\x61tegory\x12\x13\n\x0f\x42L_UNRECOGNIZED\x10\x00\x12\x0c\n\x08\x42L_BEGIN\x10\x01\x12\r\n\tBL_COMMIT\x10\x02\x12\x0f\n\x0b\x42L_ROLLBACK\x10\x03\x12\x15\n\x11\x42L_DML_DEPRECATED\x10\x04\x12\n\n\x06\x42L_DDL\x10\x05\x12\n\n\x06\x42L_SET\x10\x06\x12\r\n\tBL_INSERT\x10\x07\x12\r\n\tBL_UPDATE\x10\x08\x12\r\n\tBL_DELETE\x10\tJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"v\n\x15StreamKeyRangeRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"S\n\x16StreamKeyRangeResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"]\n\x13StreamTablesRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x0e\n\x06tables\x18\x02 \x03(\t\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"Q\n\x14StreamTablesResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"%\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x02 \x01(\t\"\x9c\x01\n\x06\x46ilter\x12\x1f\n\x05rules\x18\x01 \x03(\x0b\x32\x10.binlogdata.Rule\x12\x39\n\x0e\x66ieldEventMode\x18\x02 \x01(\x0e\x32!.binlogdata.Filter.FieldEventMode\"6\n\x0e\x46ieldEventMode\x12\x13\n\x0f\x45RR_ON_MISMATCH\x10\x00\x12\x0f\n\x0b\x42\x45ST_EFFORT\x10\x01\"\xf6\x01\n\x0c\x42inlogSource\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\x12%\n\tkey_range\x18\x04 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x0e\n\x06tables\x18\x05 \x03(\t\x12\"\n\x06\x66ilter\x18\x06 \x01(\x0b\x32\x12.binlogdata.Filter\x12\'\n\x06on_ddl\x18\x07 \x01(\x0e\x32\x17.binlogdata.OnDDLAction\x12\x16\n\x0e\x65xternal_mysql\x18\x08 \x01(\t\"B\n\tRowChange\x12\x1a\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\n.query.Row\x12\x19\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\n.query.Row\"J\n\x08RowEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12*\n\x0brow_changes\x18\x02 \x03(\x0b\x32\x15.binlogdata.RowChange\">\n\nFieldEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x1c\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x0c.query.Field\":\n\tShardGtid\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x0c\n\x04gtid\x18\x03 \x01(\t\"3\n\x05VGtid\x12*\n\x0bshard_gtids\x18\x01 \x03(\x0b\x32\x15.binlogdata.ShardGtid\"0\n\rKeyspaceShard\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\"\xe3\x01\n\x07Journal\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x31\n\x0emigration_type\x18\x02 \x01(\x0e\x32\x19.binlogdata.MigrationType\x12\x0e\n\x06tables\x18\x03 \x03(\t\x12\x16\n\x0elocal_position\x18\x04 \x01(\t\x12*\n\x0bshard_gtids\x18\x05 \x03(\x0b\x32\x15.binlogdata.ShardGtid\x12/\n\x0cparticipants\x18\x06 \x03(\x0b\x32\x19.binlogdata.KeyspaceShard\x12\x14\n\x0creversed_ids\x18\x07 \x03(\x03\"\x9d\x02\n\x06VEvent\x12$\n\x04type\x18\x01 \x01(\x0e\x32\x16.binlogdata.VEventType\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x0b\n\x03\x64\x64l\x18\x04 \x01(\t\x12\'\n\trow_event\x18\x05 \x01(\x0b\x32\x14.binlogdata.RowEvent\x12+\n\x0b\x66ield_event\x18\x06 \x01(\x0b\x32\x16.binlogdata.FieldEvent\x12 \n\x05vgtid\x18\x07 \x01(\x0b\x32\x11.binlogdata.VGtid\x12$\n\x07journal\x18\x08 \x01(\x0b\x32\x13.binlogdata.Journal\x12\x0b\n\x03\x64ml\x18\t \x01(\t\x12\x14\n\x0c\x63urrent_time\x18\x14 \x01(\x03\"\xc7\x01\n\x0eVStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\"\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x12.binlogdata.Filter\"5\n\x0fVStreamResponse\x12\"\n\x06\x65vents\x18\x01 \x03(\x0b\x32\x12.binlogdata.VEvent\"\xc8\x01\n\x12VStreamRowsRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\r\n\x05query\x18\x04 \x01(\t\x12\"\n\x06lastpk\x18\x05 \x01(\x0b\x32\x12.query.QueryResult\"\x97\x01\n\x13VStreamRowsResponse\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x1e\n\x08pkfields\x18\x02 \x03(\x0b\x32\x0c.query.Field\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x1a\n\x06lastpk\x18\x05 \x01(\x0b\x32\n.query.Row*>\n\x0bOnDDLAction\x12\n\n\x06IGNORE\x10\x00\x12\x08\n\x04STOP\x10\x01\x12\x08\n\x04\x45XEC\x10\x02\x12\x0f\n\x0b\x45XEC_IGNORE\x10\x03*\xd1\x01\n\nVEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04GTID\x10\x01\x12\t\n\x05\x42\x45GIN\x10\x02\x12\n\n\x06\x43OMMIT\x10\x03\x12\x0c\n\x08ROLLBACK\x10\x04\x12\x07\n\x03\x44\x44L\x10\x05\x12\n\n\x06INSERT\x10\x06\x12\x0b\n\x07REPLACE\x10\x07\x12\n\n\x06UPDATE\x10\x08\x12\n\n\x06\x44\x45LETE\x10\t\x12\x07\n\x03SET\x10\n\x12\t\n\x05OTHER\x10\x0b\x12\x07\n\x03ROW\x10\x0c\x12\t\n\x05\x46IELD\x10\r\x12\r\n\tHEARTBEAT\x10\x0e\x12\t\n\x05VGTID\x10\x0f\x12\x0b\n\x07JOURNAL\x10\x10*\'\n\rMigrationType\x12\n\n\x06TABLES\x10\x00\x12\n\n\x06SHARDS\x10\x01\x42)Z\'vitess.io/vitess/go/vt/proto/binlogdatab\x06proto3') , dependencies=[vtrpc__pb2.DESCRIPTOR,query__pb2.DESCRIPTOR,topodata__pb2.DESCRIPTOR,]) @@ -52,8 +52,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=2880, - serialized_end=2942, + serialized_start=2904, + serialized_end=2966, ) _sym_db.RegisterEnumDescriptor(_ONDDLACTION) @@ -135,8 +135,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=2945, - serialized_end=3154, + serialized_start=2969, + serialized_end=3178, ) _sym_db.RegisterEnumDescriptor(_VEVENTTYPE) @@ -158,8 +158,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3156, - serialized_end=3195, + serialized_start=3180, + serialized_end=3219, ) _sym_db.RegisterEnumDescriptor(_MIGRATIONTYPE) @@ -679,6 +679,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='external_mysql', full_name='binlogdata.BinlogSource.external_mysql', index=7, + number=8, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -692,7 +699,7 @@ oneofs=[ ], serialized_start=1153, - serialized_end=1375, + serialized_end=1399, ) @@ -729,8 +736,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1377, - serialized_end=1443, + serialized_start=1401, + serialized_end=1467, ) @@ -767,8 +774,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1445, - serialized_end=1519, + serialized_start=1469, + serialized_end=1543, ) @@ -805,8 +812,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1521, - serialized_end=1583, + serialized_start=1545, + serialized_end=1607, ) @@ -850,8 +857,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1585, - serialized_end=1643, + serialized_start=1609, + serialized_end=1667, ) @@ -881,8 +888,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1645, - serialized_end=1696, + serialized_start=1669, + serialized_end=1720, ) @@ -919,8 +926,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1698, - serialized_end=1746, + serialized_start=1722, + serialized_end=1770, ) @@ -992,8 +999,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1749, - serialized_end=1976, + serialized_start=1773, + serialized_end=2000, ) @@ -1086,8 +1093,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1979, - serialized_end=2264, + serialized_start=2003, + serialized_end=2288, ) @@ -1145,8 +1152,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2267, - serialized_end=2466, + serialized_start=2291, + serialized_end=2490, ) @@ -1176,8 +1183,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2468, - serialized_end=2521, + serialized_start=2492, + serialized_end=2545, ) @@ -1235,8 +1242,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2524, - serialized_end=2724, + serialized_start=2548, + serialized_end=2748, ) @@ -1294,8 +1301,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2727, - serialized_end=2878, + serialized_start=2751, + serialized_end=2902, ) _BINLOGTRANSACTION_STATEMENT.fields_by_name['category'].enum_type = _BINLOGTRANSACTION_STATEMENT_CATEGORY