Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitab61df9

Browse files
committed
Remove regex_flavor GUC, so that regular expressions are always "advanced"
style by default. Per discussion, there seems to be hardly anything thatreally relies on being able to change the regex flavor, so the ability toselect it via embedded options ought to be enough for any stragglers.Also, if we didn't remove the GUC, we'd really be morally obligated tomark the regex functions non-immutable, which'd possibly create performanceissues.
1 parent289e290 commitab61df9

File tree

10 files changed

+114
-189
lines changed

10 files changed

+114
-189
lines changed

‎doc/src/sgml/config.sgml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.231 2009/10/21 20:22:38 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.232 2009/10/21 20:38:58 tgl Exp $ -->
22

33
<chapter Id="runtime-config">
44
<title>Server Configuration</title>
@@ -4772,24 +4772,6 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
47724772
</listitem>
47734773
</varlistentry>
47744774

4775-
<varlistentry id="guc-regex-flavor" xreflabel="regex_flavor">
4776-
<term><varname>regex_flavor</varname> (<type>enum</type>)</term>
4777-
<indexterm><primary>regular expressions</></>
4778-
<indexterm>
4779-
<primary><varname>regex_flavor</> configuration parameter</primary>
4780-
</indexterm>
4781-
<listitem>
4782-
<para>
4783-
The regular expression <quote>flavor</> can be set to
4784-
<literal>advanced</>, <literal>extended</>, or <literal>basic</>.
4785-
The default is <literal>advanced</>. The <literal>extended</>
4786-
setting might be useful for exact backwards compatibility with
4787-
pre-7.4 releases of <productname>PostgreSQL</>. See
4788-
<xref linkend="posix-syntax-details"> for details.
4789-
</para>
4790-
</listitem>
4791-
</varlistentry>
4792-
47934775
<varlistentry id="guc-sql-inheritance" xreflabel="sql_inheritance">
47944776
<term><varname>sql_inheritance</varname> (<type>boolean</type>)</term>
47954777
<indexterm>

‎doc/src/sgml/func.sgml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.490 2009/10/13 22:46:13 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.491 2009/10/21 20:38:58 tgl Exp $ -->
22

33
<chapter id="functions">
44
<title>Functions and Operators</title>
@@ -3308,8 +3308,7 @@ substring('foobar' from '#"o_b#"%' for '#') <lineannotation>NULL</lineannotat
33083308

33093309
<para>
33103310
<acronym>POSIX</acronym> regular expressions provide a more
3311-
powerful means for
3312-
pattern matching than the <function>LIKE</function> and
3311+
powerful means for pattern matching than the <function>LIKE</function> and
33133312
<function>SIMILAR TO</> operators.
33143313
Many Unix tools such as <command>egrep</command>,
33153314
<command>sed</command>, or <command>awk</command> use a pattern
@@ -3572,12 +3571,12 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
35723571

35733572
<note>
35743573
<para>
3575-
The form of regular expressions accepted by
3576-
<productname>PostgreSQL</> can be chosen by settingthe<xref
3577-
linkend="guc-regex-flavor"> run-time parameter. The usual
3578-
setting is <literal>advanced</>, but one might choose
3579-
<literal>extended</> for backwardscompatibility with
3580-
pre-7.4 releases of <productname>PostgreSQL</>.
3574+
<productname>PostgreSQL</> always initially presumes that a regular
3575+
expression follows the ARE rules. However,themore limited ERE or
3576+
BRE rules can be chosen by prepending an <firstterm>embedded option</>
3577+
to the RE pattern, as described in <xref linkend="posix-metasyntax">.
3578+
This can be useful forcompatibility with applications that expect
3579+
exactly the <acronym>POSIX</acronym> 1003.2 rules.
35813580
</para>
35823581
</note>
35833582

@@ -4278,7 +4277,7 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
42784277
<entry> (where <replaceable>m</> is a nonzero digit, and
42794278
<replaceable>nn</> is some more digits, and the decimal value
42804279
<replaceable>mnn</> is not greater than the number of closing capturing
4281-
parentheses seen so far)
4280+
parentheses seen so far)
42824281
a back reference to the <replaceable>mnn</>'th subexpression </entry>
42834282
</row>
42844283
</tbody>
@@ -4310,12 +4309,12 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
43104309
</para>
43114310

