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

Commit32e1510

Browse files
committed
doc: use wording "restore" instead of "reload" of dumps
Reported-by: axel.kluener@gmail.comDiscussion:https://postgr.es/m/164736074430.660.3645615289283943146@wrigleys.postgresql.orgBackpatch-through: 11
1 parent99781ff commit32e1510

13 files changed

+32
-32
lines changed

‎doc/src/sgml/ddl.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ CREATE TABLE products (
557557
tests, it cannot guarantee that the database will not reach a state
558558
in which the constraint condition is false (due to subsequent changes
559559
of the other row(s) involved). This would cause a database dump and
560-
reload to fail. Thereload could fail even when the complete
560+
restore to fail. Therestore could fail even when the complete
561561
database state is consistent with the constraint, due to rows not
562562
being loaded in an order that will satisfy the constraint. If
563563
possible, use <literal>UNIQUE</literal>, <literal>EXCLUDE</literal>,
@@ -569,10 +569,10 @@ CREATE TABLE products (
569569
If what you desire is a one-time check against other rows at row
570570
insertion, rather than a continuously-maintained consistency
571571
guarantee, a custom <link linkend="triggers">trigger</link> can be used
572-
to implement that. (This approach avoids the dump/reload problem because
572+
to implement that. (This approach avoids the dump/restore problem because
573573
<application>pg_dump</application> does not reinstall triggers until after
574-
reloading data, so that the check will not be enforced during a
575-
dump/reload.)
574+
restoring data, so that the check will not be enforced during a
575+
dump/restore.)
576576
</para>
577577
</note>
578578

@@ -594,7 +594,7 @@ CREATE TABLE products (
594594
function. <productname>PostgreSQL</productname> does not disallow
595595
that, but it will not notice if there are rows in the table that now
596596
violate the <literal>CHECK</literal> constraint. That would cause a
597-
subsequent database dump andreload to fail.
597+
subsequent database dump andrestore to fail.
598598
The recommended way to handle such a change is to drop the constraint
599599
(using <command>ALTER TABLE</command>), adjust the function definition,
600600
and re-add the constraint, thereby rechecking it against all table rows.

‎doc/src/sgml/extend.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ SET LOCAL search_path TO @extschema@, pg_temp;
756756
<application>pg_dump</application>. But that behavior is undesirable for a
757757
configuration table; any data changes made by the user need to be
758758
included in dumps, or the extension will behave differently after a dump
759-
andreload.
759+
andrestore.
760760
</para>
761761

762762
<indexterm>

‎doc/src/sgml/perform.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1770,7 +1770,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
17701770

17711771
<para>
17721772
Dump scripts generated by <application>pg_dump</application> automatically apply
1773-
several, but not all, of the above guidelines. Toreload a
1773+
several, but not all, of the above guidelines. Torestore a
17741774
<application>pg_dump</application> dump as quickly as possible, you need to
17751775
do a few extra things manually. (Note that these points apply while
17761776
<emphasis>restoring</emphasis> a dump, not while <emphasis>creating</emphasis> it.

‎doc/src/sgml/plhandler.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ CREATE LANGUAGE plsample
208208
attached to a function when <varname>check_function_bodies</varname> is on.
209209
Therefore, checks whose results might be affected by GUC parameters
210210
definitely should be skipped when <varname>check_function_bodies</varname> is
211-
off, to avoid false failures whenreloading a dump.
211+
off, to avoid false failures whenrestoring a dump.
212212
</para>
213213

214214
<para>

‎doc/src/sgml/ref/alter_type.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME VALUE <repla
305305
around</quote> since the original creation of the enum type). The slowdown is
306306
usually insignificant; but if it matters, optimal performance can be
307307
regained by dropping and recreating the enum type, or by dumping and
308-
reloading the database.
308+
restoring the database.
309309
</para>
310310
</refsect1>
311311

‎doc/src/sgml/ref/create_domain.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ INSERT INTO tab (domcol) VALUES ((SELECT domcol FROM tab WHERE false));
234234
function. <productname>PostgreSQL</productname> does not disallow that,
235235
but it will not notice if there are stored values of the domain type that
236236
now violate the <literal>CHECK</literal> constraint. That would cause a
237-
subsequent database dump andreload to fail. The recommended way to
237+
subsequent database dump andrestore to fail. The recommended way to
238238
handle such a change is to drop the constraint (using <command>ALTER
239239
DOMAIN</command>), adjust the function definition, and re-add the
240240
constraint, thereby rechecking it against stored data.

‎doc/src/sgml/ref/pg_dump.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ PostgreSQL documentation
661661
...</literal>). This will make restoration very slow; it is mainly
662662
useful for making dumps that can be loaded into
663663
non-<productname>PostgreSQL</productname> databases.
664-
Any error duringreloading will cause only rows that are part of the
664+
Any error duringrestoring will cause only rows that are part of the
665665
problematic <command>INSERT</command> to be lost, rather than the
666666
entire table contents.
667667
</para>
@@ -685,9 +685,9 @@ PostgreSQL documentation
685685
This option is relevant only when creating a data-only dump.
686686
It instructs <application>pg_dump</application> to include commands
687687
to temporarily disable triggers on the target tables while
688-
the data isreloaded. Use this if you have referential
688+
the data isrestored. Use this if you have referential
689689
integrity checks or other triggers on the tables that you
690-
do not want to invoke during datareload.
690+
do not want to invoke during datarestore.
691691
</para>
692692

693693
<para>
@@ -775,7 +775,7 @@ PostgreSQL documentation
775775
than <command>COPY</command>). This will make restoration very slow;
776776
it is mainly useful for making dumps that can be loaded into
777777
non-<productname>PostgreSQL</productname> databases.
778-
Any error duringreloading will cause only rows that are part of the
778+
Any error duringrestoring will cause only rows that are part of the
779779
problematic <command>INSERT</command> to be lost, rather than the
780780
entire table contents. Note that the restore might fail altogether if
781781
you have rearranged column order. The
@@ -794,7 +794,7 @@ PostgreSQL documentation
794794
target the root of the partitioning hierarchy that contains it, rather
795795
than the partition itself. This causes the appropriate partition to
796796
be re-determined for each row when the data is loaded. This may be
797-
useful whenreloading data on a server where rows do not always fall
797+
useful whenrestoring data on a server where rows do not always fall
798798
into the same partitions as they did on the original server. That
799799
could happen, for example, if the partitioning column is of type text
800800
and the two systems have different definitions of the collation used
@@ -806,7 +806,7 @@ PostgreSQL documentation
806806
with this option, because <application>pg_restore</application> will
807807
not know exactly which partition(s) a given archive data item will
808808
load data into. This could result in inefficiency due to lock
809-
conflicts between parallel jobs, or perhaps evenreload failures due
809+
conflicts between parallel jobs, or perhaps evenrestore failures due
810810
to foreign key constraints being set up before all the relevant data
811811
is loaded.
812812
</para>
@@ -956,7 +956,7 @@ PostgreSQL documentation
956956
Dump data as <command>INSERT</command> commands (rather than
957957
<command>COPY</command>). Controls the maximum number of rows per
958958
<command>INSERT</command> command. The value specified must be a
959-
number greater than zero. Any error duringreloading will cause only
959+
number greater than zero. Any error duringrestoring will cause only
960960
rows that are part of the problematic <command>INSERT</command> to be
961961
lost, rather than the entire table contents.
962962
</para>

‎doc/src/sgml/ref/pg_dumpall.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,9 @@ PostgreSQL documentation
273273
This option is relevant only when creating a data-only dump.
274274
It instructs <application>pg_dumpall</application> to include commands
275275
to temporarily disable triggers on the target tables while
276-
the data isreloaded. Use this if you have referential
276+
the data isrestored. Use this if you have referential
277277
integrity checks or other triggers on the tables that you
278-
do not want to invoke during datareload.
278+
do not want to invoke during datarestore.
279279
</para>
280280

281281
<para>
@@ -354,7 +354,7 @@ PostgreSQL documentation
354354
target the root of the partitioning hierarchy that contains it, rather
355355
than the partition itself. This causes the appropriate partition to
356356
be re-determined for each row when the data is loaded. This may be
357-
useful whenreloading data on a server where rows do not always fall
357+
useful whenrestoring data on a server where rows do not always fall
358358
into the same partitions as they did on the original server. That
359359
could happen, for example, if the partitioning column is of type text
360360
and the two systems have different definitions of the collation used
@@ -509,7 +509,7 @@ PostgreSQL documentation
509509
Dump data as <command>INSERT</command> commands (rather than
510510
<command>COPY</command>). Controls the maximum number of rows per
511511
<command>INSERT</command> command. The value specified must be a
512-
number greater than zero. Any error duringreloading will cause only
512+
number greater than zero. Any error duringrestoring will cause only
513513
rows that are part of the problematic <command>INSERT</command> to be
514514
lost, rather than the entire table contents.
515515
</para>
@@ -778,7 +778,7 @@ PostgreSQL documentation
778778
</para>
779779

780780
<para>
781-
Toreload database(s) from this file, you can use:
781+
Torestore database(s) from this file, you can use:
782782
<screen>
783783
<prompt>$</prompt> <userinput>psql -f db.out postgres</userinput>
784784
</screen>

‎doc/src/sgml/ref/pg_resetwal.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ PostgreSQL documentation
5555
After running this command, it should be possible to start the server,
5656
but bear in mind that the database might contain inconsistent data due to
5757
partially-committed transactions. You should immediately dump your data,
58-
run <command>initdb</command>, andreload. Afterreload, check for
58+
run <command>initdb</command>, andrestore. Afterrestore, check for
5959
inconsistencies and repair as needed.
6060
</para>
6161

@@ -78,7 +78,7 @@ PostgreSQL documentation
7878
discussed below. If you are not able to determine correct values for all
7979
these fields, <option>-f</option> can still be used, but
8080
the recovered database must be treated with even more suspicion than
81-
usual: an immediate dump andreload is imperative. <emphasis>Do not</emphasis>
81+
usual: an immediate dump andrestore is imperative. <emphasis>Do not</emphasis>
8282
execute any data-modifying operations in the database before you dump,
8383
as any such action is likely to make the corruption worse.
8484
</para>

‎doc/src/sgml/ref/pg_restore.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,9 @@ PostgreSQL documentation
533533
This option is relevant only when performing a data-only restore.
534534
It instructs <application>pg_restore</application> to execute commands
535535
to temporarily disable triggers on the target tables while
536-
the data isreloaded. Use this if you have referential
536+
the data isrestored. Use this if you have referential
537537
integrity checks or other triggers on the tables that you
538-
do not want to invoke during datareload.
538+
do not want to invoke during datarestore.
539539
</para>
540540

541541
<para>
@@ -953,7 +953,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
953953
</para>
954954

955955
<para>
956-
Toreload the dump into a new database called <literal>newdb</literal>:
956+
Torestore the dump into a new database called <literal>newdb</literal>:
957957

958958
<screen>
959959
<prompt>$</prompt> <userinput>createdb -T template0 newdb</userinput>

‎doc/src/sgml/ref/pgupgrade.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ PostgreSQL documentation
4040
<para>
4141
<application>pg_upgrade</application> (formerly called <application>pg_migrator</application>) allows data
4242
stored in <productname>PostgreSQL</productname> data files to be upgraded to a later <productname>PostgreSQL</productname>
43-
major version without the data dump/reload typically required for
43+
major version without the data dump/restore typically required for
4444
major version upgrades, e.g., from 9.5.8 to 9.6.4 or from 10.7 to 11.2.
4545
It is not required for minor version upgrades, e.g., from 9.6.2 to 9.6.3
4646
or from 10.1 to 10.2.
@@ -404,7 +404,7 @@ NET STOP postgresql-&majorversion;
404404

405405
<para>
406406
The <option>--jobs</option> option allows multiple CPU cores to be used
407-
for copying/linking of files and to dump andreload database schemas
407+
for copying/linking of files and to dump andrestore database schemas
408408
in parallel; a good place to start is the maximum of the number of
409409
CPU cores and tablespaces. This option can dramatically reduce the
410410
time to upgrade a multi-database server running on a multiprocessor

‎doc/src/sgml/runtime.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
17481748
For <emphasis>major</emphasis> releases of <productname>PostgreSQL</productname>, the
17491749
internal data storage format is subject to change, thus complicating
17501750
upgrades. The traditional method for moving data to a new major version
1751-
is to dump andreload the database, though this can be slow. A
1751+
is to dump andrestore the database, though this can be slow. A
17521752
faster method is <xref linkend="pgupgrade"/>. Replication methods are
17531753
also available, as discussed below.
17541754
</para>
@@ -1830,7 +1830,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
18301830

18311831
<para>
18321832
One upgrade method is to dump data from one major version of
1833-
<productname>PostgreSQL</productname> andreload it in another &mdash; to do
1833+
<productname>PostgreSQL</productname> andrestore it in another &mdash; to do
18341834
this, you must use a <emphasis>logical</emphasis> backup tool like
18351835
<application>pg_dumpall</application>; file system
18361836
level backup methods will not work. (There are checks in place that prevent

‎doc/src/sgml/textsearch.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1961,7 +1961,7 @@ CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE
19611961
explicitly when creating <type>tsvector</type> values inside triggers,
19621962
so that the column's contents will not be affected by changes to
19631963
<varname>default_text_search_config</varname>. Failure to do this is likely to
1964-
lead to problems such as search results changing after a dump andreload.
1964+
lead to problems such as search results changing after a dump andrestore.
19651965
</para>
19661966

19671967
</sect2>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp