Skip to content

Commit 83db121

Browse files
lance6716lance6716
authored
Merge branch 'master' into update_gtidset_fix
2 parents c4c5854 + 2a68c0e commit 83db121

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+110
-96
lines changed

‎README.md

+29-17
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ You can use it as a MySQL slave to sync binlog from master then do something, li
3636

3737
```go
3838
import (
39-
"github.com/siddontang/go-mysql/replication"
39+
"github.com/go-mysql-org/go-mysql/replication"
4040
"os"
4141
)
4242
// Create a binlog syncer with a unique server id, the server id must be different from other MySQL's.
@@ -120,20 +120,18 @@ You must use ROW format for binlog, full binlog row image is preferred, because
120120
A simple example:
121121

122122
```go
123-
cfg := NewDefaultConfig()
124-
cfg.Addr = "127.0.0.1:3306"
125-
cfg.User = "root"
126-
// We only care table canal_test in test db
127-
cfg.Dump.TableDB = "test"
128-
cfg.Dump.Tables = []string{"canal_test"}
123+
package main
129124

130-
c, err := NewCanal(cfg)
125+
import (
126+
"github.com/siddontang/go-log/log"
127+
"github.com/go-mysql-org/go-mysql/canal"
128+
)
131129

132130
type MyEventHandler struct {
133-
DummyEventHandler
131+
canal.DummyEventHandler
134132
}
135133

