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

Commit4cc7a93

Browse files
committed
Make REINDEX DATABASE do what one would expect, namely reindex all indexes
in the database. The old behavior (reindex system catalogs only) is nowavailable as REINDEX SYSTEM. I did not add the complementary REINDEX USERcase since there did not seem to be consensus for this, but it would betrivial to add later. Per recent discussions.
1 parente98edb5 commit4cc7a93

File tree

12 files changed

+120
-68
lines changed

12 files changed

+120
-68
lines changed

‎doc/src/sgml/maintenance.sgml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.44 2005/06/13 02:40:04 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.45 2005/06/22 21:14:28 tgl Exp $
33
-->
44

55
<chapter id="maintenance">
@@ -468,8 +468,7 @@ HINT: Stop the postmaster and use a standalone backend to VACUUM in "mydb".
468468

469469
<para>
470470
In some situations it is worthwhile to rebuild indexes periodically
471-
with the <command>REINDEX</> command. (There is also
472-
<filename>contrib/reindexdb</> which can reindex an entire database.)
471+
with the <command>REINDEX</> command.
473472
However, <productname>PostgreSQL</> 7.4 has substantially reduced the need
474473
for this activity compared to earlier releases.
475474
</para>

‎doc/src/sgml/ref/reindex.sgml

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.26 2005/01/2223:22:19 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.27 2005/06/2221:14:28 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -20,15 +20,15 @@ PostgreSQL documentation
2020

2121
<refsynopsisdiv>
2222
<synopsis>
23-
REINDEX {DATABASE | TABLE |INDEX } <replaceable class="PARAMETER">name</replaceable> [ FORCE ]
23+
REINDEX {INDEX | TABLE |DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable> [ FORCE ]
2424
</synopsis>
2525
</refsynopsisdiv>
2626

2727
<refsect1>
2828
<title>Description</title>
2929

3030
<para>
31-
<command>REINDEX</command> rebuilds an indexbased on the data
31+
<command>REINDEX</command> rebuilds an indexusing the data
3232
stored in the index's table, replacing the old copy of the index. There are
3333
two main reasons to use <command>REINDEX</command>:
3434

@@ -63,12 +63,10 @@ REINDEX { DATABASE | TABLE | INDEX } <replaceable class="PARAMETER">name</replac
6363

6464
<variablelist>
6565
<varlistentry>
66-
<term><literal>DATABASE</literal></term>
66+
<term><literal>INDEX</literal></term>
6767
<listitem>
6868
<para>
69-
Recreate all system indexes of a specified database. Indexes on
70-
user tables are not processed. Also, indexes on shared system
71-
catalogs are skipped except in stand-alone mode (see below).
69+
Recreate the specified index.
7270
</para>
7371
</listitem>
7472
</varlistentry>
@@ -77,17 +75,30 @@ REINDEX { DATABASE | TABLE | INDEX } <replaceable class="PARAMETER">name</replac
7775
<term><literal>TABLE</literal></term>
7876
<listitem>
7977
<para>
80-
Recreate all indexes ofa specified table. If the table has a
78+
Recreate all indexes ofthe specified table. If the table has a
8179
secondary <quote>TOAST</> table, that is reindexed as well.
8280
</para>
8381
</listitem>
8482
</varlistentry>
8583

8684
<varlistentry>
87-
<term><literal>INDEX</literal></term>
85+
<term><literal>DATABASE</literal></term>
8886
<listitem>
8987
<para>
90-
Recreate a specified index.
88+
Recreate all indexes within the current database.
89+
Indexes on shared system catalogs are skipped except in stand-alone mode
90+
(see below).
91+
</para>
92+
</listitem>
93+
</varlistentry>
94+
95+
<varlistentry>
96+
<term><literal>SYSTEM</literal></term>
97+
<listitem>
98+
<para>
99+
Recreate all indexes on system catalogs within the current database.
100+
Indexes on user tables are not processed. Also, indexes on shared
101+
system catalogs are skipped except in stand-alone mode (see below).
91102
</para>
92103
</listitem>
93104
</varlistentry>
@@ -96,10 +107,11 @@ REINDEX { DATABASE | TABLE | INDEX } <replaceable class="PARAMETER">name</replac
96107
<term><replaceable class="PARAMETER">name</replaceable></term>
97108
<listitem>
98109
<para>
99-
The name of the specific database, table, or index to be
100-
reindexed. Table and index names may be schema-qualified.
101-
Presently, <command>REINDEX DATABASE</> can only reindex the current
102-
database, so its parameter must match the current database's name.
110+
The name of the specific index, table, or database to be
111+
reindexed. Index and table names may be schema-qualified.
112+
Presently, <command>REINDEX DATABASE</> and <command>REINDEX SYSTEM</>
113+
can only reindex the current database, so their parameter must match
114+
the current database's name.
103115
</para>
104116
</listitem>
105117
</varlistentry>
@@ -139,10 +151,10 @@ REINDEX { DATABASE | TABLE | INDEX } <replaceable class="PARAMETER">name</replac
139151
One way to do this is to shut down the postmaster and start a stand-alone
140152
<productname>PostgreSQL</productname> server
141153
with the <option>-P</option> option included on its command line.
142-
Then, <command>REINDEX DATABASE</>,
154+
Then, <command>REINDEX DATABASE</>, <command>REINDEX SYSTEM</>,
143155
<command>REINDEX TABLE</>, or <command>REINDEX INDEX</> can be
144156
issued, depending on how much you want to reconstruct. If in
145-
doubt, use <command>REINDEXDATABASE</> to select
157+
doubt, use <command>REINDEXSYSTEM</> to select
146158
reconstruction of all system indexes in the database. Then quit
147159
the standalone server session and restart the regular server.
148160
See the <xref linkend="app-postgres"> reference page for more
@@ -199,6 +211,21 @@ REINDEX { DATABASE | TABLE | INDEX } <replaceable class="PARAMETER">name</replac
199211
<command>REINDEX</> does not.
200212
</para>
201213

214+
<para>
215+
Reindexing a single index or table requires being the owner of that
216+
index or table. Reindexing a database requires being the owner of
217+
the database (note that the owner can therefore rebuild indexes of
218+
tables owned by other users). Of course, superusers can always
219+
reindex anything.
220+
</para>
221+
222+
<para>
223+
Prior to <productname>PostgreSQL</productname> 8.1, <command>REINDEX
224+
DATABASE</> processed only system indexes, not all indexes as one would
225+
expect from the name. This has been changed to reduce the surprise
226+
factor. The old behavior is available as <command>REINDEX SYSTEM</>.
227+
</para>
228+
202229
<para>
203230
Prior to <productname>PostgreSQL</productname> 7.4, <command>REINDEX
204231
TABLE</> did not automatically process TOAST tables, and so those had
@@ -227,8 +254,8 @@ REINDEX INDEX my_index;
227254
</para>
228255

229256
<para>
230-
Rebuild allsystemindexes in a particular database, without trustingthem
231-
to be valid already:
257+
Rebuild all indexes in a particular database, without trustingthe
258+
system indexesto be valid already:
232259

233260
<programlisting>
234261
$ <userinput>export PGOPTIONS="-P"</userinput>

‎src/backend/commands/indexcmds.c

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.132 2005/06/21 00:35:05 neilc Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.133 2005/06/22 21:14:29 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -898,10 +898,10 @@ RemoveIndex(RangeVar *relation, DropBehavior behavior)
898898

899899
/*
900900
* ReindexIndex
901-
*Recreatean index.
901+
*Recreatea specific index.
902902
*/
903903
void
904-
ReindexIndex(RangeVar*indexRelation,boolforce/* currently unused */)
904+
ReindexIndex(RangeVar*indexRelation)
905905
{
906906
OidindOid;
907907
HeapTupletuple;
@@ -931,10 +931,10 @@ ReindexIndex(RangeVar *indexRelation, bool force /* currently unused */ )
931931

932932
/*
933933
* ReindexTable
934-
*Recreate indexes of a table.
934+
*Recreateallindexes of a table (and of its toast table, if any)
935935
*/
936936
void
937-
ReindexTable(RangeVar*relation,boolforce/* currently unused */)
937+
ReindexTable(RangeVar*relation)
938938
{
939939
OidheapOid;
940940
HeapTupletuple;
@@ -981,8 +981,7 @@ ReindexTable(RangeVar *relation, bool force /* currently unused */ )
981981
* separate transaction, so we can release the lock on it right away.
982982
*/
983983
void
984-
ReindexDatabase(constchar*dbname,boolforce/* currently unused */ ,
985-
boolall)
984+
ReindexDatabase(constchar*databaseName,booldo_system,booldo_user)
986985
{
987986
RelationrelationRelation;
988987
HeapScanDescscan;
@@ -992,23 +991,23 @@ ReindexDatabase(const char *dbname, bool force /* currently unused */ ,
992991
List*relids=NIL;
993992
ListCell*l;
994993

995-
AssertArg(dbname);
994+
AssertArg(databaseName);
996995

997-
if (strcmp(dbname,get_database_name(MyDatabaseId))!=0)
996+
if (strcmp(databaseName,get_database_name(MyDatabaseId))!=0)
998997
ereport(ERROR,
999998
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
1000999
errmsg("can only reindex the currently open database")));
10011000

10021001
if (!pg_database_ownercheck(MyDatabaseId,GetUserId()))
10031002
aclcheck_error(ACLCHECK_NOT_OWNER,ACL_KIND_DATABASE,
1004-
dbname);
1003+
databaseName);
10051004

10061005
/*
10071006
* We cannot run inside a user transaction block; if we were inside a
10081007
* transaction, then our commit- and start-transaction-command calls
10091008
* would not have the intended effect!
10101009
*/
1011-
PreventTransactionChain((void*)dbname,"REINDEX DATABASE");
1010+
PreventTransactionChain((void*)databaseName,"REINDEX DATABASE");
10121011

10131012
/*
10141013
* Create a memory context that will survive forced transaction
@@ -1028,9 +1027,12 @@ ReindexDatabase(const char *dbname, bool force /* currently unused */ ,
10281027
* before we process any other tables.This is critical because
10291028
* reindexing itself will try to update pg_class.
10301029
*/
1031-
old=MemoryContextSwitchTo(private_context);
1032-
relids=lappend_oid(relids,RelationRelationId);
1033-
MemoryContextSwitchTo(old);
1030+
if (do_system)
1031+
{
1032+
old=MemoryContextSwitchTo(private_context);
1033+
relids=lappend_oid(relids,RelationRelationId);
1034+
MemoryContextSwitchTo(old);
1035+
}
10341036

10351037
/*
10361038
* Scan pg_class to build a list of the relations we need to reindex.
@@ -1047,9 +1049,15 @@ ReindexDatabase(const char *dbname, bool force /* currently unused */ ,
10471049
if (classtuple->relkind!=RELKIND_RELATION)
10481050
continue;
10491051

1050-
if (!all)/* only system tables? */
1052+
/* Check user/system classification, and optionally skip */
1053+
if (IsSystemClass(classtuple))
1054+
{
1055+
if (!do_system)
1056+
continue;
1057+
}
1058+
else
10511059
{
1052-
if (!IsSystemClass(classtuple))
1060+
if (!do_user)
10531061
continue;
10541062
}
10551063

‎src/backend/nodes/copyfuncs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Portions Copyright (c) 1994, Regents of the University of California
1616
*
1717
* IDENTIFICATION
18-
* $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.307 2005/06/17 22:32:43 tgl Exp $
18+
* $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.308 2005/06/22 21:14:29 tgl Exp $
1919
*
2020
*-------------------------------------------------------------------------
2121
*/
@@ -2467,8 +2467,8 @@ _copyReindexStmt(ReindexStmt *from)
24672467
COPY_SCALAR_FIELD(kind);
24682468
COPY_NODE_FIELD(relation);
24692469
COPY_STRING_FIELD(name);
2470-
COPY_SCALAR_FIELD(force);
2471-
COPY_SCALAR_FIELD(all);
2470+
COPY_SCALAR_FIELD(do_system);
2471+
COPY_SCALAR_FIELD(do_user);
24722472

24732473
returnnewnode;
24742474
}

‎src/backend/nodes/equalfuncs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Portions Copyright (c) 1994, Regents of the University of California
1919
*
2020
* IDENTIFICATION
21-
* $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.244 2005/06/17 22:32:44 tgl Exp $
21+
* $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.245 2005/06/22 21:14:29 tgl Exp $
2222
*
2323
*-------------------------------------------------------------------------
2424
*/
@@ -1372,8 +1372,8 @@ _equalReindexStmt(ReindexStmt *a, ReindexStmt *b)
13721372
COMPARE_SCALAR_FIELD(kind);
13731373
COMPARE_NODE_FIELD(relation);
13741374
COMPARE_STRING_FIELD(name);
1375-
COMPARE_SCALAR_FIELD(force);
1376-
COMPARE_SCALAR_FIELD(all);
1375+
COMPARE_SCALAR_FIELD(do_system);
1376+
COMPARE_SCALAR_FIELD(do_user);
13771377

13781378
return true;
13791379
}

‎src/backend/parser/gram.y

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.495 2005/06/17 22:32:44 tgl Exp $
14+
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.496 2005/06/22 21:14:29 tgl Exp $
1515
*
1616
* HISTORY
1717
* AUTHORDATEMAJOR EVENT
@@ -400,7 +400,7 @@ static void doNegateFloat(Value *v);
400400
SERIALIZABLE SESSION SESSION_USER SET SETOF SHARE
401401
SHOW SIMILAR SIMPLE SMALLINT SOME STABLE START STATEMENT
402402
STATISTICS STDIN STDOUT STORAGE STRICT_P SUBSTRING SYMMETRIC
403-
SYSID
403+
SYSID SYSTEM_P
404404

405405
TABLE TABLESPACE TEMP TEMPLATE TEMPORARY THEN TIME TIMESTAMP
406406
TO TOAST TRAILING TRANSACTION TREAT TRIGGER TRIM TRUE_P
@@ -3641,8 +3641,9 @@ DropCastStmt: DROP CAST '(' Typename AS Typename ')' opt_drop_behavior
36413641
*
36423642
*QUERY:
36433643
*
3644-
*REINDEX type <typename> [FORCE] [ALL]
3644+
*REINDEX type <name> [FORCE]
36453645
*
3646+
* FORCE no longer does anything, but we accept it for backwards compatibility
36463647
*****************************************************************************/
36473648

36483649
ReindexStmt:
@@ -3652,7 +3653,16 @@ ReindexStmt:
36523653
n->kind =$2;
36533654
n->relation =$3;
36543655
n->name =NULL;
3655-
n->force =$4;
3656+
$$ = (Node *)n;
3657+
}
3658+
| REINDEX SYSTEM_P name opt_force
3659+
{
3660+
ReindexStmt *n = makeNode(ReindexStmt);
3661+
n->kind = OBJECT_DATABASE;
3662+
n->name =$3;
3663+
n->relation =NULL;
3664+
n->do_system =true;
3665+
n->do_user =false;
36563666
$$ = (Node *)n;
36573667
}
36583668
| REINDEX DATABASE name opt_force
@@ -3661,7 +3671,8 @@ ReindexStmt:
36613671
n->kind = OBJECT_DATABASE;
36623672
n->name =$3;
36633673
n->relation =NULL;
3664-
n->force =$4;
3674+
n->do_system =true;
3675+
n->do_user =true;
36653676
$$ = (Node *)n;
36663677
}
36673678
;
@@ -7915,6 +7926,7 @@ unreserved_keyword:
79157926
| STDOUT
79167927
| STORAGE
79177928
| SYSID
7929+
| SYSTEM_P
79187930
| STRICT_P
79197931
| TABLESPACE
79207932
| TEMP

‎src/backend/parser/keywords.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.157 2005/06/17 22:32:44 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.158 2005/06/22 21:14:30 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -300,6 +300,7 @@ static const ScanKeyword ScanKeywords[] = {
300300
{"substring",SUBSTRING},
301301
{"symmetric",SYMMETRIC},
302302
{"sysid",SYSID},
303+
{"system",SYSTEM_P},
303304
{"table",TABLE},
304305
{"tablespace",TABLESPACE},
305306
{"temp",TEMP},

0 commit comments

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