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

Commit 43fe513

Browse files
committed
doc: use wording "restore" instead of "reload" of dumps
Reported-by: axel.kluener@gmail.com Discussion: https://postgr.es/m/164736074430.660.3645615289283943146@wrigleys.postgresql.org Backpatch-through: 11
1 parent ea95814 commit 43fe513

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. The reload could fail even when the complete
560+
restore to fail. The restore 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 and reload to fail.
597+
subsequent database dump and restore 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
@@ -951,7 +951,7 @@ SET LOCAL search_path TO @extschema@, pg_temp;
951951
<application>pg_dump</application>. But that behavior is undesirable for a
952952
configuration table; any data changes made by the user need to be
953953
included in dumps, or the extension will behave differently after a dump
954-
and reload.
954+
and restore.
955955
</para>
956956

957957
<indexterm>

doc/src/sgml/perform.sgml

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

17831783
<para>
17841784
Dump scripts generated by <application>pg_dump</application> automatically apply
1785-
several, but not all, of the above guidelines. To reload a
1785+
several, but not all, of the above guidelines. To restore a
17861786
<application>pg_dump</application> dump as quickly as possible, you need to
17871787
do a few extra things manually. (Note that these points apply while
17881788
<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 when reloading a dump.
211+
off, to avoid false failures when restoring 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
@@ -403,7 +403,7 @@ ALTER TYPE <replaceable class="parameter">name</replaceable> SET ( <replaceable
403403
around</quote> since the original creation of the enum type). The slowdown is
404404
usually insignificant; but if it matters, optimal performance can be
405405
regained by dropping and recreating the enum type, or by dumping and
406-
reloading the database.
406+
restoring the database.
407407
</para>
408408
</refsect1>
409409

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 and reload to fail. The recommended way to
237+
subsequent database dump and restore 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
@@ -665,7 +665,7 @@ PostgreSQL documentation
665665
...</literal>). This will make restoration very slow; it is mainly
666666
useful for making dumps that can be loaded into
667667
non-<productname>PostgreSQL</productname> databases.
668-
Any error during reloading will cause only rows that are part of the
668+
Any error during restoring will cause only rows that are part of the
669669
problematic <command>INSERT</command> to be lost, rather than the
670670
entire table contents.
671671
</para>
@@ -689,9 +689,9 @@ PostgreSQL documentation
689689
This option is relevant only when creating a data-only dump.
690690
It instructs <application>pg_dump</application> to include commands
691691
to temporarily disable triggers on the target tables while
692-
the data is reloaded. Use this if you have referential
692+
the data is restored. Use this if you have referential
693693
integrity checks or other triggers on the tables that you
694-
do not want to invoke during data reload.
694+
do not want to invoke during data restore.
695695
</para>
696696

697697
<para>
@@ -809,7 +809,7 @@ PostgreSQL documentation
809809
than <command>COPY</command>). This will make restoration very slow;
810810
it is mainly useful for making dumps that can be loaded into
811811
non-<productname>PostgreSQL</productname> databases.
812-
Any error during reloading will cause only rows that are part of the
812+
Any error during restoring will cause only rows that are part of the
813813
problematic <command>INSERT</command> to be lost, rather than the
814814
entire table contents. Note that the restore might fail altogether if
815815
you have rearranged column order. The
@@ -828,7 +828,7 @@ PostgreSQL documentation
828828
target the root of the partitioning hierarchy that contains it, rather
829829
than the partition itself. This causes the appropriate partition to
830830
be re-determined for each row when the data is loaded. This may be
831-
useful when reloading data on a server where rows do not always fall
831+
useful when restoring data on a server where rows do not always fall
832832
into the same partitions as they did on the original server. That
833833
could happen, for example, if the partitioning column is of type text
834834
and the two systems have different definitions of the collation used
@@ -840,7 +840,7 @@ PostgreSQL documentation
840840
with this option, because <application>pg_restore</application> will
841841
not know exactly which partition(s) a given archive data item will
842842
load data into. This could result in inefficiency due to lock
843-
conflicts between parallel jobs, or perhaps even reload failures due
843+
conflicts between parallel jobs, or perhaps even restore failures due
844844
to foreign key constraints being set up before all the relevant data
845845
is loaded.
846846
</para>
@@ -990,7 +990,7 @@ PostgreSQL documentation
990990
Dump data as <command>INSERT</command> commands (rather than
991991
<command>COPY</command>). Controls the maximum number of rows per
992992
<command>INSERT</command> command. The value specified must be a
993-
number greater than zero. Any error during reloading will cause only
993+
number greater than zero. Any error during restoring will cause only
994994
rows that are part of the problematic <command>INSERT</command> to be
995995
lost, rather than the entire table contents.
996996
</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 is reloaded. Use this if you have referential
276+
the data is restored. Use this if you have referential
277277
integrity checks or other triggers on the tables that you
278-
do not want to invoke during data reload.
278+
do not want to invoke during data restore.
279279
</para>
280280

