open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Create a GUC variable REGEX_FLAVOR to control the type of regular

Browse Source 
expression accepted by the regex operators, per discussion yesterday.

Along the way, reduce deadlock_timeout from PGC_POSTMASTER to PGC_SIGHUP
category.  It is probably best to insist that all backends share the same
setting, but that doesn't mean it has to be frozen at startup.
WIN32_DEV
Tom Lane 23 years ago
parent 465ed56531
commit 77ede8900d
7 changed files with 114 additions and 53 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 46
      doc/src/sgml/func.sgml
  2. 19
      doc/src/sgml/runtime.sgml
  3. 52
      src/backend/utils/adt/regexp.c
  4. 10
      src/backend/utils/misc/guc.c
  5. 1
      src/backend/utils/misc/postgresql.conf.sample
  6. 33
      src/bin/psql/tab-complete.c
  7. 4
      src/include/utils/builtins.h

46
doc/src/sgml/func.sgml
Unescape View File

@ -1,5 +1,5 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.137 2003/02/05 17:41:32 tgl Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.138 2003/02/06 20:25:31 tgl Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -2665,10 +2665,24 @@ SUBSTRING('foobar' FROM 'o(.)b') <lineannotation>o</lineannotation>
due to their availability in programming languages such as Perl and Tcl. due to their availability in programming languages such as Perl and Tcl.
<acronym>RE</acronym>s using these non-POSIX extensions are called <acronym>RE</acronym>s using these non-POSIX extensions are called
<firstterm>advanced</> <acronym>RE</acronym>s or <acronym>ARE</>s <firstterm>advanced</> <acronym>RE</acronym>s or <acronym>ARE</>s
in this documentation. We first describe the ERE/ARE flavor and then in this documentation. AREs are almost an exact superset of EREs,
mention the restrictions of the BRE form. but BREs have several notational incompatibilities (as well as being
much more limited).
We first describe the ARE and ERE forms, noting features that apply
only to AREs, and then describe how BREs differ.
</para> </para>
<note>
<para>
The form of regular expressions accepted by <productname>PostgreSQL</>
can be chosen by setting the <varname>REGEX_FLAVOR</> run-time parameter
(described in the &cite-admin;). The usual setting is
<literal>advanced</>, but one might choose <literal>extended</> for
maximum backwards compatibility with pre-7.4 releases of
<productname>PostgreSQL</>.
</para>
</note>
<para> <para>
A regular expression is defined as one or more A regular expression is defined as one or more
<firstterm>branches</firstterm>, separated by <firstterm>branches</firstterm>, separated by
@ -3392,11 +3406,11 @@ SUBSTRING('foobar' FROM 'o(.)b') <lineannotation>o</lineannotation>
</para> </para>
<para> <para>
Normally the flavor of RE being used is specified by Normally the flavor of RE being used is determined by
application-dependent means. <varname>REGEX_FLAVOR</>.
However, this can be overridden by a <firstterm>director</>. However, this can be overridden by a <firstterm>director</> prefix.
If an RE of any flavor begins with <literal>***:</>, If an RE of any flavor begins with <literal>***:</>,
the rest of the RE is an ARE. the rest of the RE is taken as an ARE.
If an RE of any flavor begins with <literal>***=</>, If an RE of any flavor begins with <literal>***=</>,
the rest of the RE is taken to be a literal string, the rest of the RE is taken to be a literal string,
with all characters considered ordinary characters. with all characters considered ordinary characters.
@ -3407,8 +3421,8 @@ SUBSTRING('foobar' FROM 'o(.)b') <lineannotation>o</lineannotation>
a sequence <literal>(?</><replaceable>xyz</><literal>)</> a sequence <literal>(?</><replaceable>xyz</><literal>)</>
(where <replaceable>xyz</> is one or more alphabetic characters) (where <replaceable>xyz</> is one or more alphabetic characters)
specifies options affecting the rest of the RE. specifies options affecting the rest of the RE.
These supplement, and can override, These options override any previously determined options (including
any options specified externally. both the RE flavor and case sensitivity).
The available option letters are The available option letters are
shown in <xref linkend="posix-embedded-options-table">. shown in <xref linkend="posix-embedded-options-table">.
</para> </para>
@ -3432,7 +3446,7 @@ SUBSTRING('foobar' FROM 'o(.)b') <lineannotation>o</lineannotation>
<row> <row>
<entry> <literal>c</> </entry> <entry> <literal>c</> </entry>
<entry> case-sensitive matching (usual default) </entry> <entry> case-sensitive matching (overrides operator type) </entry>
</row> </row>
<row> <row>
@ -3443,7 +3457,7 @@ SUBSTRING('foobar' FROM 'o(.)b') <lineannotation>o</lineannotation>
<row> <row>
<entry> <literal>i</> </entry> <entry> <literal>i</> </entry>
<entry> case-insensitive matching (see <entry> case-insensitive matching (see
<xref linkend="posix-matching-rules">) </entry> <xref linkend="posix-matching-rules">) (overrides operator type) </entry>
</row> </row>
<row> <row>
@ -3471,12 +3485,12 @@ SUBSTRING('foobar' FROM 'o(.)b') <lineannotation>o</lineannotation>
<row> <row>
<entry> <literal>s</> </entry> <entry> <literal>s</> </entry>
<entry> non-newline-sensitive matching (usual default) </entry> <entry> non-newline-sensitive matching (default) </entry>
</row> </row>
<row> <row>
<entry> <literal>t</> </entry> <entry> <literal>t</> </entry>
<entry> tight syntax (usual default; see below) </entry> <entry> tight syntax (default; see below) </entry>
</row> </row>
<row> <row>
@ -3696,7 +3710,7 @@ SUBSTRING('foobar' FROM 'o(.)b') <lineannotation>o</lineannotation>
</para> </para>
<para> <para>
Two significant incompatibilites exist between AREs and the ERE syntax Two significant incompatibilities exist between AREs and the ERE syntax
recognized by pre-7.4 releases of <productname>PostgreSQL</>: recognized by pre-7.4 releases of <productname>PostgreSQL</>:
<itemizedlist> <itemizedlist>
@ -3717,6 +3731,10 @@ SUBSTRING('foobar' FROM 'o(.)b') <lineannotation>o</lineannotation>
</para> </para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
While these differences are unlikely to create a problem for most
applications, you can avoid them if necessary by
setting <varname>REGEX_FLAVOR</> to <literal>extended</>.
</para> </para>
</sect3> </sect3>

