Skip to content

change module name from siddontang/go-mysql to go-mysql-org/go-mysql #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 16, 2021
Merged

change module name from siddontang/go-mysql to go-mysql-org/go-mysql #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
280850c
change module name from siddontang/go-mysql to go-mysql-org/go-mysql
lance6716 Apr 16, 2021
eed6bc8
Merge branch 'master' into change-module-name
lance6716 Apr 16, 2021
7153c75
fix CI
lance6716 Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ You can use it as a MySQL slave to sync binlog from master then do something, li

```go
import (
"github.com/siddontang/go-mysql/replication"
"github.com/go-mysql-org/go-mysql/replication"
"os"
)
// Create a binlog syncer with a unique server id, the server id must be different from other MySQL's.
Expand Down Expand Up @@ -124,7 +124,7 @@ package main

import (
"github.com/siddontang/go-log/log"
"github.com/siddontang/go-mysql/canal"
"github.com/go-mysql-org/go-mysql/canal"
)

type MyEventHandler struct {
Expand Down Expand Up @@ -171,7 +171,7 @@ Client package supports a simple MySQL connection driver which you can use it to

```go
import (
"github.com/siddontang/go-mysql/client"
"github.com/go-mysql-org/go-mysql/client"
)

// Connect MySQL at 127.0.0.1:3306, with user root, an empty password and database test
Expand Down Expand Up @@ -253,7 +253,7 @@ so that most MySQL clients should be able to connect to the Server without modif

