Skip to content

Commit 7153c75

Browse files
lance6716lance6716
committed
fix CI
1 parent eed6bc8 commit 7153c75

38 files changed

+48
-48
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ package main
124124

125125
import (
126126
"github.com/siddontang/go-log/log"
127-
"github.com/siddontang/go-mysql/canal"
127+
"github.com/go-mysql-org/go-mysql/canal"
128128
)
129129

130130
type MyEventHandler struct {

‎canal/canal.go

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

15-
"github.com/pingcap/errors"
16-
"github.com/pingcap/parser"
17-
"github.com/siddontang/go-log/log"
1815
"github.com/go-mysql-org/go-mysql/client"
1916
"github.com/go-mysql-org/go-mysql/dump"
2017
"github.com/go-mysql-org/go-mysql/mysql"
2118
"github.com/go-mysql-org/go-mysql/replication"
2219
"github.com/go-mysql-org/go-mysql/schema"
20+
"github.com/pingcap/errors"
21+
"github.com/pingcap/parser"
22+
"github.com/siddontang/go-log/log"
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/go-mysql-org/go-mysql/mysql"
14-
"github.com/go-mysql-org/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/pingcap/errors"
1110
"github.com/go-mysql-org/go-mysql/mysql"
11+
"github.com/pingcap/errors"
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/go-mysql-org/go-mysql/mysql"
14-
"github.com/go-mysql-org/go-mysql/schema"
1515
)
1616

1717
type dumpParseHandler struct {

‎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/siddontang/go-log/log"
76
"github.com/go-mysql-org/go-mysql/mysql"
7+
"github.com/siddontang/go-log/log"
88
)
99

1010
type masterInfo struct {

‎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/go-mysql-org/go-mysql/mysql"
13-
"github.com/go-mysql-org/go-mysql/replication"
14-
"github.com/go-mysql-org/go-mysql/schema"
1515
)
1616

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

‎client/auth.go

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

9-
"github.com/pingcap/errors"
109
. "github.com/go-mysql-org/go-mysql/mysql"
1110
"github.com/go-mysql-org/go-mysql/packet"
11+
"github.com/pingcap/errors"
1212
)
1313

1414
const defaultAuthPluginName = AUTH_NATIVE_PASSWORD

‎client/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ 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/go-mysql-org/go-mysql/test_util/test_keys"
1212

1313
"github.com/go-mysql-org/go-mysql/mysql"
1414
)

‎client/conn.go

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

10-
"github.com/pingcap/errors"
1110
. "github.com/go-mysql-org/go-mysql/mysql"
1211
"github.com/go-mysql-org/go-mysql/packet"
12+
"github.com/pingcap/errors"
1313
)
1414

1515
type Conn struct {

‎client/resp.go

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

10-
"github.com/pingcap/errors"
1110
. "github.com/go-mysql-org/go-mysql/mysql"
1211
"github.com/go-mysql-org/go-mysql/utils"
12+
"github.com/pingcap/errors"
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/pingcap/errors"
98
. "github.com/go-mysql-org/go-mysql/mysql"
9+
"github.com/pingcap/errors"
1010
)
1111

1212
type Stmt struct {

‎cmd/go-mysqlbinlog/main.go

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

12-
"github.com/pingcap/errors"
1312
"github.com/go-mysql-org/go-mysql/mysql"
1413
"github.com/go-mysql-org/go-mysql/replication"
14+
"github.com/pingcap/errors"
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/pingcap/errors"
109
"github.com/go-mysql-org/go-mysql/dump"
10+
"github.com/pingcap/errors"
1111
)
1212

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

‎driver/driver.go

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

12-
"github.com/pingcap/errors"
1312
"github.com/go-mysql-org/go-mysql/client"
1413
"github.com/go-mysql-org/go-mysql/mysql"
14+
"github.com/pingcap/errors"
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/go-mysql-org/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/pingcap/errors"
1211
"github.com/go-mysql-org/go-mysql/mysql"
12+
"github.com/pingcap/errors"
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/pingcap/check"
76
"github.com/go-mysql-org/go-mysql/mysql"
7+
. "github.com/pingcap/check"
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/pingcap/check"
109
"github.com/go-mysql-org/go-mysql/client"
10+
. "github.com/pingcap/check"
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/pingcap/check"
87
"github.com/go-mysql-org/go-mysql/mysql"
8+
. "github.com/pingcap/check"
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/pingcap/errors"
54
"github.com/go-mysql-org/go-mysql/mysql"
5+
"github.com/pingcap/errors"
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/pingcap/errors"
87
. "github.com/go-mysql-org/go-mysql/mysql"
8+
"github.com/pingcap/errors"
99
)
1010