19
doc/src/sgml/runtime.sgml
Unescape View File

@ -1,5 +1,5 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.167 2003/01/25 23:10:27 tgl Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.168 2003/02/06 20:25:31 tgl Exp $
--> -->
<Chapter Id="runtime"> <Chapter Id="runtime">
@ -1447,8 +1447,7 @@ env PGOPTIONS='-c geqo=off' psql
practice. On a heavily loaded server you might want to raise it. practice. On a heavily loaded server you might want to raise it.
Ideally the setting should exceed your typical transaction time, Ideally the setting should exceed your typical transaction time,
so as to improve the odds that the lock will be released before so as to improve the odds that the lock will be released before
the waiter decides to check for deadlock. This option can only the waiter decides to check for deadlock.
be set at server start.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1781,6 +1780,20 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>REGEX_FLAVOR</varname> (<type>string</type>)</term>
<indexterm><primary>regular expressions</></>
<listitem>
<para>
The regular expression <quote>flavor</> can be set to
<literal>advanced</>, <literal>extended</>, or <literal>basic</>.
The usual default is <literal>advanced</>. The <literal>extended</>
setting may be useful for exact backwards compatibility with
pre-7.4 releases of <productname>PostgreSQL</>.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>SEARCH_PATH</varname> (<type>string</type>)</term> <term><varname>SEARCH_PATH</varname> (<type>string</type>)</term>
<indexterm><primary>search_path</></> <indexterm><primary>search_path</></>