```go
import (
"github.com/siddontang/go-mysql/server"
"github.com/go-mysql-org/go-mysql/server"
"net"
)

Expand Down Expand Up @@ -307,7 +307,7 @@ package main
import (
"database/sql"

_ "github.com/siddontang/go-mysql/driver"
_ "github.com/go-mysql-org/go-mysql/driver"
)

func main() {
Expand Down
10 changes: 5 additions & 5 deletions canal/canal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import (
"sync/atomic"
"time"

"github.com/go-mysql-org/go-mysql/client"
"github.com/go-mysql-org/go-mysql/dump"
"github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/replication"
"github.com/go-mysql-org/go-mysql/schema"
"github.com/pingcap/errors"
"github.com/pingcap/parser"
"github.com/siddontang/go-log/log"
"github.com/siddontang/go-mysql/client"
"github.com/siddontang/go-mysql/dump"
"github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/replication"
"github.com/siddontang/go-mysql/schema"
)

// Canal can sync your MySQL data into everywhere, like Elasticsearch, Redis, etc...
Expand Down
4 changes: 2 additions & 2 deletions canal/canal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"testing"
"time"

"github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/replication"
. "github.com/pingcap/check"
"github.com/pingcap/errors"
"github.com/pingcap/parser"
"github.com/siddontang/go-log/log"
"github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/replication"
)

var testHost = flag.String("host", "127.0.0.1", "MySQL host")
Expand Down
2 changes: 1 addition & 1 deletion canal/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/go-mysql-org/go-mysql/mysql"
"github.com/pingcap/errors"
"github.com/siddontang/go-mysql/mysql"
)

type DumpConfig struct {
Expand Down
4 changes: 2 additions & 2 deletions canal/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strings"
"time"

"github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/schema"
"github.com/pingcap/errors"
"github.com/shopspring/decimal"
"github.com/siddontang/go-log/log"
"github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/schema"
)

type dumpParseHandler struct {
Expand Down
4 changes: 2 additions & 2 deletions canal/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package canal

import (
"github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/replication"
"github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/replication"
)

type EventHandler interface {
Expand Down
2 changes: 1 addition & 1 deletion canal/master.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package canal
import (
"sync"

"github.com/go-mysql-org/go-mysql/mysql"
"github.com/siddontang/go-log/log"
"github.com/siddontang/go-mysql/mysql"
)

type masterInfo struct {
Expand Down
4 changes: 2 additions & 2 deletions canal/rows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package canal
import (
"fmt"

"github.com/siddontang/go-mysql/replication"
"github.com/siddontang/go-mysql/schema"
"github.com/go-mysql-org/go-mysql/replication"
"github.com/go-mysql-org/go-mysql/schema"
)

// The action name for sync.
Expand Down
6 changes: 3 additions & 3 deletions canal/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"sync/atomic"
"time"

"github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/replication"
"github.com/go-mysql-org/go-mysql/schema"
"github.com/pingcap/errors"
"github.com/pingcap/parser/ast"
uuid "github.com/satori/go.uuid"
"github.com/siddontang/go-log/log"
"github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/replication"
"github.com/siddontang/go-mysql/schema"
)

func (c *Canal) startSyncer() (*replication.BinlogStreamer, error) {
Expand Down
4 changes: 2 additions & 2 deletions client/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"encoding/binary"
"fmt"

. "github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/packet"
"github.com/pingcap/errors"
. "github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/packet"
)

const defaultAuthPluginName = AUTH_NATIVE_PASSWORD
Expand Down
4 changes: 2 additions & 2 deletions client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"strings"
"testing"

"github.com/go-mysql-org/go-mysql/test_util/test_keys"
. "github.com/pingcap/check"
"github.com/pingcap/errors"
"github.com/siddontang/go-mysql/test_util/test_keys"

"github.com/siddontang/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/mysql"
)

var testHost = flag.String("host", "127.0.0.1", "MySQL server host")
Expand Down
4 changes: 2 additions & 2 deletions client/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strings"
"time"

. "github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/packet"
"github.com/pingcap/errors"
. "github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/packet"
)

type Conn struct {
Expand Down
2 changes: 1 addition & 1 deletion client/req.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/siddontang/go-mysql/utils"
"github.com/go-mysql-org/go-mysql/utils"
)

func (c *Conn) writeCommand(command byte) error {
Expand Down
4 changes: 2 additions & 2 deletions client/resp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"encoding/binary"
"encoding/pem"

. "github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/utils"
"github.com/pingcap/errors"
. "github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/utils"
"github.com/siddontang/go/hack"
)

Expand Down
2 changes: 1 addition & 1 deletion client/stmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"math"

. "github.com/go-mysql-org/go-mysql/mysql"
"github.com/pingcap/errors"
. "github.com/siddontang/go-mysql/mysql"
)

type Stmt struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/go-binlogparser/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"flag"
"os"

"github.com/siddontang/go-mysql/replication"
"github.com/go-mysql-org/go-mysql/replication"
)

var name = flag.String("name", "", "binlog file name")
Expand Down
4 changes: 2 additions & 2 deletions cmd/go-canal/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"syscall"
"time"

"github.com/siddontang/go-mysql/canal"
"github.com/siddontang/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/canal"
"github.com/go-mysql-org/go-mysql/mysql"
)

var host = flag.String("host", "127.0.0.1", "MySQL host")
Expand Down
4 changes: 2 additions & 2 deletions cmd/go-mysqlbinlog/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"fmt"
"os"

"github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/replication"
"github.com/pingcap/errors"
"github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/replication"
)

var host = flag.String("host", "127.0.0.1", "MySQL host")
Expand Down
2 changes: 1 addition & 1 deletion cmd/go-mysqldump/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"strings"

"github.com/go-mysql-org/go-mysql/dump"
"github.com/pingcap/errors"
"github.com/siddontang/go-mysql/dump"
)

var addr = flag.String("addr", "127.0.0.1:3306", "MySQL addr")
Expand Down
4 changes: 2 additions & 2 deletions driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"io"
"strings"

"github.com/go-mysql-org/go-mysql/client"
"github.com/go-mysql-org/go-mysql/mysql"
"github.com/pingcap/errors"
"github.com/siddontang/go-mysql/client"
"github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go/hack"
)

Expand Down
2 changes: 1 addition & 1 deletion dump/dumper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"os/exec"
"strings"

. "github.com/go-mysql-org/go-mysql/mysql"
"github.com/pingcap/errors"
"github.com/siddontang/go-log/log"
. "github.com/siddontang/go-mysql/mysql"
)

// Unlick mysqldump, Dumper is designed for parsing and syning data easily.
Expand Down
2 changes: 1 addition & 1 deletion dump/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strconv"
"strings"

"github.com/go-mysql-org/go-mysql/mysql"
"github.com/pingcap/errors"
"github.com/siddontang/go-mysql/mysql"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion dump/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package dump
import (
"strings"

"github.com/go-mysql-org/go-mysql/mysql"
. "github.com/pingcap/check"
"github.com/siddontang/go-mysql/mysql"
)

type parserTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion dump/schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"io/ioutil"
"os"

"github.com/go-mysql-org/go-mysql/client"
. "github.com/pingcap/check"
"github.com/siddontang/go-mysql/client"
)

type schemaTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion dump/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"flag"
"testing"

"github.com/go-mysql-org/go-mysql/mysql"
. "github.com/pingcap/check"
"github.com/siddontang/go-mysql/mysql"
)

// use docker mysql for test
Expand Down
2 changes: 1 addition & 1 deletion failover/failover.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package failover

import (
"github.com/go-mysql-org/go-mysql/mysql"
"github.com/pingcap/errors"
"github.com/siddontang/go-mysql/mysql"
)

// Failover will do below things after the master down
Expand Down
2 changes: 1 addition & 1 deletion failover/mariadb_gtid_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net"

. "github.com/go-mysql-org/go-mysql/mysql"
"github.com/pingcap/errors"
. "github.com/siddontang/go-mysql/mysql"
)

// Limiatation
Expand Down
2 changes: 1 addition & 1 deletion failover/mysql_gtid_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net"

. "github.com/go-mysql-org/go-mysql/mysql"
"github.com/pingcap/errors"
. "github.com/siddontang/go-mysql/mysql"
)

type MysqlGTIDHandler struct {
Expand Down
4 changes: 2 additions & 2 deletions failover/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package failover
import (
"fmt"

"github.com/siddontang/go-mysql/client"
. "github.com/siddontang/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/client"
. "github.com/go-mysql-org/go-mysql/mysql"
)

type User struct {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/siddontang/go-mysql
module github.com/go-mysql-org/go-mysql
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here


go 1.16

Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 h1:xT+JlYxNGqyT+XcU8
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07 h1:oI+RNwuC9jF2g2lP0u0cVEEZrc/AYBCuFdvwrLWM/6Q=
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07/go.mod h1:yFdBgwXP24JziuRl2NMUahT7nGLNOKi1SIiFxMttVD4=
github.com/go-mysql-org/go-mysql v1.1.1 h1:wxDpAS5+hHrwwdwhKtIWK+9bGDJ48Q7uZkeH8HW8kKY=
github.com/go-mysql-org/go-mysql v1.1.1/go.mod h1:k333ujeKfrlgcl4cWUyX03L3bvJ718j9jKqeHh2C+Nc=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
Expand Down
2 changes: 1 addition & 1 deletion mysql/field.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package mysql
import (
"encoding/binary"

"github.com/siddontang/go-mysql/utils"
"github.com/go-mysql-org/go-mysql/utils"
)

type FieldData []byte
Expand Down
Loading