43124311
<para>
4313-
Normally the flavor of RE being used is determined by
4314-
<varname>regex_flavor</>.
4315-
However, this can be overridden by a <firstterm>director</> prefix.
4312+
An RE can begin with one of two special <firstterm>director</> prefixes.
43164313
If an RE begins with <literal>***:</>,
4317-
the rest of the RE is taken as an ARE regardless of
4318-
<varname>regex_flavor</>.
4314+
the rest of the RE is taken as an ARE. (This normally has no effect in
4315+
<productname>PostgreSQL</>, since REs are assumed to be AREs;
4316+
but it does have an effect if ERE or BRE mode had been specified by
4317+
the <replaceable>flags</> parameter to a regex function.)
43194318
If an RE begins with <literal>***=</>,
43204319
the rest of the RE is taken to be a literal string,
43214320
with all characters considered ordinary characters.
@@ -4326,10 +4325,14 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
43264325
a sequence <literal>(?</><replaceable>xyz</><literal>)</>
43274326
(where <replaceable>xyz</> is one or more alphabetic characters)
43284327
specifies options affecting the rest of the RE.
4329-
These options override any previously determined options (including
4330-
both the RE flavor and case sensitivity).
4328+
These options override any previously determined options &mdash;
4329+
in particular, they can override the case-sensitivity behavior implied by
4330+
a regex operator, or the <replaceable>flags</> parameter to a regex
4331+
function.
43314332
The available option letters are
43324333
shown in <xref linkend="posix-embedded-options-table">.
4334+
Note that these same option letters are used in the <replaceable>flags</>
4335+
parameters of regex functions.
43334336
</para>
43344337

43354338
<table id="posix-embedded-options-table">
@@ -4700,10 +4703,6 @@ SELECT SUBSTRING('XY1234Z', 'Y*?([0-9]{1,3})');
47004703
</para>
47014704
</listitem>
47024705
</itemizedlist>
4703-
4704-
While these differences are unlikely to create a problem for most
4705-
applications, you can avoid them if necessary by
4706-
setting <varname>regex_flavor</> to <literal>extended</>.
47074706
</para>
47084707
</sect3>
47094708

‎src/backend/utils/adt/regexp.c

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.83 2009/10/10 03:50:15 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.84 2009/10/21 20:38:58 tgl Exp $
1212
*
1313
*Alistair Crooks added the code for the regex caching
1414
*agc - cached the regular expressions used - there's a good chance
@@ -39,10 +39,6 @@
3939
(PG_NARGS() > (_n) ? PG_GETARG_TEXT_PP(_n) : NULL)
4040

4141

42-
/* GUC-settable flavor parameter */
43-
intregex_flavor=REG_ADVANCED;
44-
45-
4642
/* all the options of interest for regex functions */
4743
typedefstructpg_re_flags
4844
{
@@ -347,8 +343,8 @@ RE_compile_and_execute(text *text_re, char *dat, int dat_len,
347343
staticvoid
348344
parse_re_flags(pg_re_flags*flags,text*opts)
349345
{
350-
/*regex_flavor is always folded into the compile flags */
351-
flags->cflags=regex_flavor;
346+
/*regex flavor is always folded into the compile flags */
347+
flags->cflags=REG_ADVANCED;
352348
flags->glob= false;
353349

354350
if (opts)
@@ -414,16 +410,6 @@ parse_re_flags(pg_re_flags *flags, text *opts)
414410
}
415411

416412

417-
/*
418-
* report whether regex_flavor is currently BASIC
419-
*/
420-
bool
421-
regex_flavor_is_basic(void)
422-
{
423-
return (regex_flavor==REG_BASIC);
424-
}
425-
426-
427413
/*
428414
*interface routines called by the function manager
429415
*/
@@ -437,7 +423,7 @@ nameregexeq(PG_FUNCTION_ARGS)
437423
PG_RETURN_BOOL(RE_compile_and_execute(p,
438424
NameStr(*n),
439425
strlen(NameStr(*n)),
440-
regex_flavor,
426+
REG_ADVANCED,
441427
0,NULL));
442428
}
443429

@@ -450,7 +436,7 @@ nameregexne(PG_FUNCTION_ARGS)
450436
PG_RETURN_BOOL(!RE_compile_and_execute(p,
451437
NameStr(*n),
452438
strlen(NameStr(*n)),
453-
regex_flavor,
439+
REG_ADVANCED,
454440
0,NULL));
455441
}
456442