52
src/backend/utils/adt/regexp.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.44 2003/02/05 17:41:32 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.45 2003/02/06 20:25:33 tgl Exp $
* *
* Alistair Crooks added the code for the regex caching * Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance * agc - cached the regular expressions used - there's a good chance
@ -34,6 +34,10 @@
#include "utils/builtins.h" #include "utils/builtins.h"
/* GUC-settable flavor parameter */
static int regex_flavor = REG_ADVANCED;
/* /*
* We cache precompiled regular expressions using a "self organizing list" * We cache precompiled regular expressions using a "self organizing list"
* structure, in which recently-used items tend to be near the front. * structure, in which recently-used items tend to be near the front.
@ -216,6 +220,34 @@ RE_compile_and_execute(text *text_re, unsigned char *dat, int dat_len,
} }
/*
* assign_regex_flavor - GUC hook to validate and set REGEX_FLAVOR
*/
const char *
assign_regex_flavor(const char *value,
bool doit, bool interactive)
{
if (strcasecmp(value, "advanced") == 0)
{
if (doit)
regex_flavor = REG_ADVANCED;
}
else if (strcasecmp(value, "extended") == 0)
{
if (doit)
regex_flavor = REG_EXTENDED;
}
else if (strcasecmp(value, "basic") == 0)
{
if (doit)
regex_flavor = REG_BASIC;
}
else
return NULL; /* fail */
return value; /* OK */
}
/* /*
* interface routines called by the function manager * interface routines called by the function manager
*/ */
@ -229,7 +261,7 @@ nameregexeq(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(RE_compile_and_execute(p, PG_RETURN_BOOL(RE_compile_and_execute(p,
(unsigned char *) NameStr(*n), (unsigned char *) NameStr(*n),
strlen(NameStr(*n)), strlen(NameStr(*n)),
REG_ADVANCED, regex_flavor,
0, NULL)); 0, NULL));
} }
@ -242,7 +274,7 @@ nameregexne(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(!RE_compile_and_execute(p, PG_RETURN_BOOL(!RE_compile_and_execute(p,
(unsigned char *) NameStr(*n), (unsigned char *) NameStr(*n),
strlen(NameStr(*n)), strlen(NameStr(*n)),
REG_ADVANCED, regex_flavor,
0, NULL)); 0, NULL));
} }
@ -255,7 +287,7 @@ textregexeq(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(RE_compile_and_execute(p, PG_RETURN_BOOL(RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), (unsigned char *) VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
REG_ADVANCED, regex_flavor,
0, NULL)); 0, NULL));
} }
@ -268,7 +300,7 @@ textregexne(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(!RE_compile_and_execute(p, PG_RETURN_BOOL(!RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), (unsigned char *) VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
REG_ADVANCED, regex_flavor,
0, NULL)); 0, NULL));
} }
@ -288,7 +320,7 @@ nameicregexeq(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(RE_compile_and_execute(p, PG_RETURN_BOOL(RE_compile_and_execute(p,
(unsigned char *) NameStr(*n), (unsigned char *) NameStr(*n),
strlen(NameStr(*n)), strlen(NameStr(*n)),
REG_ICASE | REG_ADVANCED, regex_flavor | REG_ICASE,
0, NULL)); 0, NULL));
} }
@ -301,7 +333,7 @@ nameicregexne(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(!RE_compile_and_execute(p, PG_RETURN_BOOL(!RE_compile_and_execute(p,
(unsigned char *) NameStr(*n), (unsigned char *) NameStr(*n),
strlen(NameStr(*n)), strlen(NameStr(*n)),
REG_ICASE | REG_ADVANCED, regex_flavor | REG_ICASE,
0, NULL)); 0, NULL));
} }
@ -314,7 +346,7 @@ texticregexeq(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(RE_compile_and_execute(p, PG_RETURN_BOOL(RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), (unsigned char *) VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
REG_ICASE | REG_ADVANCED, regex_flavor | REG_ICASE,
0, NULL)); 0, NULL));
} }
@ -327,7 +359,7 @@ texticregexne(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(!RE_compile_and_execute(p, PG_RETURN_BOOL(!RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), (unsigned char *) VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
REG_ICASE | REG_ADVANCED, regex_flavor | REG_ICASE,
0, NULL)); 0, NULL));
} }
@ -353,7 +385,7 @@ textregexsubstr(PG_FUNCTION_ARGS)
match = RE_compile_and_execute(p, match = RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), (unsigned char *) VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
REG_ADVANCED, regex_flavor,
2, pmatch); 2, pmatch);
/* match? then return the substring matching the pattern */ /* match? then return the substring matching the pattern */

10
src/backend/utils/misc/guc.c
Unescape View File

@ -5,7 +5,7 @@
* command, configuration file, and command line options. * command, configuration file, and command line options.
* See src/backend/utils/misc/README for more information. * See src/backend/utils/misc/README for more information.
* *
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.113 2003/01/28 18:04:02 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.114 2003/02/06 20:25:33 tgl Exp $
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
@ -127,6 +127,7 @@ static double phony_random_seed;
static char *client_encoding_string; static char *client_encoding_string;
static char *datestyle_string; static char *datestyle_string;
static char *default_iso_level_string; static char *default_iso_level_string;
static char *regex_flavor_string;
static char *server_encoding_string; static char *server_encoding_string;
static char *session_authorization_string; static char *session_authorization_string;
static char *timezone_string; static char *timezone_string;
@ -568,7 +569,7 @@ static struct config_int
}, },
{ {
{"deadlock_timeout", PGC_POSTMASTER}, &DeadlockTimeout, {"deadlock_timeout", PGC_SIGHUP}, &DeadlockTimeout,
1000, 0, INT_MAX, NULL, NULL 1000, 0, INT_MAX, NULL, NULL
}, },
@ -818,6 +819,11 @@ static struct config_string
"C", locale_time_assign, NULL "C", locale_time_assign, NULL
}, },
{
{"regex_flavor", PGC_USERSET}, &regex_flavor_string,
"advanced", assign_regex_flavor, NULL
},
{ {
{"search_path", PGC_USERSET, GUC_LIST_INPUT | GUC_LIST_QUOTE}, {"search_path", PGC_USERSET, GUC_LIST_INPUT | GUC_LIST_QUOTE},
&namespace_search_path, &namespace_search_path,

1
src/backend/utils/misc/postgresql.conf.sample
Unescape View File

@ -208,6 +208,7 @@
#max_expr_depth = 10000 # min 10 #max_expr_depth = 10000 # min 10
#max_files_per_process = 1000 # min 25 #max_files_per_process = 1000 # min 25
#password_encryption = true #password_encryption = true
#regex_flavor = advanced # advanced, extended, or basic
#sql_inheritance = true #sql_inheritance = true
#transform_null_equals = false #transform_null_equals = false
#statement_timeout = 0 # 0 is disabled, in milliseconds #statement_timeout = 0 # 0 is disabled, in milliseconds

33
src/bin/psql/tab-complete.c
Unescape View File

@ -3,7 +3,7 @@
* *
* Copyright 2000-2002 by PostgreSQL Global Development Group * Copyright 2000-2002 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.72 2003/01/25 23:10:30 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.73 2003/02/06 20:25:33 tgl Exp $
*/ */
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -215,14 +215,11 @@ psql_completion(char *text, int start, int end)
"TRANSACTION", "TRANSACTION",
/* /*
* the rest should match USERSET entries in * the rest should match USERSET and possibly SUSET entries in
* backend/utils/misc/guc.c * backend/utils/misc/guc.c.
*/ */
"australian_timezones", "australian_timezones",
"authentication_timeout",
"autocommit", "autocommit",
"checkpoint_segments",
"checkpoint_timeout",
"client_encoding", "client_encoding",
"client_min_messages", "client_min_messages",
"commit_delay", "commit_delay",
@ -231,7 +228,6 @@ psql_completion(char *text, int start, int end)
"cpu_operator_cost", "cpu_operator_cost",
"cpu_tuple_cost", "cpu_tuple_cost",
"DateStyle", "DateStyle",
"db_user_namespace",
"deadlock_timeout", "deadlock_timeout",
"debug_pretty_print", "debug_pretty_print",
"debug_print_parse", "debug_print_parse",
@ -239,19 +235,19 @@ psql_completion(char *text, int start, int end)
"debug_print_rewritten", "debug_print_rewritten",
"default_statistics_target", "default_statistics_target",
"default_transaction_isolation", "default_transaction_isolation",
"default_transaction_read_only",
"dynamic_library_path", "dynamic_library_path",
"effective_cache_size", "effective_cache_size",
"enable_hashagg",
"enable_hashjoin", "enable_hashjoin",
"enable_indexscan", "enable_indexscan",
"enable_mergejoin", "enable_mergejoin",
"enable_nestloop", "enable_nestloop",
"enable_seqscan", "enable_seqscan",
"enable_sort", "enable_sort",
"enable_hashagg",
"enable_tidscan", "enable_tidscan",
"explain_pretty_print", "explain_pretty_print",
"extra_float_digits", "extra_float_digits",
"fixbtree",
"from_collapse_limit", "from_collapse_limit",
"fsync", "fsync",
"geqo", "geqo",
@ -262,18 +258,19 @@ psql_completion(char *text, int start, int end)
"geqo_selection_bias", "geqo_selection_bias",
"geqo_threshold", "geqo_threshold",
"join_collapse_limit", "join_collapse_limit",
"log_hostname",
"krb_server_keyfile", "krb_server_keyfile",
"lc_messages", "lc_messages",
"lc_monetary", "lc_monetary",
"lc_numeric", "lc_numeric",
"lc_time", "lc_time",
"log_connections",
"log_duration", "log_duration",
"log_executor_stats",
"log_min_error_statement", "log_min_error_statement",
"log_pid", "log_min_messages",
"log_parser_stats",
"log_planner_stats",
"log_statement", "log_statement",
"log_timestamp", "log_statement_stats",
"max_connections", "max_connections",
"max_expr_depth", "max_expr_depth",
"max_files_per_process", "max_files_per_process",
@ -282,19 +279,12 @@ psql_completion(char *text, int start, int end)
"max_locks_per_transaction", "max_locks_per_transaction",
"password_encryption", "password_encryption",
"port", "port",
"pre_auth_delay",
"random_page_cost", "random_page_cost",
"regex_flavor",
"search_path", "search_path",
"log_min_messages",
"shared_buffers", "shared_buffers",
"log_executor_stats",
"log_parser_stats",
"log_planner_stats",
"log_source_port",
"log_statement_stats",
"seed", "seed",
"server_encoding", "server_encoding",
"silent_mode",
"sort_mem", "sort_mem",
"sql_inheritance", "sql_inheritance",
"ssl", "ssl",
@ -316,7 +306,6 @@ psql_completion(char *text, int start, int end)
"unix_socket_group", "unix_socket_group",
"unix_socket_permissions", "unix_socket_permissions",
"vacuum_mem", "vacuum_mem",
"virtual_hostt",
"wal_buffers", "wal_buffers",
"wal_debug", "wal_debug",
"wal_sync_method", "wal_sync_method",

4
src/include/utils/builtins.h
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: builtins.h,v 1.206 2002/12/06 05:20:28 momjian Exp $ * $Id: builtins.h,v 1.207 2003/02/06 20:25:33 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -377,6 +377,8 @@ extern Datum texticregexeq(PG_FUNCTION_ARGS);
extern Datum texticregexne(PG_FUNCTION_ARGS); extern Datum texticregexne(PG_FUNCTION_ARGS);
extern Datum textregexsubstr(PG_FUNCTION_ARGS); extern Datum textregexsubstr(PG_FUNCTION_ARGS);
extern Datum similar_escape(PG_FUNCTION_ARGS); extern Datum similar_escape(PG_FUNCTION_ARGS);
extern const char *assign_regex_flavor(const char *value,
bool doit, bool interactive);
/* regproc.c */ /* regproc.c */
extern Datum regprocin(PG_FUNCTION_ARGS); extern Datum regprocin(PG_FUNCTION_ARGS);

Write Preview
Loading…
Cancel
Save