Skip to content

PMM-1989: fix panic #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

PMM-1989: fix panic #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d94962e
Add a test case for values
toshipp May 31, 2016
8d211f4
Allocate enough memory to replace (x) with (?+)
toshipp May 31, 2016
c4e6f1e
add buf init size in case of slice out of range memory
xuewindy Apr 10, 2017
5362bc2
Merge remote-tracking branch 'origin/pr/13' into PMM-1989_fix_panic
arvenil Feb 15, 2018
1dd1ae9
Merge remote-tracking branch 'origin/pr/22' into PMM-1989_fix_panic
arvenil Feb 15, 2018
d709876
cleanups
arvenil Feb 15, 2018
01a91dd
Merge branch 'master' into PMM-1989_fix_panic
arvenil May 10, 2018
9dec0c2
Merge branch 'master' into PMM-1989_fix_panic
rnovikovP Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions query/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const (
inMySQLCode // /*! MySQL-specific code */
)

var stateName map[byte]string = map[byte]string{
var stateName = map[byte]string{
0: "unknown",
1: "inWord",
2: "inNumber",
Expand All @@ -119,7 +119,7 @@ var stateName map[byte]string = map[byte]string{
}

// Debug prints very verbose tracing information to STDOUT.
var Debug bool = false
var Debug = true

// ReplaceNumbersInWords enables replacing numbers in words. For example:
// `SELECT c FROM org235.t` -> `SELECT c FROM org?.t`. For more examples
Expand All @@ -131,14 +131,15 @@ var ReplaceNumbersInWords = false
// - Collapse whitespace
// - Remove comments
// - Lowercase everything
// Additional trasnformations are performed which change the syntax of the
// Additional transformations are performed which change the syntax of the
// original query without affecting its performance characteristics. For
// example, "ORDER BY col ASC" is the same as "ORDER BY col", so "ASC" in the
// fingerprint is removed.
func Fingerprint(q string) string {
q += " " // need range to run off end of original query
prevWord := ""
f := make([]byte, len(q))
// allocate enough memory to replace (x) with (?+).
f := make([]byte, len(q)+len(q)/3)
fi := 0
pr := rune(0) // previous rune
s := unknown // current state
Expand Down
15 changes: 15 additions & 0 deletions query/query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,14 @@ func TestFingerprintBasic(t *testing.T) {
query.Fingerprint(q),
)

// Fingerprint Insert into tables;
q = "insert into t3 values(2);"
assert.Equal(
t,
"insert into t3 values(?+);",
query.Fingerprint(q),
)

// Fingerprint /* -- comment */ SELECT (bug 1174956)
q = "/* -- S++ SU ABORTABLE -- spd_user: rspadim */SELECT SQL_SMALL_RESULT SQL_CACHE DISTINCT centro_atividade FROM est_dia WHERE unidade_id=1001 AND item_id=67 AND item_id_red=573"
assert.Equal(
Expand All @@ -237,6 +245,13 @@ func TestFingerprintBasic(t *testing.T) {
query.Fingerprint(q),
)

q = "insert into foo (a) values(0)"
assert.Equal(
t,
"insert into foo (a) values(?+)",
query.Fingerprint(q),
)

q = "INSERT INTO t (ts) VALUES (NOW())"
assert.Equal(
t,
Expand Down