@@ -463,7 +449,7 @@ textregexeq(PG_FUNCTION_ARGS)
463449
PG_RETURN_BOOL(RE_compile_and_execute(p,
464450
VARDATA_ANY(s),
465451
VARSIZE_ANY_EXHDR(s),
466-
regex_flavor,
452+
REG_ADVANCED,
467453
0,NULL));
468454
}
469455

@@ -476,7 +462,7 @@ textregexne(PG_FUNCTION_ARGS)
476462
PG_RETURN_BOOL(!RE_compile_and_execute(p,
477463
VARDATA_ANY(s),
478464
VARSIZE_ANY_EXHDR(s),
479-
regex_flavor,
465+
REG_ADVANCED,
480466
0,NULL));
481467
}
482468

@@ -496,7 +482,7 @@ nameicregexeq(PG_FUNCTION_ARGS)
496482
PG_RETURN_BOOL(RE_compile_and_execute(p,
497483
NameStr(*n),
498484
strlen(NameStr(*n)),
499-
regex_flavor |REG_ICASE,
485+
REG_ADVANCED |REG_ICASE,
500486
0,NULL));
501487
}
502488

@@ -509,7 +495,7 @@ nameicregexne(PG_FUNCTION_ARGS)
509495
PG_RETURN_BOOL(!RE_compile_and_execute(p,
510496
NameStr(*n),
511497
strlen(NameStr(*n)),
512-
regex_flavor |REG_ICASE,
498+
REG_ADVANCED |REG_ICASE,
513499
0,NULL));
514500
}
515501

@@ -522,7 +508,7 @@ texticregexeq(PG_FUNCTION_ARGS)
522508
PG_RETURN_BOOL(RE_compile_and_execute(p,
523509
VARDATA_ANY(s),
524510
VARSIZE_ANY_EXHDR(s),
525-
regex_flavor |REG_ICASE,
511+
REG_ADVANCED |REG_ICASE,
526512
0,NULL));
527513
}
528514

@@ -535,7 +521,7 @@ texticregexne(PG_FUNCTION_ARGS)
535521
PG_RETURN_BOOL(!RE_compile_and_execute(p,
536522
VARDATA_ANY(s),
537523
VARSIZE_ANY_EXHDR(s),
538-
regex_flavor |REG_ICASE,
524+
REG_ADVANCED |REG_ICASE,
539525
0,NULL));
540526
}
541527

@@ -555,7 +541,7 @@ textregexsubstr(PG_FUNCTION_ARGS)
555541
eo;
556542

557543
/* Compile RE */
558-
re=RE_compile_and_cache(p,regex_flavor);
544+
re=RE_compile_and_cache(p,REG_ADVANCED);
559545

560546
/*
561547
* We pass two regmatch_t structs to get info about the overall match and
@@ -611,7 +597,7 @@ textregexreplace_noopt(PG_FUNCTION_ARGS)
611597
text*r=PG_GETARG_TEXT_PP(2);
612598
regex_t*re;
613599

614-
re=RE_compile_and_cache(p,regex_flavor);
600+
re=RE_compile_and_cache(p,REG_ADVANCED);
615601

616602
PG_RETURN_TEXT_P(replace_text_regexp(s, (void*)re,r, false));
617603
}
@@ -684,12 +670,10 @@ similar_escape(PG_FUNCTION_ARGS)
684670

685671
/*----------
686672
* We surround the transformed input string with
687-
****:^(?: ... )$
688-
* which is bizarre enough to require some explanation. "***:" is a
689-
* director prefix to force the regex to be treated as an ARE regardless
690-
* of the current regex_flavor setting. We need "^" and "$" to force
691-
* the pattern to match the entire input string as per SQL99 spec.The
692-
* "(?:" and ")" are a non-capturing set of parens; we have to have
673+
*^(?: ... )$
674+
* which requires some explanation. We need "^" and "$" to force
675+
* the pattern to match the entire input string as per SQL99 spec.
676+
* The "(?:" and ")" are a non-capturing set of parens; we have to have
693677
* parens in case the string contains "|", else the "^" and "$" will
694678
* be bound into the first and last alternatives which is not what we
695679
* want, and the parens must be non capturing because we don't want them
@@ -701,13 +685,9 @@ similar_escape(PG_FUNCTION_ARGS)
701685
* We need room for the prefix/postfix plus as many as 2 output bytes per
702686
* input byte
703687
*/
704-
result= (text*)palloc(VARHDRSZ+10+2*plen);
688+
result= (text*)palloc(VARHDRSZ+6+2*plen);
705689
r=VARDATA(result);
706690

707-
*r++='*';
708-
*r++='*';
709-
*r++='*';
710-
*r++=':';
711691
*r++='^';
712692
*r++='(';
713693
*r++='?';

‎src/backend/utils/adt/selfuncs.c

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*
1717
* IDENTIFICATION
18-
* $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.262 2009/08/04 16:08:36 tgl Exp $
18+
* $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.263 2009/10/21 20:38:58 tgl Exp $
1919
*
2020
*-------------------------------------------------------------------------
2121
*/
@@ -4580,7 +4580,6 @@ regex_fixed_prefix(Const *patt_const, bool case_insensitive,
45804580
char*patt;
45814581
char*rest;
45824582
Oidtypeid=patt_const->consttype;
4583-
boolis_basic=regex_flavor_is_basic();
45844583
boolis_multibyte= (pg_database_encoding_max_length()>1);
45854584

45864585
/*
@@ -4598,14 +4597,12 @@ regex_fixed_prefix(Const *patt_const, bool case_insensitive,
45984597

45994598
/*
46004599
* Check for ARE director prefix. It's worth our trouble to recognize
4601-
* this because similar_escape() uses it.
4600+
* this because similar_escape() used to use it, and some other code
4601+
* might still use it, to force ARE mode.
46024602
*/
46034603
pos=0;
46044604
if (strncmp(patt,"***:",4)==0)
4605-
{
46064605
pos=4;
4607-
is_basic= false;
4608-
}
46094606

46104607
/* Pattern must be anchored left */
46114608
if (patt[pos]!='^')
@@ -4641,17 +4638,11 @@ regex_fixed_prefix(Const *patt_const, bool case_insensitive,
46414638

46424639
/*
46434640
* We special-case the syntax '^(...)$' because psql uses it. But beware:
4644-
* in BRE mode these parentheses are just ordinary characters.Also,
46454641
* sequences beginning "(?" are not what they seem, unless they're "(?:".
4646-
* (We should recognize that, too, because of similar_escape().)
4647-
*
4648-
* Note: it's a bit bogus to be depending on the current regex_flavor
4649-
* setting here, because the setting could change before the pattern is
4650-
* used. We minimize the risk by trusting the flavor as little as we can,
4651-
* but perhaps it would be a good idea to get rid of the "basic" setting.
4642+
* (We must recognize that because of similar_escape().)
46524643
*/
46534644
have_leading_paren= false;
4654-
if (patt[pos]=='('&& !is_basic&&
4645+
if (patt[pos]=='('&&
46554646
(patt[pos+1]!='?'||patt[pos+2]==':'))
46564647
{
46574648
have_leading_paren= true;
@@ -4691,12 +4682,10 @@ regex_fixed_prefix(Const *patt_const, bool case_insensitive,
46914682
/*
46924683
* Check for quantifiers. Except for +, this means the preceding
46934684
* character is optional, so we must remove it from the prefix too!
4694-
* Note: in BREs, \{ is a quantifier.
46954685
*/
46964686
if (patt[pos]=='*'||
46974687
patt[pos]=='?'||
4698-
patt[pos]=='{'||
4699-
(patt[pos]=='\\'&&patt[pos+1]=='{'))
4688+
patt[pos]=='{')
47004689
{
47014690
match_pos=prev_match_pos;
47024691
pos=prev_pos;
@@ -4711,14 +4700,13 @@ regex_fixed_prefix(Const *patt_const, bool case_insensitive,
47114700
/*
47124701
* Normally, backslash quotes the next character. But in AREs,
47134702
* backslash followed by alphanumeric is an escape, not a quoted
4714-
* character. Must treat it as having multiple possible matches. In
4715-
* BREs, \( is a parenthesis, so don't trust that either. Note: since
4716-
* only ASCII alphanumerics are escapes, we don't have to be paranoid
4717-
* about multibyte here.
4703+
* character. Must treat it as having multiple possible matches.
4704+
* Note: since only ASCII alphanumerics are escapes, we don't have to
4705+
* be paranoid about multibyte here.
47184706
*/
47194707
if (patt[pos]=='\\')
47204708
{
4721-
if (isalnum((unsignedchar)patt[pos+1])||patt[pos+1]=='(')
4709+
if (isalnum((unsignedchar)patt[pos+1]))
47224710
break;
47234711
pos++;
47244712
if (patt[pos]=='\0')

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp