mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete FORCE option from REINDEX.

Browse Source 
FORCE option has been marked "obsolete" since very old version 7.4
but existed for backwards compatibility. Per discussion on pgsql-hackers,
we concluded that it's no longer worth keeping supporting the option.
This commit is contained in:
Fujii Masao 2015-04-09 11:31:42 +09:00
parent 73206812cd
commit 17d436d2e8
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/src/sgml/ref/reindex.sgml
View File

@ -21,7 +21,7 @@ PostgreSQL documentation
<refsynopsisdiv> <refsynopsisdiv>
<synopsis> <synopsis>
REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable> [ FORCE ] REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable>
</synopsis> </synopsis>
</refsynopsisdiv> </refsynopsisdiv>
@ -150,15 +150,6 @@ REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAM
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><literal>FORCE</literal></term>
<listitem>
<para>
This is an obsolete option; it is ignored if specified.
</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect1> </refsect1>

20
src/backend/parser/gram.y
View File

@ -283,7 +283,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
%type <ival> opt_lock lock_type cast_context %type <ival> opt_lock lock_type cast_context
%type <ival> vacuum_option_list vacuum_option_elem %type <ival> vacuum_option_list vacuum_option_elem
%type <boolean> opt_force opt_or_replace %type <boolean> opt_or_replace
opt_grant_grant_option opt_grant_admin_option opt_grant_grant_option opt_grant_admin_option
opt_nowait opt_if_exists opt_with_data opt_nowait opt_if_exists opt_with_data
%type <ival> opt_nowait_or_skip %type <ival> opt_nowait_or_skip
@ -7301,13 +7301,11 @@ opt_if_exists: IF_P EXISTS { $$ = TRUE; }
* *
* QUERY: * QUERY:
* *
* REINDEX type <name> [FORCE] * REINDEX type <name>
*
* FORCE no longer does anything, but we accept it for backwards compatibility
*****************************************************************************/ *****************************************************************************/
ReindexStmt: ReindexStmt:
REINDEX INDEX qualified_name opt_force REINDEX INDEX qualified_name
{ {
ReindexStmt *n = makeNode(ReindexStmt); ReindexStmt *n = makeNode(ReindexStmt);
n->kind = REINDEX_OBJECT_INDEX; n->kind = REINDEX_OBJECT_INDEX;
@ -7315,7 +7313,7 @@ ReindexStmt:
n->name = NULL; n->name = NULL;
$$ = (Node *)n; $$ = (Node *)n;
} }
| REINDEX TABLE qualified_name opt_force | REINDEX TABLE qualified_name
{ {
ReindexStmt *n = makeNode(ReindexStmt); ReindexStmt *n = makeNode(ReindexStmt);
n->kind = REINDEX_OBJECT_TABLE; n->kind = REINDEX_OBJECT_TABLE;
@ -7323,7 +7321,7 @@ ReindexStmt:
n->name = NULL; n->name = NULL;
$$ = (Node *)n; $$ = (Node *)n;
} }
| REINDEX SCHEMA name opt_force | REINDEX SCHEMA name
{ {
ReindexStmt *n = makeNode(ReindexStmt); ReindexStmt *n = makeNode(ReindexStmt);
n->kind = REINDEX_OBJECT_SCHEMA; n->kind = REINDEX_OBJECT_SCHEMA;
@ -7331,7 +7329,7 @@ ReindexStmt:
n->relation = NULL; n->relation = NULL;
$$ = (Node *)n; $$ = (Node *)n;
} }
| REINDEX SYSTEM_P name opt_force | REINDEX SYSTEM_P name
{ {
ReindexStmt *n = makeNode(ReindexStmt); ReindexStmt *n = makeNode(ReindexStmt);
n->kind = REINDEX_OBJECT_SYSTEM; n->kind = REINDEX_OBJECT_SYSTEM;
@ -7339,7 +7337,7 @@ ReindexStmt:
n->relation = NULL; n->relation = NULL;
$$ = (Node *)n; $$ = (Node *)n;
} }
| REINDEX DATABASE name opt_force | REINDEX DATABASE name
{ {
ReindexStmt *n = makeNode(ReindexStmt); ReindexStmt *n = makeNode(ReindexStmt);
n->kind = REINDEX_OBJECT_DATABASE; n->kind = REINDEX_OBJECT_DATABASE;
@ -7349,10 +7347,6 @@ ReindexStmt:
} }
; ;
opt_force: FORCE { $$ = TRUE; }
| /* EMPTY */ { $$ = FALSE; }
;
/***************************************************************************** /*****************************************************************************
* *