Merge branch 'master' into tls-in-driver

Author: lance6716

CHANGELOG.md

@@ -1,3 +1,26 @@
+### Tag v1.5.0 (2022-04-30)
+* Replacing github.com/satori/go.uuid with github.com/google/uuid. [#690](https://github.com/go-mysql-org/go-mysql/pull/690) ([martinhrvn](https://github.com/martinhrvn))
+* Fix dump gtid regexp. [#688](https://github.com/go-mysql-org/go-mysql/pull/688) ([yrbb](https://github.com/yrbb))
+* Utilise byteSlice as a part of struct to avoid allocations. [#686](https://github.com/go-mysql-org/go-mysql/pull/686) ([moredure](https://github.com/moredure))
+* Update bytes_buffer_pool.go. [#685](https://github.com/go-mysql-org/go-mysql/pull/685) ([moredure](https://github.com/moredure))
+* Add go1.18 to the test matrix. [#684](https://github.com/go-mysql-org/go-mysql/pull/684) ([moredure](https://github.com/moredure))
+* Add 1.17 version into the test matrix. [#683](https://github.com/go-mysql-org/go-mysql/pull/683) ([moredure](https://github.com/moredure))
+* Stop using channel for memory pooling. [#682](https://github.com/go-mysql-org/go-mysql/pull/682) ([moredure](https://github.com/moredure))
+* Fix TIME value near zero will become zero. [#678](https://github.com/go-mysql-org/go-mysql/pull/678) ([lance6716](https://github.com/lance6716))
+* Fixed reading connection attributes on server side. [#676](https://github.com/go-mysql-org/go-mysql/pull/676) ([skoef](https://github.com/skoef))
+* Support client connection attributes on the client side. [#675](https://github.com/go-mysql-org/go-mysql/pull/675) ([skoef](https://github.com/skoef))
+* Support client connection attributes on the server side. [#672](https://github.com/go-mysql-org/go-mysql/pull/672) ([skoef](https://github.com/skoef))
+* Added constants for COM_SET_OPTION. [#670](https://github.com/go-mysql-org/go-mysql/pull/670) ([skoef](https://github.com/skoef))
+* Implemented ExecuteMultiple. [#668](https://github.com/go-mysql-org/go-mysql/pull/668) ([skoef](https://github.com/skoef))
+* Add MysqlGTIDSet.Add() and Minus() methods. [#667](https://github.com/go-mysql-org/go-mysql/pull/667) ([ostinru](https://github.com/ostinru))
+* Enabled ineffassign in golangci. [#666](https://github.com/go-mysql-org/go-mysql/pull/666) ([skoef](https://github.com/skoef))
+* Enabled gosimple in golangci. [#665](https://github.com/go-mysql-org/go-mysql/pull/665) ([skoef](https://github.com/skoef))
+* Add MysqlGTIDSet.Add() and Minus() methods. [#662](https://github.com/go-mysql-org/go-mysql/pull/662) ([ostinru](https://github.com/ostinru))
+* Store json as string in rows events. [#658](https://github.com/go-mysql-org/go-mysql/pull/658) ([D3Hunter](https://github.com/D3Hunter))
+* Set slave_uuid and replica_uuid. [#656](https://github.com/go-mysql-org/go-mysql/pull/656) ([lance6716](https://github.com/lance6716))
+* Fix malformed packet and a panic. [#655](https://github.com/go-mysql-org/go-mysql/pull/655) ([lance6716](https://github.com/lance6716))
+* Fix fetchIndexesViaSqlDB/NewTableFromSqlDB for MySQL 8.0. [#527](https://github.com/go-mysql-org/go-mysql/pull/527) ([RobinGeuze](https://github.com/RobinGeuze))
+
 ### Tag v1.4.0 (2021-12-15)
 * Fix that forget to readOK after writing. [#652](https://github.com/go-mysql-org/go-mysql/pull/652) ([lance6716](https://github.com/lance6716))
 * Packet: memory optimization for reading network packet. [#651](https://github.com/go-mysql-org/go-mysql/pull/651) ([zr-hebo](https://github.com/zr-hebo))

README.md

@@ -9,10 +9,10 @@ A pure go library to handle MySQL network protocol and replication.
 ## How to migrate to this repo
 To change the used package in your repo it's enough to add this `replace` directive to your `go.mod`:
 ```
-replace github.com/siddontang/go-mysql => github.com/go-mysql-org/go-mysql v1.4.0
+replace github.com/siddontang/go-mysql => github.com/go-mysql-org/go-mysql v1.5.0
 ```
 
-v1.4.0 - is the last tag in repo, feel free to choose what you want.
+v1.5.0 - is the last tag in repo, feel free to choose what you want.
 
 ## Changelog
 This repo uses [Changelog](CHANGELOG.md).

canal/sync.go

@@ -8,9 +8,9 @@ import (
 "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/google/uuid"
 "github.com/pingcap/errors"
 "github.com/pingcap/parser/ast"
-uuid "github.com/satori/go.uuid"
 "github.com/siddontang/go-log/log"
 )
 

client/conn.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+"bytes"
 "context"
 "crypto/tls"
 "fmt"
@@ -223,30 +224,30 @@ func (c *Conn) ExecuteMultiple(query string, perResultCallback ExecPerResultCall
 return nil, errors.Trace(err)
 }
 
-var buf []byte
 var err error
 var result *Result
-defer utils.ByteSlicePut(buf)
+
+bs := utils.ByteSliceGet(16)
+defer utils.ByteSlicePut(bs)
 
 for {
-buf, err = c.ReadPacketReuseMem(utils.ByteSliceGet(16)[:0])
+bs.B, err = c.ReadPacketReuseMem(bs.B[:0])
 if err != nil {
 return nil, errors.Trace(err)
 }
 
-switch buf[0] {
+switch bs.B[0] {
 case OK_HEADER:
-result, err = c.handleOKPacket(buf)
+result, err = c.handleOKPacket(bs.B)
 case ERR_HEADER:
-err = c.handleErrorPacket(append([]byte{}, buf...))
+err = c.handleErrorPacket(bytes.Repeat(bs.B, 1))
 result = nil
 case LocalInFile_HEADER:
 err = ErrMalformPacket
 result = nil
 default:
-result, err = c.readResultset(buf, false)
+result, err = c.readResultset(bs.B, false)
 }
-
 // call user-defined callback
 perResultCallback(result, err)
 

client/req.go

@@ -21,11 +21,11 @@ func (c *Conn) writeCommandBuf(command byte, arg []byte) error {
 
 length := len(arg) + 1
 data := utils.ByteSliceGet(length + 4)
-data[4] = command
+data.B[4] = command
 
-copy(data[5:], arg)
+copy(data.B[5:], arg)
 
-err := c.WritePacket(data)
+err := c.WritePacket(data.B)
 
 utils.ByteSlicePut(data)
 

client/resp.go

@@ -216,38 +216,42 @@ func (c *Conn) readOK() (*Result, error) {
 }
 
 func (c *Conn) readResult(binary bool) (*Result, error) {
-firstPkgBuf, err := c.ReadPacketReuseMem(utils.ByteSliceGet(16)[:0])
-defer utils.ByteSlicePut(firstPkgBuf)
-
+bs := utils.ByteSliceGet(16)
+defer utils.ByteSlicePut(bs)
+var err error
+bs.B, err = c.ReadPacketReuseMem(bs.B[:0])
 if err != nil {
 return nil, errors.Trace(err)
 }
 
-if firstPkgBuf[0] == OK_HEADER {
-return c.handleOKPacket(firstPkgBuf)
-} else if firstPkgBuf[0] == ERR_HEADER {
-return nil, c.handleErrorPacket(append([]byte{}, firstPkgBuf...))
-} else if firstPkgBuf[0] == LocalInFile_HEADER {
+switch bs.B[0] {
+case OK_HEADER:
+return c.handleOKPacket(bs.B)
+case ERR_HEADER:
+return nil, c.handleErrorPacket(bytes.Repeat(bs.B, 1))
+case LocalInFile_HEADER:
 return nil, ErrMalformPacket
+default:
+return c.readResultset(bs.B, binary)
 }
-
-return c.readResultset(firstPkgBuf, binary)
 }
 
 func (c *Conn) readResultStreaming(binary bool, result *Result, perRowCb SelectPerRowCallback, perResCb SelectPerResultCallback) error {
-firstPkgBuf, err := c.ReadPacketReuseMem(utils.ByteSliceGet(16)[:0])
-defer utils.ByteSlicePut(firstPkgBuf)
-
+bs := utils.ByteSliceGet(16)
+defer utils.ByteSlicePut(bs)
+var err error
+bs.B, err = c.ReadPacketReuseMem(bs.B[:0])
 if err != nil {
 return errors.Trace(err)
 }
 
-if firstPkgBuf[0] == OK_HEADER {
+switch bs.B[0] {
+case OK_HEADER:
 // https://dev.mysql.com/doc/internals/en/com-query-response.html
 // 14.6.4.1 COM_QUERY Response
 // If the number of columns in the resultset is 0, this is a OK_Packet.
 
-okResult, err := c.handleOKPacket(firstPkgBuf)
+okResult, err := c.handleOKPacket(bs.B)
 if err != nil {
 return errors.Trace(err)
 }
@@ -262,13 +266,13 @@ func (c *Conn) readResultStreaming(binary bool, result *Result, perRowCb SelectP
 result.Reset(0)
 }
 return nil
-} else if firstPkgBuf[0] == ERR_HEADER {
-return c.handleErrorPacket(append([]byte{}, firstPkgBuf...))
-} else if firstPkgBuf[0] == LocalInFile_HEADER {
+case ERR_HEADER:
+return c.handleErrorPacket(bytes.Repeat(bs.B, 1))
+case LocalInFile_HEADER:
 return ErrMalformPacket
+default:
+return c.readResultsetStreaming(bs.B, binary, result, perRowCb, perResCb)
 }
-
-return c.readResultsetStreaming(firstPkgBuf, binary, result, perRowCb, perResCb)
 }
 
 func (c *Conn) readResultset(data []byte, binary bool) (*Result, error) {

dump/parser.go

@@ -35,7 +35,7 @@ func init() {
 // The pattern will only match MySQL GTID, as you know SET GLOBAL gtid_slave_pos='0-1-4' is used for MariaDB.
 // SET @@GLOBAL.GTID_PURGED='1638041a-0457-11e9-bb9f-00505690b730:1-429405150';
 // https://dev.mysql.com/doc/refman/5.7/en/replication-gtids-concepts.html
-gtidExp = regexp.MustCompile(`(\w{8}(-\w{4}){3}-\w{12}(:\d+-\d+)+)`)
+gtidExp = regexp.MustCompile(`(\w{8}(-\w{4}){3}-\w{12}(:\d+(-\d+)?)+)`)
 }
 
 // Parse the dump data with Dumper generate.

dump/parser_test.go

@@ -44,6 +44,11 @@ e7574090-b123-11e8-8bb4-005056a29643:1-12'
 `,
 "e50bd2d3-6ad7-11e9-890c-42010af0017c:1-5291126581:5291126583-5323107666",
 },
+{`SET @@GLOBAL.GTID_PURGED='071a84e8-b253-11e8-8472-005056a27e86:1,
+2337be48-0456-11e9-bd1c-00505690543b:1-7,
+5f1eea9e-b1e5-11e8-bc77-005056a221ed:1-144609156,
+e7574090-b123-11e8-8bb4-005056a29643:1'
+`, "071a84e8-b253-11e8-8472-005056a27e86:1,2337be48-0456-11e9-bd1c-00505690543b:1-7,5f1eea9e-b1e5-11e8-bc77-005056a221ed:1-144609156,e7574090-b123-11e8-8bb4-005056a29643:1"},
 }
 
 for _, tt := range tbls {

dump/setup_test.go

@@ -10,7 +10,7 @@ import (
 
 // use docker mysql for test
 var host = flag.String("host", "127.0.0.1", "MySQL host")
-var port = flag.Int("port", 3306, "MySQL host")
+var port = flag.Int("port", 3306, "MySQL port")
 
 var execution = flag.String("exec", "mysqldump", "mysqldump execution path")
 

go.mod

@@ -5,12 +5,12 @@ go 1.16
 require (
 github.com/BurntSushi/toml v0.3.1
 github.com/go-sql-driver/mysql v1.5.0
+github.com/google/uuid v1.3.0
 github.com/jmoiron/sqlx v1.3.3
 github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8
 github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3
 github.com/pingcap/log v0.0.0-20210317133921-96f4fcab92a4 // indirect
 github.com/pingcap/parser v0.0.0-20210415081931-48e7f467fd74
-github.com/satori/go.uuid v1.2.0
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24
 github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
 github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07