-
-
Notifications
You must be signed in to change notification settings - Fork 8
dbutil: rewrite query placeholders without regexp #37
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package dbutil | ||
|
|
||
| import ( | ||
| "regexp" | ||
| "testing" | ||
| ) | ||
|
|
||
| var positionalParamRegex = regexp.MustCompile(`\$(\d+)`) | ||
|
|
||
| func regexReplacePositionalParams(query string) string { | ||
| return positionalParamRegex.ReplaceAllString(query, "?$1") | ||
| } | ||
|
|
||
| func TestReplacePositionalParams(t *testing.T) { | ||
| cases := []string{ | ||
| "", | ||
| "$", | ||
| "$1", | ||
| "$12", | ||
| "a$", | ||
| "$a", | ||
| "$$1", | ||
| "$1$2$3", | ||
| "$ 1", | ||
| "no placeholders at all", | ||
| "trailing dollar $", | ||
| "SELECT session FROM whatsmeow_sessions WHERE our_jid=$1 AND their_id=$2", | ||
| "INSERT INTO whatsmeow_sessions (our_jid, their_id, session) VALUES ($1, $2, $3) ON CONFLICT (our_jid, their_id) DO UPDATE SET session=excluded.session", | ||
| "SELECT their_id, session FROM whatsmeow_sessions WHERE our_jid=$1 AND their_id IN ($2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12)", | ||
| "WHERE a=$2 AND b=$1", | ||
| "cost: US$50 AND id=$7", | ||
| "weird $0 but valid", | ||
| "unicode é$1ç $2ü", | ||
| "$999999999999", | ||
| } | ||
| for _, query := range cases { | ||
| expected := regexReplacePositionalParams(query) | ||
| actual := replacePositionalParams(query) | ||
| if actual != expected { | ||
| t.Errorf("mismatch for %q:\nregexp: %q\nscanner: %q", query, expected, actual) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Generated coverage: every 3-character combination of a small relevant | ||
| // alphabet must behave identically to the regexp it replaces. | ||
| func TestReplacePositionalParamsExhaustive(t *testing.T) { | ||
| alphabet := []byte{'$', '1', '0', 'a', ' ', '?'} | ||
| var build func(prefix string, depth int) | ||
| build = func(prefix string, depth int) { | ||
| expected := regexReplacePositionalParams(prefix) | ||
| actual := replacePositionalParams(prefix) | ||
| if actual != expected { | ||
| t.Errorf("mismatch for %q: regexp=%q scanner=%q", prefix, expected, actual) | ||
| } | ||
| if depth == 0 { | ||
| return | ||
| } | ||
| for _, c := range alphabet { | ||
| build(prefix+string(c), depth-1) | ||
| } | ||
| } | ||
| build("", 4) | ||
| } | ||
|
|
||
| func TestReplacePositionalParamsNoAllocWithoutPlaceholders(t *testing.T) { | ||
| query := "SELECT * FROM table WHERE nothing" | ||
| allocs := testing.AllocsPerRun(100, func() { | ||
| _ = replacePositionalParams(query) | ||
| }) | ||
| if allocs != 0 { | ||
| t.Errorf("expected 0 allocations for query without placeholders, got %.1f", allocs) | ||
| } | ||
| } | ||
|
|
||
| func BenchmarkReplacePositionalParams(b *testing.B) { | ||
| query := "INSERT INTO whatsmeow_sessions (our_jid, their_id, session) VALUES ($1, $2, $3) ON CONFLICT (our_jid, their_id) DO UPDATE SET session=excluded.session" | ||
| b.Run("scanner", func(b *testing.B) { | ||
| b.ReportAllocs() | ||
| for i := 0; i < b.N; i++ { | ||
| _ = replacePositionalParams(query) | ||
| } | ||
| }) | ||
| b.Run("regexp", func(b *testing.B) { | ||
| b.ReportAllocs() | ||
| for i := 0; i < b.N; i++ { | ||
| _ = regexReplacePositionalParams(query) | ||
| } | ||
| }) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.