136-
func (h *MyEventHandler) OnRow(e *RowsEvent) error {
134+
func (h *MyEventHandler) OnRow(e *canal.RowsEvent) error {
137135
log.Infof("%s %v\n", e.Action, e.Rows)
138136
return nil
139137
}
@@ -142,11 +140,25 @@ func (h *MyEventHandler) String() string {
142140
return "MyEventHandler"
143141
}
144142

145-
// Register a handler to handle RowsEvent
146-
c.SetEventHandler(&MyEventHandler{})
143+
func main() {
144+
cfg := canal.NewDefaultConfig()
145+
cfg.Addr = "127.0.0.1:3306"
146+
cfg.User = "root"
147+
// We only care table canal_test in test db
148+
cfg.Dump.TableDB = "test"
149+
cfg.Dump.Tables = []string{"canal_test"}
150+
151+
c, err := canal.NewCanal(cfg)
152+
if err != nil {
153+
log.Fatal(err)
154+
}
155+
156+
// Register a handler to handle RowsEvent
157+
c.SetEventHandler(&MyEventHandler{})
147158

148-
// Start canal
149-
c.Run()
159+
// Start canal
160+
c.Run()
161+
}
150162
```
151163

152164
You can see [go-mysql-elasticsearch](https://github.com/siddontang/go-mysql-elasticsearch) for how to sync MySQL data into Elasticsearch.
@@ -159,7 +171,7 @@ Client package supports a simple MySQL connection driver which you can use it to
159171

160172
```go
161173
import (
162-
"github.com/siddontang/go-mysql/client"
174+
"github.com/go-mysql-org/go-mysql/client"
163175
)
164176

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

242254
```go
243255
import (
244-
"github.com/siddontang/go-mysql/server"
256+
"github.com/go-mysql-org/go-mysql/server"
245257
"net"
246258
)
247259

@@ -295,7 +307,7 @@ package main
295307
import (
296308
"database/sql"
297309

298-
_ "github.com/siddontang/go-mysql/driver"
310+
_ "github.com/go-mysql-org/go-mysql/driver"
299311
)
300312

301313
func main() {

‎canal/canal.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212
"sync/atomic"
1313
"time"
1414

15+
"github.com/go-mysql-org/go-mysql/client"
16+
"github.com/go-mysql-org/go-mysql/dump"
17+
"github.com/go-mysql-org/go-mysql/mysql"
18+
"github.com/go-mysql-org/go-mysql/replication"
19+
"github.com/go-mysql-org/go-mysql/schema"
1520
"github.com/pingcap/errors"
1621
"github.com/pingcap/parser"
1722
"github.com/siddontang/go-log/log"
18-
"github.com/siddontang/go-mysql/client"
19-
"github.com/siddontang/go-mysql/dump"
20-
"github.com/siddontang/go-mysql/mysql"
21-
"github.com/siddontang/go-mysql/replication"
22-
"github.com/siddontang/go-mysql/schema"
2323
)
2424

2525
// Canal can sync your MySQL data into everywhere, like Elasticsearch, Redis, etc...

‎canal/canal_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"testing"
77
"time"
88

9+
"github.com/go-mysql-org/go-mysql/mysql"
10+
"github.com/go-mysql-org/go-mysql/replication"
911
. "github.com/pingcap/check"
1012
"github.com/pingcap/errors"
1113
"github.com/pingcap/parser"
1214
"github.com/siddontang/go-log/log"
13-
"github.com/siddontang/go-mysql/mysql"
14-
"github.com/siddontang/go-mysql/replication"
1515
)
1616

1717
var testHost = flag.String("host", "127.0.0.1", "MySQL host")

‎canal/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"time"
88

99
"github.com/BurntSushi/toml"
10+
"github.com/go-mysql-org/go-mysql/mysql"
1011
"github.com/pingcap/errors"
11-
"github.com/siddontang/go-mysql/mysql"
1212
)
1313

1414
type DumpConfig struct {

‎canal/dump.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"strings"
88
"time"
99

10+
"github.com/go-mysql-org/go-mysql/mysql"
11+
"github.com/go-mysql-org/go-mysql/schema"
1012
"github.com/pingcap/errors"
1113
"github.com/shopspring/decimal"
1214
"github.com/siddontang/go-log/log"
13-
"github.com/siddontang/go-mysql/mysql"
14-
"github.com/siddontang/go-mysql/schema"
1515
)
1616

1717
type dumpParseHandler struct {

‎canal/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package canal
22

33
import (
4-
"github.com/siddontang/go-mysql/mysql"
5-
"github.com/siddontang/go-mysql/replication"
4+
"github.com/go-mysql-org/go-mysql/mysql"
5+
"github.com/go-mysql-org/go-mysql/replication"
66
)
77

88
type EventHandler interface {

‎canal/master.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package canal
33
import (
44
"sync"
55

6+
"github.com/go-mysql-org/go-mysql/mysql"
67
"github.com/siddontang/go-log/log"
7-
"github.com/siddontang/go-mysql/mysql"
88
)
99

1010
type masterInfo struct {

‎canal/rows.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package canal
33
import (
44
"fmt"
55

6-
"github.com/siddontang/go-mysql/replication"
7-
"github.com/siddontang/go-mysql/schema"
6+
"github.com/go-mysql-org/go-mysql/replication"
7+
"github.com/go-mysql-org/go-mysql/schema"
88
)
99

1010
// The action name for sync.

‎canal/sync.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import (
55
"sync/atomic"
66
"time"
77

8+
"github.com/go-mysql-org/go-mysql/mysql"
9+
"github.com/go-mysql-org/go-mysql/replication"
10+
"github.com/go-mysql-org/go-mysql/schema"
811
"github.com/pingcap/errors"
912
"github.com/pingcap/parser/ast"
1013
uuid "github.com/satori/go.uuid"
1114
"github.com/siddontang/go-log/log"
12-
"github.com/siddontang/go-mysql/mysql"
13-
"github.com/siddontang/go-mysql/replication"
14-
"github.com/siddontang/go-mysql/schema"
1515
)
1616

1717
func (c *Canal) startSyncer() (*replication.BinlogStreamer, error) {

‎client/auth.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"encoding/binary"
77
"fmt"
88

9+
. "github.com/go-mysql-org/go-mysql/mysql"
10+
"github.com/go-mysql-org/go-mysql/packet"
911
"github.com/pingcap/errors"
10-
. "github.com/siddontang/go-mysql/mysql"
11-
"github.com/siddontang/go-mysql/packet"
1212
)
1313

1414
const defaultAuthPluginName = AUTH_NATIVE_PASSWORD

‎client/client_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"strings"
77
"testing"
88

9+
"github.com/go-mysql-org/go-mysql/test_util/test_keys"
910
. "github.com/pingcap/check"
1011
"github.com/pingcap/errors"
11-
"github.com/siddontang/go-mysql/test_util/test_keys"
1212

13-
"github.com/siddontang/go-mysql/mysql"
13+
"github.com/go-mysql-org/go-mysql/mysql"
1414
)
1515

1616
var testHost = flag.String("host", "127.0.0.1", "MySQL server host")

‎client/conn.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"strings"
88
"time"
99

10+
. "github.com/go-mysql-org/go-mysql/mysql"
11+
"github.com/go-mysql-org/go-mysql/packet"
1012
"github.com/pingcap/errors"
11-
. "github.com/siddontang/go-mysql/mysql"
12-
"github.com/siddontang/go-mysql/packet"
1313
)
1414

1515
type Conn struct {

‎client/req.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package client
22

33
import (
4-
"github.com/siddontang/go-mysql/utils"
4+
"github.com/go-mysql-org/go-mysql/utils"
55
)
66

77
func (c *Conn) writeCommand(command byte) error {

‎client/resp.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"encoding/binary"
88
"encoding/pem"
99

10+
. "github.com/go-mysql-org/go-mysql/mysql"
11+
"github.com/go-mysql-org/go-mysql/utils"
1012
"github.com/pingcap/errors"
11-
. "github.com/siddontang/go-mysql/mysql"
12-
"github.com/siddontang/go-mysql/utils"
1313
"github.com/siddontang/go/hack"
1414
)
1515

‎client/stmt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"math"
77

8+
. "github.com/go-mysql-org/go-mysql/mysql"
89
"github.com/pingcap/errors"
9-
. "github.com/siddontang/go-mysql/mysql"
1010
)
1111

1212
type Stmt struct {

‎cmd/go-binlogparser/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"flag"
55
"os"
66

7-
"github.com/siddontang/go-mysql/replication"
7+
"github.com/go-mysql-org/go-mysql/replication"
88
)
99

1010
var name = flag.String("name", "", "binlog file name")

‎cmd/go-canal/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"syscall"
1010
"time"
1111

12-
"github.com/siddontang/go-mysql/canal"
13-
"github.com/siddontang/go-mysql/mysql"
12+
"github.com/go-mysql-org/go-mysql/canal"
13+
"github.com/go-mysql-org/go-mysql/mysql"
1414
)
1515

1616
var host = flag.String("host", "127.0.0.1", "MySQL host")

‎cmd/go-mysqlbinlog/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"fmt"
1010
"os"
1111

12+
"github.com/go-mysql-org/go-mysql/mysql"
13+
"github.com/go-mysql-org/go-mysql/replication"
1214
"github.com/pingcap/errors"
13-
"github.com/siddontang/go-mysql/mysql"
14-
"github.com/siddontang/go-mysql/replication"
1515
)
1616

1717
var host = flag.String("host", "127.0.0.1", "MySQL host")

‎cmd/go-mysqldump/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"os"
77
"strings"
88

9+
"github.com/go-mysql-org/go-mysql/dump"
910
"github.com/pingcap/errors"
10-
"github.com/siddontang/go-mysql/dump"
1111
)
1212

1313
var addr = flag.String("addr", "127.0.0.1:3306", "MySQL addr")

‎driver/driver.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"io"
1010
"strings"
1111

12+
"github.com/go-mysql-org/go-mysql/client"
13+
"github.com/go-mysql-org/go-mysql/mysql"
1214
"github.com/pingcap/errors"
13-
"github.com/siddontang/go-mysql/client"
14-
"github.com/siddontang/go-mysql/mysql"
1515
"github.com/siddontang/go/hack"
1616
)
1717

‎dump/dumper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"os/exec"
99
"strings"
1010

11+
. "github.com/go-mysql-org/go-mysql/mysql"
1112
"github.com/pingcap/errors"
1213
"github.com/siddontang/go-log/log"
13-
. "github.com/siddontang/go-mysql/mysql"
1414
)
1515

1616
// Unlick mysqldump, Dumper is designed for parsing and syning data easily.

‎dump/parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strconv"
99
"strings"
1010

11+
"github.com/go-mysql-org/go-mysql/mysql"
1112
"github.com/pingcap/errors"
12-
"github.com/siddontang/go-mysql/mysql"
1313
)
1414

1515
var (

‎dump/parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package dump
33
import (
44
"strings"
55

6+
"github.com/go-mysql-org/go-mysql/mysql"
67
. "github.com/pingcap/check"
7-
"github.com/siddontang/go-mysql/mysql"
88
)
99

1010
type parserTestSuite struct {

‎dump/schema_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"io/ioutil"
77
"os"
88

9+
"github.com/go-mysql-org/go-mysql/client"
910
. "github.com/pingcap/check"
10-
"github.com/siddontang/go-mysql/client"
1111
)
1212

1313
type schemaTestSuite struct {

‎dump/setup_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"flag"
55
"testing"
66

7+
"github.com/go-mysql-org/go-mysql/mysql"
78
. "github.com/pingcap/check"
8-
"github.com/siddontang/go-mysql/mysql"
99
)
1010

1111
// use docker mysql for test

‎failover/failover.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package failover
22

33
import (
4+
"github.com/go-mysql-org/go-mysql/mysql"
45
"github.com/pingcap/errors"
5-
"github.com/siddontang/go-mysql/mysql"
66
)
77

88
// Failover will do below things after the master down

‎failover/mariadb_gtid_handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"net"
66

7+
. "github.com/go-mysql-org/go-mysql/mysql"
78
"github.com/pingcap/errors"
8-
. "github.com/siddontang/go-mysql/mysql"
99
)
1010

1111
// Limiatation

0 commit comments

Comments
 (0)