Commit 255d1ad

authored

better max_allowed_packet parsing (#1661)

Remove `stringToInt()` and use `strconv.Atoi` instead.

1 parent 7403860 commit 255d1adCopy full SHA for 255d1ad

File tree

-11

lines changed

-11

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ package mysql`
`11`	`11`	`import (`
`12`	`12`	`"context"`
`13`	`13`	`"database/sql/driver"`
	`14`	`+ "fmt"`
`14`	`15`	`"net"`
`15`	`16`	`"os"`
`16`	`17`	`"strconv"`
`@@ -179,7 +180,12 @@ func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {`
`179`	`180`	`mc.Close()`
`180`	`181`	`return nil, err`
`181`	`182`	`}`
`182`		`- mc.maxAllowedPacket = stringToInt(maxap) - 1`
	`183`	`+ n, err := strconv.Atoi(string(maxap))`
	`184`	`+ if err != nil {`
	`185`	`+ mc.Close()`
	`186`	`+ return nil, fmt.Errorf("invalid max_allowed_packet value (%q): %w", maxap, err)`
	`187`	`+ }`
	`188`	`+ mc.maxAllowedPacket = n - 1`
`183`	`189`	`}`
`184`	`190`	`if mc.maxAllowedPacket < maxPacketSize {`
`185`	`191`	`mc.maxWriteSize = mc.maxAllowedPacket`

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -524,16 +524,6 @@ func uint64ToString(n uint64) []byte {`
`524`	`524`	`return a[i:]`
`525`	`525`	`}`
`526`	`526`
`527`		`-// treats string value as unsigned integer representation`
`528`		`-func stringToInt(b []byte) int {`
`529`		`- val := 0`
`530`		`- for i := range b {`
`531`		`- val *= 10`
`532`		`- val += int(b[i] - 0x30)`
`533`		`- }`
`534`		`- return val`
`535`		`-}`
`536`		`-`
`537`	`527`	`// returns the string read as a bytes slice, whether the value is NULL,`
`538`	`528`	`// the number of bytes read and an error, in case the string is longer than`
`539`	`529`	`// the input slice`

Comments

(0)