281281
<para>
@@ -352,7 +352,7 @@ PostgreSQL documentation
352352
target the root of the partitioning hierarchy that contains it, rather
353353
than the partition itself. This causes the appropriate partition to
354354
be re-determined for each row when the data is loaded. This may be
355-
useful when reloading data on a server where rows do not always fall
355+
useful when restoring data on a server where rows do not always fall
356356
into the same partitions as they did on the original server. That
357357
could happen, for example, if the partitioning column is of type text
358358
and the two systems have different definitions of the collation used
@@ -507,7 +507,7 @@ PostgreSQL documentation
507507
Dump data as <command>INSERT</command> commands (rather than
508508
<command>COPY</command>). Controls the maximum number of rows per
509509
<command>INSERT</command> command. The value specified must be a
510-
number greater than zero. Any error during reloading will cause only
510+
number greater than zero. Any error during restoring will cause only
511511
rows that are part of the problematic <command>INSERT</command> to be
512512
lost, rather than the entire table contents.
513513
</para>
@@ -776,7 +776,7 @@ PostgreSQL documentation
776776
</para>
777777

778778
<para>
779-
To reload database(s) from this file, you can use:
779+
To restore database(s) from this file, you can use:
780780
<screen>
781781
<prompt>$</prompt> <userinput>psql -f db.out postgres</userinput>
782782
</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>, and reload. After reload, check for
58+
run <command>initdb</command>, and restore. After restore, 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 and reload is imperative. <emphasis>Do not</emphasis>
81+
usual: an immediate dump and restore 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 is reloaded. Use this if you have referential
536+
the data is restored. Use this if you have referential
537537
integrity checks or other triggers on the tables that you
538-
do not want to invoke during data reload.
538+
do not want to invoke during data restore.
539539
</para>
540540

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

955955
<para>
956-
To reload the dump into a new database called <literal>newdb</literal>:
956+
To restore 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
@@ -39,7 +39,7 @@ PostgreSQL documentation
3939
<para>
4040
<application>pg_upgrade</application> (formerly called <application>pg_migrator</application>) allows data
4141
stored in <productname>PostgreSQL</productname> data files to be upgraded to a later <productname>PostgreSQL</productname>
42-
major version without the data dump/reload typically required for
42+
major version without the data dump/restore typically required for
4343
major version upgrades, e.g., from 9.5.8 to 9.6.4 or from 10.7 to 11.2.
4444
It is not required for minor version upgrades, e.g., from 9.6.2 to 9.6.3
4545
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 and reload database schemas
407+
for copying/linking of files and to dump and restore 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
@@ -1661,7 +1661,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
16611661
For <emphasis>major</emphasis> releases of <productname>PostgreSQL</productname>, the
16621662
internal data storage format is subject to change, thus complicating
16631663
upgrades. The traditional method for moving data to a new major version
1664-
is to dump and reload the database, though this can be slow. A
1664+
is to dump and restore the database, though this can be slow. A
16651665
faster method is <xref linkend="pgupgrade"/>. Replication methods are
16661666
also available, as discussed below.
16671667
(If you are using a pre-packaged version
@@ -1747,7 +1747,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
17471747

17481748
<para>
17491749
One upgrade method is to dump data from one major version of
1750-
<productname>PostgreSQL</productname> and reload it in another &mdash; to do
1750+
<productname>PostgreSQL</productname> and restore it in another &mdash; to do
17511751
this, you must use a <emphasis>logical</emphasis> backup tool like
17521752
<application>pg_dumpall</application>; file system
17531753
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
@@ -1974,7 +1974,7 @@ CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE
19741974
explicitly when creating <type>tsvector</type> values inside triggers,
19751975
so that the column's contents will not be affected by changes to
19761976
<varname>default_text_search_config</varname>. Failure to do this is likely to
1977-
lead to problems such as search results changing after a dump and reload.
1977+
lead to problems such as search results changing after a dump and restore.
19781978
</para>
19791979

19801980
</sect2>

0 commit comments

Comments
 (0)