rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-07-17 10:01:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Repair bug in regexp split performance improvements.

Browse Source 
Commit c8ea87e4b introduced a temporary conversion buffer for
substrings extracted during regexp splits. Unfortunately the code that
sized it was failing to ignore the effects of ignored degenerate
regexp matches, so for regexp_split_* calls it could under-size the
buffer in such cases.

Fix, and add some regression test cases (though those will only catch
the bug if run in a multibyte encoding).

Backpatch to 9.3 as the faulty code was.

Thanks to the PostGIS project, Regina Obe and Paul Ramsey for the
report (via IRC) and assistance in analysis. Patch by me.
This commit is contained in:
Andrew Gierth 2018-09-12 19:31:06 +01:00
parent 84a3a1e55c
commit 03e0bc1171
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/utils/adt/regexp.c
View File

@ -936,6 +936,7 @@ setup_regexp_matches(text *orig_str, text *pattern, text *flags,
int array_len;
int array_idx;
int prev_match_end;
int prev_valid_match_end;
int start_search;
int maxlen = 0; /* largest fetch length in characters */
@ -991,6 +992,7 @@ setup_regexp_matches(text *orig_str, text *pattern, text *flags,
/* search for the pattern, perhaps repeatedly */
prev_match_end = 0;
prev_valid_match_end = 0;
start_search = 0;
while (RE_wchar_execute(cpattern, wide_str, wide_len, start_search,
pmatch_len, pmatch))
@ -1043,13 +1045,15 @@ setup_regexp_matches(text *orig_str, text *pattern, text *flags,
matchctx->nmatches++;
/*
* check length of unmatched portion between end of previous match
* and start of current one
* check length of unmatched portion between end of previous valid
* (nondegenerate, or degenerate but not ignored) match and start
* of current one
*/
if (fetching_unmatched &&
pmatch[0].rm_so >= 0 &&
(pmatch[0].rm_so - prev_match_end) > maxlen)
maxlen = (pmatch[0].rm_so - prev_match_end);
(pmatch[0].rm_so - prev_valid_match_end) > maxlen)
maxlen = (pmatch[0].rm_so - prev_valid_match_end);
prev_valid_match_end = pmatch[0].rm_eo;
}
prev_match_end = pmatch[0].rm_eo;
@ -1075,8 +1079,8 @@ setup_regexp_matches(text *orig_str, text *pattern, text *flags,
* input string
*/
if (fetching_unmatched &&
(wide_len - prev_match_end) > maxlen)
maxlen = (wide_len - prev_match_end);
(wide_len - prev_valid_match_end) > maxlen)
maxlen = (wide_len - prev_valid_match_end);
/*
* Keep a note of the end position of the string for the benefit of

18
src/test/regress/expected/strings.out
View File

@ -674,6 +674,24 @@ SELECT regexp_split_to_array('123456','.');
{"","","","","","",""}
(1 row)
SELECT regexp_split_to_array('123456','');
regexp_split_to_array
-----------------------
{1,2,3,4,5,6}
(1 row)
SELECT regexp_split_to_array('123456','(?:)');
regexp_split_to_array
-----------------------
{1,2,3,4,5,6}
(1 row)
SELECT regexp_split_to_array('1','');
regexp_split_to_array
-----------------------
{1}
(1 row)
-- errors
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'zippy') AS foo;
ERROR: invalid regexp option: "z"

3
src/test/regress/sql/strings.sql
View File

@ -188,6 +188,9 @@ SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', 'nom
SELECT regexp_split_to_array('123456','1');
SELECT regexp_split_to_array('123456','6');
SELECT regexp_split_to_array('123456','.');
SELECT regexp_split_to_array('123456','');
SELECT regexp_split_to_array('123456','(?:)');
SELECT regexp_split_to_array('1','');
-- errors
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'zippy') AS foo;
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'iz');