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

Commit320b6db

Browse files
committed
Changes from Vince Vielhaber to allow the optional clauses of CREATE
USER and ALTER USER to appear in any order, not only the fixed orderthey used to be required to appear in.Also, some changes from Tom Lane to create a FULL option for VACUUM;it doesn't do anything yet, but I needed to change many of the samefiles to make that happen, so now seemed like a good time.
1 parent21d73aa commit320b6db

File tree

11 files changed

+467
-291
lines changed

11 files changed

+467
-291
lines changed

‎doc/src/sgml/ref/alter_user.sgml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.13 2000/07/22 04:30:26 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.14 2001/07/10 22:09:27 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -20,13 +20,17 @@ Postgres documentation
2020
</refnamediv>
2121
<refsynopsisdiv>
2222
<refsynopsisdivinfo>
23-
<date>1999-07-20</date>
23+
<date>2001-07-10</date>
2424
</refsynopsisdivinfo>
2525
<synopsis>
26-
ALTER USER <replaceable class="PARAMETER">username</replaceable>
27-
[ WITH PASSWORD '<replaceable class="PARAMETER">password</replaceable>' ]
28-
[ CREATEDB | NOCREATEDB ] [ CREATEUSER | NOCREATEUSER ]
29-
[ VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>' ]
26+
ALTER USER <replaceable class="PARAMETER">username</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
27+
28+
where <replaceable class="PARAMETER">option</replaceable> can be:
29+
30+
PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
31+
| CREATEDB | NOCREATEDB
32+
| CREATEUSER | NOCREATEUSER
33+
| VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>'
3034
</synopsis>
3135

3236
<refsect2 id="R2-SQL-ALTERUSER-1">
@@ -138,10 +142,19 @@ ERROR: ALTER USER: user "username" does not exist
138142
</title>
139143
<para>
140144
<command>ALTER USER</command> is used to change the attributes of a user's
141-
<productname>Postgres</productname> account. Only a database superuser
145+
<productname>Postgres</productname> account. Attributes not mentioned
146+
in the command retain their previous settings.
147+
</para>
148+
<para>
149+
Only a database superuser
142150
can change privileges and password expiration with this command. Ordinary
143151
users can only change their own password.
144152
</para>
153+
<para>
154+
<command>ALTER USER</command> cannot change a user's group memberships.
155+
Use <xref linkend="SQL-ALTERGROUP" endterm="SQL-ALTERGROUP-title">
156+
to do that.
157+
</para>
145158
<para>
146159
Use <xref linkend="SQL-CREATEUSER" endterm="SQL-CREATEUSER-title">
147160
to create a new user and <xref linkend="SQL-DROPUSER"

‎doc/src/sgml/ref/create_user.sgml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_user.sgml,v 1.16 2000/10/12 22:08:42 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_user.sgml,v 1.17 2001/07/10 22:09:27 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -20,16 +20,19 @@ Postgres documentation
2020
</refnamediv>
2121
<refsynopsisdiv>
2222
<refsynopsisdivinfo>
23-
<date>1999-07-20</date>
23+
<date>2001-07-10</date>
2424
</refsynopsisdivinfo>
2525
<synopsis>
26-
CREATE USER <replaceable class="PARAMETER">username</replaceable>
27-
[ WITH
28-
[ SYSID <replaceable class="PARAMETER">uid</replaceable> ]
29-
[ PASSWORD '<replaceable class="PARAMETER">password</replaceable>' ] ]
30-
[ CREATEDB | NOCREATEDB ] [ CREATEUSER | NOCREATEUSER ]
31-
[ IN GROUP <replaceable class="PARAMETER">groupname</replaceable> [, ...] ]
32-
[ VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>' ]
26+
CREATE USER <replaceable class="PARAMETER">username</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
27+
28+
where <replaceable class="PARAMETER">option</replaceable> can be:
29+
30+
SYSID <replaceable class="PARAMETER">uid</replaceable>
31+
| PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
32+
| CREATEDB | NOCREATEDB
33+
| CREATEUSER | NOCREATEUSER
34+
| IN GROUP <replaceable class="PARAMETER">groupname</replaceable> [, ...]
35+
| VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>'
3336
</synopsis>
3437

3538
<refsect2 id="R2-SQL-CREATEUSER-1">
@@ -115,6 +118,7 @@ CREATE USER <replaceable class="PARAMETER">username</replaceable>
115118
<listitem>
116119
<para>
117120
A name of a group into which to insert the user as a new member.
121+
Multiple group names may be listed.
118122
</para>
119123
</listitem>
120124
</varlistentry>
@@ -164,7 +168,7 @@ CREATE USER <replaceable class="PARAMETER">username</replaceable>
164168
Description
165169
</title>
166170
<para>
167-
CREATE USER will add a new user to an instance of
171+
<command>CREATE USER</command> will add a new user to an instance of
168172
<productname>Postgres</productname>. Refer to the administrator's
169173
guide for information about managing users and authentication.
170174
You must be a database superuser to use this command.
@@ -173,7 +177,8 @@ CREATE USER <replaceable class="PARAMETER">username</replaceable>
173177
Use <xref linkend="SQL-ALTERUSER" endterm="SQL-ALTERUSER-title">
174178
to change a user's password and privileges, and <xref linkend="SQL-DROPUSER"
175179
endterm="SQL-DROPUSER-title"> to remove a user.
176-
Use <command>ALTER GROUP</command> to add or remove the user from other groups.
180+
Use <xref linkend="SQL-ALTERGROUP" endterm="SQL-ALTERGROUP-title">
181+
to add or remove the user from other groups.
177182
<productname>Postgres</productname>
178183
comes with a script <xref linkend="APP-CREATEUSER"
179184
endterm="APP-CREATEUSER-title">

‎doc/src/sgml/ref/vacuum.sgml

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.16 2001/05/25 15:45:31 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.17 2001/07/10 22:09:28 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -20,23 +20,32 @@ Postgres documentation
2020
</refnamediv>
2121
<refsynopsisdiv>
2222
<refsynopsisdivinfo>
23-
<date>2001-05-04</date>
23+
<date>2001-07-10</date>
2424
</refsynopsisdivinfo>
2525
<synopsis>
26-
VACUUM [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> ]
27-
VACUUM [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">table</replaceable> [ (<replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ]
26+
VACUUM [FULL ] [VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> ]
27+
VACUUM [FULL ] [VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">table</replaceable> [ (<replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ]
2828
</synopsis>
2929

3030
<refsect2 id="R2-SQL-VACUUM-1">
3131
<refsect2info>
32-
<date>1998-10-04</date>
32+
<date>2001-07-10</date>
3333
</refsect2info>
3434
<title>
3535
Inputs
3636
</title>
3737

3838
<para>
3939
<variablelist>
40+
<varlistentry>
41+
<term>FULL</term>
42+
<listitem>
43+
<para>
44+
Selects <quote>full</quote> vacuum, which may reclaim more space,
45+
but takes much longer and exclusively locks the table.
46+
</para>
47+
</listitem>
48+
</varlistentry>
4049
<varlistentry>
4150
<term>VERBOSE</term>
4251
<listitem>
@@ -58,7 +67,8 @@ VACUUM [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">table</replaceable>
5867
<term><replaceable class="PARAMETER">table</replaceable></term>
5968
<listitem>
6069
<para>
61-
The name of a specific table to vacuum. Defaults to all tables.
70+
The name of a specific table to vacuum. Defaults to all tables
71+
in the current database.
6272
</para>
6373
</listitem>
6474
</varlistentry>
@@ -138,7 +148,7 @@ NOTICE: Index <replaceable class="PARAMETER">index</replaceable>: Pages 28;
138148

139149
<refsect1 id="R1-SQL-VACUUM-1">
140150
<refsect1info>
141-
<date>1998-10-04</date>
151+
<date>2001-07-10</date>
142152
</refsect1info>
143153
<title>
144154
Description
@@ -158,6 +168,16 @@ NOTICE: Index <replaceable class="PARAMETER">index</replaceable>: Pages 28;
158168
only that table.
159169
</para>
160170

171+
<para>
172+
Plain <command>VACUUM</command> simply reclaims space and makes it
173+
available for re-use. This form of the command can operate in parallel
174+
with normal reading and writing of the table. <command>VACUUM
175+
FULL</command> does more extensive processing, including moving of tuples
176+
across blocks to try to compact the table to the minimum number of disk
177+
blocks. This is much slower and requires an exclusive lock on each table
178+
while it is being processed.
179+
</para>
180+
161181
<para>
162182
<command>VACUUM ANALYZE</command> performs a <command>VACUUM</command>
163183
and then an <command>ANALYZE</command> for each selected table. This
@@ -168,16 +188,16 @@ NOTICE: Index <replaceable class="PARAMETER">index</replaceable>: Pages 28;
168188

169189
<refsect2 id="R2-SQL-VACUUM-3">
170190
<refsect2info>
171-
<date>1998-10-04</date>
191+
<date>2001-07-10</date>
172192
</refsect2info>
173193
<title>
174194
Notes
175195
</title>
176196

177197
<para>
178198
We recommend that active production databases be
179-
<command>VACUUM</command>-ed nightly, in order to remove
180-
expired rows. After copying a large table into
199+
<command>VACUUM</command>-edfrequently (at leastnightly), in order to
200+
removeexpired rows. After copying a large table into
181201
<productname>Postgres</productname> or after deleting a large number
182202
of records, it may be a good idea to issue a <command>VACUUM
183203
ANALYZE</command> command for the affected table. This will update the
@@ -187,6 +207,14 @@ NOTICE: Index <replaceable class="PARAMETER">index</replaceable>: Pages 28;
187207
choices in planning user queries.
188208
</para>
189209

210+
<para>
211+
The <option>FULL</option> option is not recommended for routine use,
212+
but may be useful in special cases. An example is when you have deleted
213+
most of the rows in a table and would like the table to physically shrink
214+
to occupy less disk space. <command>VACUUM FULL</command> will usually
215+
shrink the table more than a plain <command>VACUUM</command> would.
216+
</para>
217+
190218
</refsect2>
191219
</refsect1>
192220

‎doc/src/sgml/ref/vacuumdb.sgml

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.16 2001/03/17 16:27:31 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.17 2001/07/10 22:09:28 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -24,17 +24,19 @@ Postgres documentation
2424
<command>vacuumdb</command>
2525
<arg rep="repeat"><replaceable>connection-options</replaceable></arg>
2626
<arg><arg>-d</arg> <replaceable>dbname</replaceable></arg>
27-
<group><arg>--analyze</arg><arg>-z</arg></group>
27+
<group><arg>--full</arg><arg>-f</arg></group>
2828
<group><arg>--verbose</arg><arg>-v</arg></group>
29+
<group><arg>--analyze</arg><arg>-z</arg></group>
2930
<arg>--table '<replaceable>table</replaceable>
3031
<arg>( <replaceable class="parameter">column</replaceable> [,...] )</arg>'
3132
</arg>
3233
<sbr>
3334
<command>vacuumdb</command>
3435
<arg rep="repeat"><replaceable>connection-options</replaceable></arg>
3536
<group><arg>--all</arg><arg>-a</arg></group>
36-
<group><arg>--analyze</arg><arg>-z</arg></group>
37+
<group><arg>--full</arg><arg>-f</arg></group>
3738
<group><arg>--verbose</arg><arg>-v</arg></group>
39+
<group><arg>--analyze</arg><arg>-z</arg></group>
3840
</cmdsynopsis>
3941

4042
<refsect2 id="R2-APP-VACUUMDB-1">
@@ -56,21 +58,21 @@ Postgres documentation
5658
</varlistentry>
5759

5860
<varlistentry>
59-
<term>-z</term>
60-
<term>--analyze</term>
61+
<term>-a</term>
62+
<term>--alldb</term>
6163
<listitem>
6264
<para>
63-
Calculate statistics on the database for use by the optimizer.
65+
Vacuum all databases.
6466
</para>
6567
</listitem>
6668
</varlistentry>
6769

6870
<varlistentry>
69-
<term>-a</term>
70-
<term>--alldb</term>
71+
<term>-f</term>
72+
<term>--full</term>
7173
<listitem>
7274
<para>
73-
Vacuum all databases.
75+
Perform <quote>full</quote> vacuuming.
7476
</para>
7577
</listitem>
7678
</varlistentry>
@@ -85,6 +87,16 @@ Postgres documentation
8587
</listitem>
8688
</varlistentry>
8789

90+
<varlistentry>
91+
<term>-z</term>
92+
<term>--analyze</term>
93+
<listitem>
94+
<para>
95+
Calculate statistics for use by the optimizer.
96+
</para>
97+
</listitem>
98+
</varlistentry>
99+
88100
<varlistentry>
89101
<term>-t <replaceable class="parameter">table</replaceable> [ (<replaceable class="parameter">column</replaceable> [,...]) ]</term>
90102
<term>--table <replaceable class="parameter">table</replaceable> [ (<replaceable class="parameter">column</replaceable> [,...]) ]</term>
@@ -257,7 +269,7 @@ Postgres documentation
257269

258270
<informalexample>
259271
<para>
260-
To analyze for theoptimzer a database named
272+
Toclean andanalyze for theoptimizer a database named
261273
<literal>bigdb</literal>:
262274
<screen>
263275
<prompt>$ </prompt><userinput>vacuumdb --analyze bigdb</userinput>
@@ -267,9 +279,10 @@ Postgres documentation
267279

268280
<informalexample>
269281
<para>
270-
Toanalyze a single column <literal>bar</literal> in table
282+
Toclean a single table
271283
<literal>foo</literal> in a database named
272-
<literal>xyzzy</literal> for the optimizer:
284+
<literal>xyzzy</literal>, and analyze a single column
285+
<literal>bar</literal> of the table for the optimizer:
273286
<screen>
274287
<prompt>$ </prompt><userinput>vacuumdb --analyze --verbose --table 'foo(bar)' xyzzy</userinput>
275288
</screen>

0 commit comments

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