diff --git a/cmd/main.go b/cmd/main.go index 6dad51d..849e4f8 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -12,7 +12,7 @@ import ( "time" "github.com/juju/errors" - "github.com/localhots/bocadillo/mysql/slave" + "github.com/localhots/bocadillo/mysql/driver" "github.com/localhots/bocadillo/reader" ) @@ -27,7 +27,7 @@ func main() { validate((*id != 0), "Server ID is not set") validate((*file != ""), "Binary log file is not set") - reader, err := reader.New(*dsn, slave.Config{ + reader, err := reader.New(*dsn, driver.Config{ ServerID: uint32(*id), File: *file, Offset: uint32(*offset), diff --git a/mysql/slave/slave_conn.go b/mysql/driver/conn.go similarity index 97% rename from mysql/slave/slave_conn.go rename to mysql/driver/conn.go index b1b73f4..6cdf6b3 100644 --- a/mysql/slave/slave_conn.go +++ b/mysql/driver/conn.go @@ -1,4 +1,4 @@ -package slave +package driver import ( "context" @@ -6,7 +6,7 @@ import ( "os" "github.com/localhots/bocadillo/buffer" - "github.com/localhots/bocadillo/mysql/slave/internal/mysql" + "github.com/localhots/bocadillo/mysql/driver/internal/mysql" ) // Conn is a slave connection used to issue a binlog dump command. diff --git a/mysql/slave/internal/mysql/AUTHORS b/mysql/driver/internal/mysql/AUTHORS similarity index 100% rename from mysql/slave/internal/mysql/AUTHORS rename to mysql/driver/internal/mysql/AUTHORS diff --git a/mysql/slave/internal/mysql/CHANGELOG.md b/mysql/driver/internal/mysql/CHANGELOG.md similarity index 100% rename from mysql/slave/internal/mysql/CHANGELOG.md rename to mysql/driver/internal/mysql/CHANGELOG.md diff --git a/mysql/slave/internal/mysql/CONTRIBUTING.md b/mysql/driver/internal/mysql/CONTRIBUTING.md similarity index 100% rename from mysql/slave/internal/mysql/CONTRIBUTING.md rename to mysql/driver/internal/mysql/CONTRIBUTING.md diff --git a/mysql/slave/internal/mysql/LICENSE b/mysql/driver/internal/mysql/LICENSE similarity index 100% rename from mysql/slave/internal/mysql/LICENSE rename to mysql/driver/internal/mysql/LICENSE diff --git a/mysql/slave/internal/mysql/README.md b/mysql/driver/internal/mysql/README.md similarity index 100% rename from mysql/slave/internal/mysql/README.md rename to mysql/driver/internal/mysql/README.md diff --git a/mysql/slave/internal/mysql/appengine.go b/mysql/driver/internal/mysql/appengine.go similarity index 100% rename from mysql/slave/internal/mysql/appengine.go rename to mysql/driver/internal/mysql/appengine.go diff --git a/mysql/slave/internal/mysql/auth.go b/mysql/driver/internal/mysql/auth.go similarity index 100% rename from mysql/slave/internal/mysql/auth.go rename to mysql/driver/internal/mysql/auth.go diff --git a/mysql/slave/internal/mysql/auth_test.go b/mysql/driver/internal/mysql/auth_test.go similarity index 100% rename from mysql/slave/internal/mysql/auth_test.go rename to mysql/driver/internal/mysql/auth_test.go diff --git a/mysql/slave/internal/mysql/benchmark_test.go b/mysql/driver/internal/mysql/benchmark_test.go similarity index 100% rename from mysql/slave/internal/mysql/benchmark_test.go rename to mysql/driver/internal/mysql/benchmark_test.go diff --git a/mysql/slave/internal/mysql/bocadillo_api.go b/mysql/driver/internal/mysql/bocadillo_api.go similarity index 100% rename from mysql/slave/internal/mysql/bocadillo_api.go rename to mysql/driver/internal/mysql/bocadillo_api.go diff --git a/mysql/slave/internal/mysql/buffer.go b/mysql/driver/internal/mysql/buffer.go similarity index 100% rename from mysql/slave/internal/mysql/buffer.go rename to mysql/driver/internal/mysql/buffer.go diff --git a/mysql/slave/internal/mysql/collations.go b/mysql/driver/internal/mysql/collations.go similarity index 100% rename from mysql/slave/internal/mysql/collations.go rename to mysql/driver/internal/mysql/collations.go diff --git a/mysql/slave/internal/mysql/connection.go b/mysql/driver/internal/mysql/connection.go similarity index 100% rename from mysql/slave/internal/mysql/connection.go rename to mysql/driver/internal/mysql/connection.go diff --git a/mysql/slave/internal/mysql/connection_test.go b/mysql/driver/internal/mysql/connection_test.go similarity index 100% rename from mysql/slave/internal/mysql/connection_test.go rename to mysql/driver/internal/mysql/connection_test.go diff --git a/mysql/slave/internal/mysql/const.go b/mysql/driver/internal/mysql/const.go similarity index 100% rename from mysql/slave/internal/mysql/const.go rename to mysql/driver/internal/mysql/const.go diff --git a/mysql/slave/internal/mysql/driver.go b/mysql/driver/internal/mysql/driver.go similarity index 100% rename from mysql/slave/internal/mysql/driver.go rename to mysql/driver/internal/mysql/driver.go diff --git a/mysql/slave/internal/mysql/driver_test.go b/mysql/driver/internal/mysql/driver_test.go similarity index 100% rename from mysql/slave/internal/mysql/driver_test.go rename to mysql/driver/internal/mysql/driver_test.go diff --git a/mysql/slave/internal/mysql/dsn.go b/mysql/driver/internal/mysql/dsn.go similarity index 100% rename from mysql/slave/internal/mysql/dsn.go rename to mysql/driver/internal/mysql/dsn.go diff --git a/mysql/slave/internal/mysql/dsn_test.go b/mysql/driver/internal/mysql/dsn_test.go similarity index 100% rename from mysql/slave/internal/mysql/dsn_test.go rename to mysql/driver/internal/mysql/dsn_test.go diff --git a/mysql/slave/internal/mysql/errors.go b/mysql/driver/internal/mysql/errors.go similarity index 100% rename from mysql/slave/internal/mysql/errors.go rename to mysql/driver/internal/mysql/errors.go diff --git a/mysql/slave/internal/mysql/errors_test.go b/mysql/driver/internal/mysql/errors_test.go similarity index 100% rename from mysql/slave/internal/mysql/errors_test.go rename to mysql/driver/internal/mysql/errors_test.go diff --git a/mysql/slave/internal/mysql/fields.go b/mysql/driver/internal/mysql/fields.go similarity index 100% rename from mysql/slave/internal/mysql/fields.go rename to mysql/driver/internal/mysql/fields.go diff --git a/mysql/slave/internal/mysql/infile.go b/mysql/driver/internal/mysql/infile.go similarity index 100% rename from mysql/slave/internal/mysql/infile.go rename to mysql/driver/internal/mysql/infile.go diff --git a/mysql/slave/internal/mysql/packets.go b/mysql/driver/internal/mysql/packets.go similarity index 100% rename from mysql/slave/internal/mysql/packets.go rename to mysql/driver/internal/mysql/packets.go diff --git a/mysql/slave/internal/mysql/packets_test.go b/mysql/driver/internal/mysql/packets_test.go similarity index 100% rename from mysql/slave/internal/mysql/packets_test.go rename to mysql/driver/internal/mysql/packets_test.go diff --git a/mysql/slave/internal/mysql/result.go b/mysql/driver/internal/mysql/result.go similarity index 100% rename from mysql/slave/internal/mysql/result.go rename to mysql/driver/internal/mysql/result.go diff --git a/mysql/slave/internal/mysql/rows.go b/mysql/driver/internal/mysql/rows.go similarity index 100% rename from mysql/slave/internal/mysql/rows.go rename to mysql/driver/internal/mysql/rows.go diff --git a/mysql/slave/internal/mysql/statement.go b/mysql/driver/internal/mysql/statement.go similarity index 100% rename from mysql/slave/internal/mysql/statement.go rename to mysql/driver/internal/mysql/statement.go diff --git a/mysql/slave/internal/mysql/statement_test.go b/mysql/driver/internal/mysql/statement_test.go similarity index 100% rename from mysql/slave/internal/mysql/statement_test.go rename to mysql/driver/internal/mysql/statement_test.go diff --git a/mysql/slave/internal/mysql/transaction.go b/mysql/driver/internal/mysql/transaction.go similarity index 100% rename from mysql/slave/internal/mysql/transaction.go rename to mysql/driver/internal/mysql/transaction.go diff --git a/mysql/slave/internal/mysql/utils.go b/mysql/driver/internal/mysql/utils.go similarity index 100% rename from mysql/slave/internal/mysql/utils.go rename to mysql/driver/internal/mysql/utils.go diff --git a/mysql/slave/internal/mysql/utils_test.go b/mysql/driver/internal/mysql/utils_test.go similarity index 100% rename from mysql/slave/internal/mysql/utils_test.go rename to mysql/driver/internal/mysql/utils_test.go diff --git a/reader/enhanced_reader.go b/reader/enhanced_reader.go index 07c8c81..6660f11 100644 --- a/reader/enhanced_reader.go +++ b/reader/enhanced_reader.go @@ -9,7 +9,7 @@ import ( "github.com/juju/errors" "github.com/localhots/bocadillo/binlog" "github.com/localhots/bocadillo/mysql" - "github.com/localhots/bocadillo/mysql/slave" + "github.com/localhots/bocadillo/mysql/driver" "github.com/localhots/bocadillo/reader/schema" ) @@ -29,7 +29,7 @@ type EnhancedRowsEvent struct { } // NewEnhanced creates a new enhanced binary log reader. -func NewEnhanced(dsn string, sc slave.Config) (*EnhancedReader, error) { +func NewEnhanced(dsn string, sc driver.Config) (*EnhancedReader, error) { r, err := New(dsn, sc) if err != nil { return nil, err diff --git a/reader/reader.go b/reader/reader.go index 0862700..b097e1c 100644 --- a/reader/reader.go +++ b/reader/reader.go @@ -5,12 +5,12 @@ import ( "github.com/juju/errors" "github.com/localhots/bocadillo/binlog" - "github.com/localhots/bocadillo/mysql/slave" + "github.com/localhots/bocadillo/mysql/driver" ) // Reader is a binary log reader. type Reader struct { - conn *slave.Conn + conn *driver.Conn state binlog.Position format binlog.FormatDescription tableMap map[uint64]binlog.TableDescription @@ -34,8 +34,8 @@ var ( ) // New creates a new binary log reader. -func New(dsn string, sc slave.Config) (*Reader, error) { - conn, err := slave.Connect(dsn, sc) +func New(dsn string, sc driver.Config) (*Reader, error) { + conn, err := driver.Connect(dsn, sc) if err != nil { return nil, errors.Annotate(err, "establish slave connection") } diff --git a/tests/integration_test.go b/tests/integration_test.go index f202a4c..b676432 100644 --- a/tests/integration_test.go +++ b/tests/integration_test.go @@ -10,7 +10,7 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/localhots/bocadillo/binlog" - "github.com/localhots/bocadillo/mysql/slave" + "github.com/localhots/bocadillo/mysql/driver" "github.com/localhots/bocadillo/reader" ) @@ -46,7 +46,7 @@ func TestMain(m *testing.M) { os.Exit(exitCode) } -func getConfig() (dsn string, conf slave.Config) { +func getConfig() (dsn string, conf driver.Config) { envOrDefault := func(name, def string) string { if val := os.Getenv(name); val != "" { return val