Merge branch 'master' of github.com:go-mysql-org/go-mysql into fix-actual-master

Signed-off-by: lance6716 <[email protected]>

Author: lance6716

canal/canal.go

@@ -462,6 +462,7 @@ func (c *Canal) prepareSyncer() error {
 		Logger:                  c.cfg.Logger,
 		Dialer:                  c.cfg.Dialer,
 		Localhost:               c.cfg.Localhost,
+		EventCacheCount:         c.cfg.EventCacheCount,
 		RowsEventDecodeFunc: func(event *replication.RowsEvent, data []byte) error {
 			pos, err := event.DecodeHeader(data)
 			if err != nil {

canal/config.go

@@ -107,6 +107,11 @@ type Config struct {
 
 	// Set Localhost
 	Localhost string
+
+	// EventCacheCount is the capacity of the BinlogStreamer internal event channel.
+	// the default value is 10240.
+	// if you table contain large columns, you can decrease this value to avoid OOM.
+	EventCacheCount int
 }
 
 func NewConfigWithFile(name string) (*Config, error) {

cmd/go-mysqldump/main.go

@@ -33,7 +33,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if len(*ignoreTables) == 0 {
+	if len(*ignoreTables) > 0 {
 		subs := strings.Split(*ignoreTables, ",")
 		for _, sub := range subs {
 			if seps := strings.Split(sub, "."); len(seps) == 2 {

mysql/util.go

@@ -130,10 +130,13 @@ func AppendLengthEncodedInteger(b []byte, n uint64) []byte {
 
 func RandomBuf(size int) []byte {
 	buf := make([]byte, size)
-	mrand.Seed(time.Now().UTC().UnixNano())
+	// When this project supports golang 1.20 as a minimum, then this mrand.New(...)
+	// line can be eliminated and the random number can be generated by simply
+	// calling mrand.Intn()
+	random := mrand.New(mrand.NewSource(time.Now().UTC().UnixNano()))
 	min, max := 30, 127
 	for i := 0; i < size; i++ {
-		buf[i] = byte(min + mrand.Intn(max-min))
+		buf[i] = byte(min + random.Intn(max-min))
 	}
 	return buf
 }
@@ -197,7 +200,10 @@ func PutLengthEncodedInt(n uint64) []byte {
 	case n <= 0xffffff:
 		return []byte{0xfd, byte(n), byte(n >> 8), byte(n >> 16)}
 
-	default: // n <= 0xffffffffffffffff:
+	default:
+		// handles case n <= 0xffffffffffffffff
+		// using 'default' instead of 'case' to avoid static analysis error
+		// SA4003: every value of type uint64 is <= math.MaxUint64
 		return []byte{0xfe, byte(n), byte(n >> 8), byte(n >> 16), byte(n >> 24),
 			byte(n >> 32), byte(n >> 40), byte(n >> 48), byte(n >> 56)}
 	}