Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 17d436d

Browse files
committed
Remove obsolete FORCE option from REINDEX.
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.
1 parent 7320681 commit 17d436d

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

doc/src/sgml/ref/reindex.sgml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PostgreSQL documentation
2121

2222
<refsynopsisdiv>
2323
<synopsis>
24-
REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable> [ FORCE ]
24+
REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable>
2525
</synopsis>
2626
</refsynopsisdiv>
2727

@@ -150,15 +150,6 @@ REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAM
150150
</para>
151151
</listitem>
152152
</varlistentry>
153-
154-
<varlistentry>
155-
<term><literal>FORCE</literal></term>
156-
<listitem>
157-
<para>
158-
This is an obsolete option; it is ignored if specified.
159-
</para>
160-
</listitem>
161-
</varlistentry>
162153
</variablelist>
163154
</refsect1>
164155

src/backend/parser/gram.y

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
283283

284284
%type <ival> opt_lock lock_type cast_context
285285
%type <ival> vacuum_option_list vacuum_option_elem
286-
%type <boolean> opt_force opt_or_replace
286+
%type <boolean> opt_or_replace
287287
opt_grant_grant_option opt_grant_admin_option
288288
opt_nowait opt_if_exists opt_with_data
289289
%type <ival> opt_nowait_or_skip
@@ -7301,45 +7301,43 @@ opt_if_exists: IF_P EXISTS { $$ = TRUE; }
73017301
*
73027302
* QUERY:
73037303
*
7304-
* REINDEX type <name> [FORCE]
7305-
*
7306-
* FORCE no longer does anything, but we accept it for backwards compatibility
7304+
* REINDEX type <name>
73077305
*****************************************************************************/
73087306

73097307
ReindexStmt:
7310-
REINDEX INDEX qualified_name opt_force
7308+
REINDEX INDEX qualified_name
73117309
{
73127310
ReindexStmt *n = makeNode(ReindexStmt);
73137311
n->kind = REINDEX_OBJECT_INDEX;
73147312
n->relation = $3;
73157313
n->name = NULL;
73167314
$$ = (Node *)n;
73177315
}
7318-
| REINDEX TABLE qualified_name opt_force
7316+
| REINDEX TABLE qualified_name
73197317
{
73207318
ReindexStmt *n = makeNode(ReindexStmt);
73217319
n->kind = REINDEX_OBJECT_TABLE;
73227320
n->relation = $3;
73237321
n->name = NULL;
73247322
$$ = (Node *)n;
73257323
}
7326-
| REINDEX SCHEMA name opt_force
7324+
| REINDEX SCHEMA name
73277325
{
73287326
ReindexStmt *n = makeNode(ReindexStmt);
73297327
n->kind = REINDEX_OBJECT_SCHEMA;
73307328
n->name = $3;
73317329
n->relation = NULL;
73327330
$$ = (Node *)n;
73337331
}
7334-
| REINDEX SYSTEM_P name opt_force
7332+
| REINDEX SYSTEM_P name
73357333
{
73367334
ReindexStmt *n = makeNode(ReindexStmt);
73377335
n->kind = REINDEX_OBJECT_SYSTEM;
73387336
n->name = $3;
73397337
n->relation = NULL;
73407338
$$ = (Node *)n;
73417339
}
7342-
| REINDEX DATABASE name opt_force
7340+
| REINDEX DATABASE name
73437341
{
73447342
ReindexStmt *n = makeNode(ReindexStmt);
73457343
n->kind = REINDEX_OBJECT_DATABASE;
@@ -7349,10 +7347,6 @@ ReindexStmt:
73497347
}
73507348
;
73517349

7352-
opt_force: FORCE { $$ = TRUE; }
7353-
| /* EMPTY */ { $$ = FALSE; }
7354-
;
7355-
73567350

73577351
/*****************************************************************************
73587352
*

0 commit comments

Comments
 (0)