+ fixes

percona#30
percona#58

Author: Tarmok

go.mod

@@ -0,0 +1,19 @@
+module github.com/TarmoKople/go-mysql
+
+go 1.17
+
+require (
+	github.com/percona/go-mysql v0.0.0-20210427141028-73d29c6da78c
+	github.com/pkg/errors v0.8.1
+	github.com/shirou/gopsutil v0.0.0-20190323131628-2cbc9195c892
+	github.com/stretchr/testify v1.3.0
+)
+
+require (
+	github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-ole/go-ole v1.2.4 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
+	golang.org/x/sys v0.0.0-20190422165155-953cdadca894 // indirect
+)

go.sum

@@ -0,0 +1,25 @@
+github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8=
+github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
+github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
+github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
+github.com/percona/go-mysql v0.0.0-20210427141028-73d29c6da78c h1:1SZ7nS+kSaO63IpaKspf/gf8602QcgP2eXNPMNOIc0M=
+github.com/percona/go-mysql v0.0.0-20210427141028-73d29c6da78c/go.mod h1:/SGLf9OMxlnK6jq4mkFiImBcJXXk5jwD+lDrwDaGXcw=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/shirou/gopsutil v0.0.0-20190323131628-2cbc9195c892 h1:oiNB/s36DdNBEnulbhdj6zHS73U/wRQihnsoJwanqfM=
+github.com/shirou/gopsutil v0.0.0-20190323131628-2cbc9195c892/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc=
+github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U=
+github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

query/query.go

@@ -170,7 +170,10 @@ func Fingerprint(q string) string {
 		if Debug {
 			fmt.Printf("\n%d:%d %s/%s [%d:%d] %x %q\n", qi, fi, stateName[s], stateName[sqlState], cpFromOffset, cpToOffset, r, r)
 		}
-
+		// check `fi` overflow
+		if fi >= len(f) {
+			break
+		}
 		/**
 		 * 1. Skip parts of the query for certain states.
 		 */
@@ -379,6 +382,9 @@ func Fingerprint(q string) string {
 			valueNo++
 			if valueNo == 1 {
 				if qi-firstPar > 1 {
+					if qi-firstPar == 2 {
+						f = append(f, 0)
+					}
 					copy(f[fi:fi+4], "(?+)")
 					fi += 4
 				} else {

query/query_test.go

@@ -35,8 +35,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/percona/go-mysql/query"
-	_ "github.com/percona/go-mysql/test"
+	"github.com/TarmoKople/go-mysql/query"
+	_ "github.com/TarmoKople/go-mysql/test"
 )
 
 func TestFingerprintBasic(t *testing.T) {
@@ -556,6 +556,14 @@ func TestFingerprintPanicChallenge2(t *testing.T) {
 		"select ? ? ? ? from kamil",
 		query.Fingerprint(q),
 	)
+
+	q = "select col1 from tb1 where cond1 in(1) and cond2 in(2)"
+	assert.Equal(
+		t,
+		"select col1 from tb1 where cond1 in(?+) and cond2 in(?+)",
+		query.Fingerprint(q),
+	)
+
 }
 
 func TestFingerprintDashesInNames(t *testing.T) {
@@ -649,4 +657,13 @@ func TestFingerprintWithNumberInDbName(t *testing.T) {
 		"select 123foo from 123foo",
 		query.Fingerprint(q),
 	)
+
+	// fix fi overflow cause index out of range panic
+	q = "insert into tb values(1)"
+	assert.Equal(
+		t,
+		"insert into tb values(?+)",
+		query.Fingerprint(q),
+	)
+
 }