Skip to content

Commit 0cba5f5

Browse files
lance6716lance6716
authored
Merge pull request #736 from tech-sumit/refractor
Code refractoring
2 parents a3037c5 + 7916208 commit 0cba5f5

18 files changed

+55
-55
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ A simple example:
123123
package main
124124

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

130130
type MyEventHandler struct {

‎canal/canal_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -304,19 +304,19 @@ func TestDropTableExp(t *testing.T) {
304304

305305
func TestWithoutSchemeExp(t *testing.T) {
306306
cases := []replication.QueryEvent{
307-
replication.QueryEvent{
307+
{
308308
Schema: []byte("test"),
309309
Query: []byte("drop table test0"),
310310
},
311-
replication.QueryEvent{
311+
{
312312
Schema: []byte("test"),
313313
Query: []byte("rename table `test0` to `testtmp`"),
314314
},
315-
replication.QueryEvent{
315+
{
316316
Schema: []byte("test"),
317317
Query: []byte("ALTER TABLE `test0` ADD `field2` DATE NULL AFTER `field1`;"),
318318
},
319-
replication.QueryEvent{
319+
{
320320
Schema: []byte("test"),
321321
Query: []byte("CREATE TABLE IF NOT EXISTS test0 (`id` int(10)) ENGINE=InnoDB"),
322322
},

‎client/client_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ func (s *clientTestSuite) TestConn_SetCapability(c *C) {
102102
mysql.CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA,
103103
}
104104

105-
for _, cap := range caps {
106-
c.Assert(s.c.ccaps&cap > 0, IsFalse)
107-
s.c.SetCapability(cap)
108-
c.Assert(s.c.ccaps&cap > 0, IsTrue)
109-
s.c.UnsetCapability(cap)
110-
c.Assert(s.c.ccaps&cap > 0, IsFalse)
105+
for _, capI := range caps {
106+
c.Assert(s.c.ccaps&capI > 0, IsFalse)
107+
s.c.SetCapability(capI)
108+
c.Assert(s.c.ccaps&capI > 0, IsTrue)
109+
s.c.UnsetCapability(capI)
110+
c.Assert(s.c.ccaps&capI > 0, IsFalse)
111111
}
112112
}
113113

@@ -186,7 +186,7 @@ func (s *clientTestSuite) TestConn_Select(c *C) {
186186
c.Assert(ss, Equals, "a")
187187

188188
f, _ := result.GetFloat(0, 1)
189-
c.Assert(f, Equals, float64(3.14))
189+
c.Assert(f, Equals, 3.14)
190190

191191
e, _ := result.GetString(0, 2)
192192
c.Assert(e, Equals, "test1")
@@ -195,7 +195,7 @@ func (s *clientTestSuite) TestConn_Select(c *C) {
195195
c.Assert(ss, Equals, "a")
196196

197197
f, _ = result.GetFloatByName(0, "f")
198-
c.Assert(f, Equals, float64(3.14))
198+
c.Assert(f, Equals, 3.14)
199199

200200
e, _ = result.GetStringByName(0, "e")
201201
c.Assert(e, Equals, "test1")
@@ -301,7 +301,7 @@ func (s *clientTestSuite) TestStmt_Select(c *C) {
301301
c.Assert(ss, Equals, "a")
302302

303303
f, _ := result.GetFloat(0, 1)
304-
c.Assert(f, Equals, float64(3.14))
304+
c.Assert(f, Equals, 3.14)
305305

306306
e, _ := result.GetString(0, 2)
307307
c.Assert(e, Equals, "test1")
@@ -310,7 +310,7 @@ func (s *clientTestSuite) TestStmt_Select(c *C) {
310310
c.Assert(ss, Equals, "a")
311311

312312
f, _ = result.GetFloatByName(0, "f")
313-
c.Assert(f, Equals, float64(3.14))
313+
c.Assert(f, Equals, 3.14)
314314

315315
e, _ = result.GetStringByName(0, "e")
316316
c.Assert(e, Equals, "test1")

‎client/resp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ func (c *Conn) readResultsetStreaming(data []byte, binary bool, result *Result,
336336
}
337337

338338
func (c *Conn) readResultColumns(result *Result) (err error) {
339-
var i int = 0
339+
var i = 0
340340
var data []byte
341341

342342
for {

‎client/stmt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (s *Stmt) write(args ...interface{}) error {
7474

7575
for i := range args {
7676
if args[i] == nil {
77-
nullBitmap[i/8] |= (1 << (uint(i) % 8))
77+
nullBitmap[i/8] |= 1 << (uint(i) % 8)
7878
paramTypes[i<<1] = MYSQL_TYPE_NULL
7979
continue
8080
}

‎driver/driver_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ func TestParseDSN(t *testing.T) {
8686
// Use different numbered domains to more readily see what has failed - since we
8787
// test in a loop we get the same line number on error
8888
testDSNs := map[string]connInfo{
89-
"user:password@localhost?db": connInfo{standardDSN: false, addr: "localhost", user: "user", password: "password", db: "db", params: url.Values{}},
90-
"[email protected]?db": connInfo{standardDSN: false, addr: "1.domain.com", user: "user", password: "", db: "db", params: url.Values{}},
91-
"user:[email protected]/db": connInfo{standardDSN: true, addr: "2.domain.com", user: "user", password: "password", db: "db", params: url.Values{}},
92-
"user:[email protected]/db?ssl=true": connInfo{standardDSN: true, addr: "3.domain.com", user: "user", password: "password", db: "db", params: url.Values{"ssl": []string{"true"}}},
93-
"user:[email protected]/db?ssl=custom": connInfo{standardDSN: true, addr: "4.domain.com", user: "user", password: "password", db: "db", params: url.Values{"ssl": []string{"custom"}}},
94-
"user:[email protected]/db?unused=param": connInfo{standardDSN: true, addr: "5.domain.com", user: "user", password: "password", db: "db", params: url.Values{"unused": []string{"param"}}},
89+
"user:password@localhost?db": {standardDSN: false, addr: "localhost", user: "user", password: "password", db: "db", params: url.Values{}},
90+
"[email protected]?db": {standardDSN: false, addr: "1.domain.com", user: "user", password: "", db: "db", params: url.Values{}},
91+
"user:[email protected]/db": {standardDSN: true, addr: "2.domain.com", user: "user", password: "password", db: "db", params: url.Values{}},
92+
"user:[email protected]/db?ssl=true": {standardDSN: true, addr: "3.domain.com", user: "user", password: "password", db: "db", params: url.Values{"ssl": []string{"true"}}},
93+
"user:[email protected]/db?ssl=custom": {standardDSN: true, addr: "4.domain.com", user: "user", password: "password", db: "db", params: url.Values{"ssl": []string{"custom"}}},
94+
"user:[email protected]/db?unused=param": {standardDSN: true, addr: "5.domain.com", user: "user", password: "password", db: "db", params: url.Values{"unused": []string{"param"}}},
9595
}
9696

9797
for supplied, expected := range testDSNs {

‎failover/mariadb_gtid_handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (h *MariadbGTIDHandler) Promote(s *Server) error {
2828
}
2929

3030
func (h *MariadbGTIDHandler) FindBestSlaves(slaves []*Server) ([]*Server, error) {
31-
bestSlaves := []*Server{}
31+
var bestSlaves []*Server
3232

3333
ps := make([]uint64, len(slaves))
3434

‎failover/mysql_gtid_handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (h *MysqlGTIDHandler) Promote(s *Server) error {
2727
func (h *MysqlGTIDHandler) FindBestSlaves(slaves []*Server) ([]*Server, error) {
2828
// MHA use Relay_Master_Log_File and Exec_Master_Log_Pos to determind which is the best slave
2929

30-
bestSlaves := []*Server{}
30+
var bestSlaves []*Server
3131

3232
ps := make([]Position, len(slaves))
3333

‎mysql/field.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (f *Field) Dump() []byte {
146146
f = &Field{}
147147
}
148148
if f.Data != nil {
149-
return []byte(f.Data)
149+
return f.Data
150150
}
151151

152152
l := len(f.Schema) + len(f.Table) + len(f.OrgTable) + len(f.Name) + len(f.OrgName) + len(f.DefaultValue) + 48

‎mysql/resultset_helper.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func BuildSimpleBinaryResultset(names []string, values [][]interface{}) (*Result
192192

193193
var b []byte
194194

195-
bitmapLen := ((len(names) + 7 + 2) >> 3)
195+
bitmapLen := (len(names) + 7 + 2) >> 3
196196

197197
for i, vs := range values {
198198
if len(vs) != len(r.Fields) {
@@ -220,7 +220,7 @@ func BuildSimpleBinaryResultset(names []string, values [][]interface{}) (*Result
220220
}
221221
}
222222
if value == nil {
223-
nullBitmap[(i+2)/8] |= (1 << (uint(i+2) % 8))
223+
nullBitmap[(i+2)/8] |= 1 << (uint(i+2) % 8)
224224
continue
225225
}
226226

‎replication/binlogsyncer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ func (b *BinlogSyncer) parseEvent(s *BinlogStreamer, data []byte) error {
774774

775775
needACK := false
776776
if b.cfg.SemiSyncEnabled && (data[0] == SemiSyncIndicator) {
777-
needACK = (data[1] == 0x01)
777+
needACK = data[1] == 0x01
778778
//skip semi sync header
779779
data = data[2:]
780780
}

‎replication/const.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const (
77

88
var (
99
//binlog header [ fe `bin` ]
10-
BinLogFileHeader []byte = []byte{0xfe, 0x62, 0x69, 0x6e}
10+
BinLogFileHeader = []byte{0xfe, 0x62, 0x69, 0x6e}
1111

1212
SemiSyncIndicator byte = 0xef
1313
)

‎replication/event.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ func (h *EventHeader) Dump(w io.Writer) {
108108
}
109109

110110
var (
111-
checksumVersionSplitMysql []int = []int{5, 6, 1}
112-
checksumVersionProductMysql int = (checksumVersionSplitMysql[0]*256+checksumVersionSplitMysql[1])*256 + checksumVersionSplitMysql[2]
111+
checksumVersionSplitMysql = []int{5, 6, 1}
112+
checksumVersionProductMysql = (checksumVersionSplitMysql[0]*256+checksumVersionSplitMysql[1])*256 + checksumVersionSplitMysql[2]
113113

114-
checksumVersionSplitMariaDB []int = []int{5, 3, 0}
115-
checksumVersionProductMariaDB int = (checksumVersionSplitMariaDB[0]*256+checksumVersionSplitMariaDB[1])*256 + checksumVersionSplitMariaDB[2]
114+
checksumVersionSplitMariaDB = []int{5, 3, 0}
115+
checksumVersionProductMariaDB = (checksumVersionSplitMariaDB[0]*256+checksumVersionSplitMariaDB[1])*256 + checksumVersionSplitMariaDB[2]
116116
)
117117

118118
// server version format X.Y.Zabc, a is not . or number
@@ -141,7 +141,7 @@ func splitServerVersion(server string) []int {
141141
func calcVersionProduct(server string) int {
142142
versionSplit := splitServerVersion(server)
143143

144-
return ((versionSplit[0]*256+versionSplit[1])*256 + versionSplit[2])
144+
return (versionSplit[0]*256+versionSplit[1])*256 + versionSplit[2]
145145
}
146146

147147
type FormatDescriptionEvent struct {

‎replication/json_binary.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ func (d *jsonBinaryDecoder) decodeDateTime(data []byte) interface{} {
444444
year := ym / 13
445445
month := ym % 13
446446
day := ymd % (1 << 5)
447-
hour := (hms >> 12)
447+
hour := hms >> 12
448448
minute := (hms >> 6) % (1 << 6)
449449
second := hms % (1 << 6)
450450
frac := v % (1 << 24)

‎replication/row_event.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,13 @@ func (e *TableMapEvent) decodeMeta(data []byte) error {
197197
for i, t := range e.ColumnType {
198198
switch t {
199199
case MYSQL_TYPE_STRING:
200-
var x uint16 = uint16(data[pos]) << 8 //real type
201-
x += uint16(data[pos+1]) //pack or field length
200+
var x = uint16(data[pos]) << 8 //real type
201+
x += uint16(data[pos+1]) //pack or field length
202202
e.ColumnMeta[i] = x
203203
pos += 2
204204
case MYSQL_TYPE_NEWDECIMAL:
205-
var x uint16 = uint16(data[pos]) << 8 //precision
206-
x += uint16(data[pos+1]) //decimals
205+
var x = uint16(data[pos]) << 8 //precision
206+
x += uint16(data[pos+1]) //decimals
207207
e.ColumnMeta[i] = x
208208
pos += 2
209209
case MYSQL_TYPE_VAR_STRING,
@@ -1002,7 +1002,7 @@ func (e *RowsEvent) parseFracTime(t interface{}) interface{} {
10021002

10031003
// see mysql sql/log_event.cc log_event_print_value
10041004
func (e *RowsEvent) decodeValue(data []byte, tp byte, meta uint16) (v interface{}, n int, err error) {
1005-
var length int = 0
1005+
var length = 0
10061006

10071007
if tp == MYSQL_TYPE_STRING {
10081008
if meta >= 256 {
@@ -1428,7 +1428,7 @@ func decodeDatetime2(data []byte, dec uint16) (interface{}, int, error) {
14281428

14291429
second := int(hms % (1 << 6))
14301430
minute := int((hms >> 6) % (1 << 6))
1431-
hour := int((hms >> 12))
1431+
hour := int(hms >> 12)
14321432

14331433
// DATETIME encoding for nonfractional part after MySQL 5.6.4
14341434
// https://dev.mysql.com/doc/internals/en/date-and-time-data-type-representation.html

‎replication/row_event_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1104,13 +1104,13 @@ func (_ *testDecodeSuite) TestTableMapHelperMaps(c *C) {
11041104
}
11051105

11061106
enumStrValueMap := map[int][]string{
1107-
38: []string{"a", "b"},
1108-
43: []string{"c", "d"},
1107+
38: {"a", "b"},
1108+
43: {"c", "d"},
11091109
}
11101110

11111111
setStrValueMap := map[int][]string{
1112-
39: []string{"1", "2"},
1113-
42: []string{"3", "4"},
1112+
39: {"1", "2"},
1113+
42: {"3", "4"},
11141114
}
11151115

11161116
geometryTypeMap := map[int]uint64{

‎server/conn_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ func (t *connTestSuite) TestCapability(c *check.C) {
8585
mysql.CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA,
8686
}
8787

88-
for _, cap := range caps {
89-
c.Assert(conn.HasCapability(cap), check.IsFalse)
90-
conn.SetCapability(cap)
91-
c.Assert(conn.HasCapability(cap), check.IsTrue)
92-
c.Assert(conn.Capability()&cap > 0, check.IsTrue)
93-
conn.UnsetCapability(cap)
94-
c.Assert(conn.HasCapability(cap), check.IsFalse)
88+
for _, capI := range caps {
89+
c.Assert(conn.HasCapability(capI), check.IsFalse)
90+
conn.SetCapability(capI)
91+
c.Assert(conn.HasCapability(capI), check.IsTrue)
92+
c.Assert(conn.Capability()&capI > 0, check.IsTrue)
93+
conn.UnsetCapability(capI)
94+
c.Assert(conn.HasCapability(capI), check.IsFalse)
9595
}
9696
}

‎server/resp_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ func (t *respConnTestSuite) TestConnWriteFieldValues(c *check.C) {
195195
conn := &Conn{Conn: packet.NewConn(clientConn)}
196196

197197
r, err := mysql.BuildSimpleTextResultset([]string{"c"}, [][]interface{}{
198-
[]interface{}{"d"},
199-
[]interface{}{nil},
198+
{"d"},
199+
{nil},
200200
})
201201

202202
c.Assert(err, check.IsNil)

0 commit comments

Comments
 (0)