1111
// Limiatation

‎failover/mysql_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/pingcap/errors"
87
. "github.com/go-mysql-org/go-mysql/mysql"
8+
"github.com/pingcap/errors"
99
)
1010

1111
type MysqlGTIDHandler struct {

‎mysql/rowdata.go

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

6-
"github.com/pingcap/errors"
76
"github.com/go-mysql-org/go-mysql/utils"
7+
"github.com/pingcap/errors"
88
)
99

1010
type RowData []byte

‎packet/conn.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"crypto/x509"
1414
"encoding/pem"
1515

16-
"github.com/pingcap/errors"
1716
. "github.com/go-mysql-org/go-mysql/mysql"
1817
"github.com/go-mysql-org/go-mysql/utils"
18+
"github.com/pingcap/errors"
1919
)
2020

2121
type BufPool struct {

‎replication/backup.go

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

10-
"github.com/pingcap/errors"
1110
. "github.com/go-mysql-org/go-mysql/mysql"
11+
"github.com/pingcap/errors"
1212
)
1313

1414
// StartBackup: Like mysqlbinlog remote raw backup

‎replication/binlogsyncer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"sync"
1111
"time"
1212

13+
"github.com/go-mysql-org/go-mysql/client"
14+
. "github.com/go-mysql-org/go-mysql/mysql"
1315
"github.com/pingcap/errors"
1416
uuid "github.com/satori/go.uuid"
1517
"github.com/siddontang/go-log/log"
16-
"github.com/go-mysql-org/go-mysql/client"
17-
. "github.com/go-mysql-org/go-mysql/mysql"
1818
)
1919

2020
var (

‎replication/json_binary.go

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

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

‎replication/replication_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"testing"
1111
"time"
1212

13-
. "github.com/pingcap/check"
14-
uuid "github.com/satori/go.uuid"
1513
"github.com/go-mysql-org/go-mysql/client"
1614
"github.com/go-mysql-org/go-mysql/mysql"
15+
. "github.com/pingcap/check"
16+
uuid "github.com/satori/go.uuid"
1717
)
1818

1919
// Use docker mysql to test, mysql is 3306, mariadb is 3316

‎replication/row_event.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"strconv"
1010
"time"
1111

12+
. "github.com/go-mysql-org/go-mysql/mysql"
1213
"github.com/pingcap/errors"
1314
"github.com/shopspring/decimal"
1415
"github.com/siddontang/go-log/log"
15-
. "github.com/go-mysql-org/go-mysql/mysql"
1616
"github.com/siddontang/go/hack"
1717
)
1818

‎schema/schema_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"fmt"
77
"testing"
88

9-
. "github.com/pingcap/check"
109
"github.com/go-mysql-org/go-mysql/client"
1110
_ "github.com/go-mysql-org/go-mysql/driver"
11+
. "github.com/pingcap/check"
1212
)
1313

1414
// use docker mysql for test

‎server/auth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"crypto/tls"
1010
"fmt"
1111

12-
"github.com/pingcap/errors"
1312
. "github.com/go-mysql-org/go-mysql/mysql"
13+
"github.com/pingcap/errors"
1414
)
1515

1616
var ErrAccessDenied = errors.New("access denied")

‎server/auth_switch_response.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"crypto/tls"
1010
"fmt"
1111

12-
"github.com/pingcap/errors"
1312
. "github.com/go-mysql-org/go-mysql/mysql"
13+
"github.com/pingcap/errors"
1414
)
1515

1616
func (c *Conn) handleAuthSwitchResponse() error {

‎server/caching_sha2_cache_test.go

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

12+
"github.com/go-mysql-org/go-mysql/mysql"
13+
"github.com/go-mysql-org/go-mysql/test_util/test_keys"
1214
_ "github.com/go-sql-driver/mysql"
1315
. "github.com/pingcap/check"
1416
"github.com/pingcap/errors"
1517
"github.com/siddontang/go-log/log"
16-
"github.com/go-mysql-org/go-mysql/mysql"
17-
"github.com/go-mysql-org/go-mysql/test_util/test_keys"
1818
)
1919

2020
var delay = 50

‎server/example/server_example.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package main
33
import (
44
"net"
55

6-
"github.com/siddontang/go-log/log"
76
"github.com/go-mysql-org/go-mysql/mysql"
87
"github.com/go-mysql-org/go-mysql/server"
98
"github.com/go-mysql-org/go-mysql/test_util/test_keys"
9+
"github.com/siddontang/go-log/log"
1010

1111
"crypto/tls"
1212
"time"

0 commit comments

Comments
 (0)